Merge pull request #118 from srz-zumix/feature/support_statement_r

support R statement

samples/command/src/r/sample.R

@@ -7,9 +7,10 @@ summary(fit)                             ## summary
 
 cat("All done\n")
 
-source("test1.R")
+source("test1.R"); source("test2.R")
 
 test1()
+test2()
 
 # R language references:
 #   https://cran.r-project.org/manuals.html

samples/command/src/r/test2.R

@@ -0,0 +1,3 @@
+test2 <- function() {
+    print("Test2")
+}

wandbox/__r__.py

@@ -3,11 +3,12 @@
 
 from .cli import CLI
 from .runner import Runner
+from .utils import split_statements
 
 
 class RscriptRunner(Runner):
 
-    SOURCE_REGEX = re.compile(r'^\s*source\s*\((.*?)\)\s*$')
+    SOURCE_REGEX = re.compile(r'^\s*source\s*\((.*?)\)\s*(;|)\s*$')
 
     def reset(self):
         self.sourced = []
@@ -16,10 +17,12 @@ def make_code(self, file, filepath, filename):
         files = dict()
         code = ''
         for line in file:
-            m = self.SOURCE_REGEX.match(line)
-            if m:
-                module = m.group(1).strip('(\'")')
-                files.update(self.source(os.path.dirname(filepath), module.strip()))
+            statements = split_statements(line, commenters="#")
+            for statement in statements:
+                m = self.SOURCE_REGEX.match(statement)
+                if m:
+                    module = m.group(1).strip('(\'")')
+                    files.update(self.source(os.path.dirname(filepath), module.strip()))
             code += line
         files[filename] = code
         return files