support julia statement (#110)

samples/command/src/julia/sample.jl

@@ -1,12 +1,14 @@
 # This file is a "Hello, world!" in Julia language for wandbox.
 
-include("test1.jl")
+include("test1.jl"); include("test2.jl");
 
 using .Test1
+using .Test2
 
 println("Hello, Wandbox!")
 
 Test1.test()
+Test2.test()
 
 # Julia language references:
 #   https://docs.julialang.org/en/v1/

samples/command/src/julia/test2.jl

@@ -0,0 +1,8 @@
+module Test2
+    function test()
+        println("Test2: test")
+    end
+    function test2()
+        println("Test2: test2")
+    end
+end

tests/test_wandbox_api.py

@@ -206,6 +206,12 @@ def test_split_statements(self):
         self.assertEqual(". test.sh", statements[0])
         self.assertEqual("source \'test data.sh\'", statements[1])
 
+    def test_split_statements_2(self):
+        statements = split_statements("include(\"test1.jl\"); include(\"test2.jl\");")
+        self.assertEqual(2, len(statements))
+        self.assertEqual("include ( test1.jl )", statements[0])
+        self.assertEqual("include ( test2.jl )", statements[1])
+
 
 if __name__ == '__main__':
     test_loader = unittest.defaultTestLoader

wandbox/__julia__.py

@@ -3,6 +3,7 @@
 
 from .cli import CLI
 from .runner import Runner
+from .utils import split_statements
 
 
 class JuliaRunner(Runner):
@@ -16,10 +17,12 @@ def make_code(self, file, filepath, filename):
         files = dict()
         code = ''
         for line in file:
-            m = self.INCLUDE_REGEX.match(line)
-            if m:
-                module = m.group(1).strip('(\'")')
-                files.update(self.include(os.path.dirname(filepath), module.strip()))
+            statements = split_statements(line, commenters="#")
+            for statement in statements:
+                m = self.INCLUDE_REGEX.match(statement)
+                if m:
+                    module = m.group(1).strip('(\'")')
+                    files.update(self.include(os.path.dirname(filepath), module.strip()))
             code += line
         files[filename] = code
         return files

wandbox/utils.py

@@ -28,22 +28,29 @@ def text_transform(value):
     return value
 
 
-def shlex_join(split_command):
-    return " ".join([shlex.quote(x) for x in split_command])
+def statements_quote(s):
+    if s in ['(', ')']:
+        return s
+    else:
+        return shlex.quote(s)
+
+
+def statements_join(split_command):
+    return " ".join([statements_quote(x) for x in split_command])
 
 
 def split_statements(line, end_of_statement=";", commenters="#"):
-    sl = shlex.shlex(line, posix=True, punctuation_chars=True)
+    sl = shlex.shlex(line, posix=True, punctuation_chars=end_of_statement)
     sl.commenters = commenters
     sl.source = None
     statements = []
     statement = []
     for s in sl:
         if s == end_of_statement:
-            statements.append(shlex_join(statement))
+            statements.append(statements_join(statement))
             statement = []
         else:
             statement.append(s)
     if len(statement) > 0:
-        statements.append(shlex_join(statement))
+        statements.append(statements_join(statement))
     return statements