Merge pull request #100 from srz-zumix/feature/rust_end_of_statement

fix rust: Multiple mod on one line

samples/command/src/rust/src/main.rs

@@ -1,11 +1,12 @@
 // This file is a "Hello, world!" in Rust language for wandbox.
 
-mod test1;
+mod test1; mod test2;
 
 fn main()
 {
     println!("Hello, Wandbox!");
     test1::test1();
+    test2::test2();
 }
 
 // Rust language references:

samples/command/src/rust/src/test2.rs

@@ -0,0 +1,4 @@
+pub fn test2()
+{
+    println!("Test2");
+}

tests/test_wandbox_api.py

@@ -187,7 +187,7 @@ def test_options_config(self):
                     head = ll[0]
                     # print(json.dumps(head, indent=2))
                     self.assertEqual(cli.has_compiler_option_raw, head['compiler-option-raw'], cli.language)
-                    # self.assertEqual(cli.has_runtime_option_raw, head['runtime-option-raw'])
+                    # self.assertEqual(cli.has_runtime_option_raw, head['runtime-option-raw'], cli.language)
                     self.assertEqual(cli.has_runtime_option_raw, cli.language != "OpenSSL", cli.language)
                     self.assertEqual(cli.has_option, len(head['switches']) != 0, cli.language)
 

wandbox/__rust__.py

@@ -10,7 +10,7 @@
 
 class RustRunner(Runner):
 
-    MOD_REGEX = re.compile(r'^\s*mod\s+(.*?);\s*$')
+    MOD_REGEX = re.compile(r'\s*mod\s+(.*?)\s*;')
 
     def reset(self):
         self.modules = []
@@ -19,8 +19,8 @@ def make_code(self, file, filepath, filename):
         files = dict()
         code = ''
         for line in file:
-            m = self.MOD_REGEX.match(line)
-            if m:
+            ml = self.MOD_REGEX.finditer(line)
+            for m in ml:
                 files.update(self.mod(os.path.dirname(filepath), m.group(1)))
             code += line
         files[filename] = code