Codegen no longer breaks on module ids that start with a number

OpenAgricultureFoundation · Aug 26, 2016 · 230fc1e · 230fc1e
1 parent fde658b
commit 230fc1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/openag/cli/firmware/__init__.py b/openag/cli/firmware/__init__.py
@@ -197,7 +197,10 @@ def run(
         "try", "typedef", "typeid", "typename", "union", "unsigned", "using",
         "virtual", "void", "volatile", "wchar_t", "while", "xor", "xor_eq"
     ]
-    invalid_ids = [_id for _id in modules.keys() if _id in cpp_keywords]
+    invalid_ids = [
+        _id for _id in modules.keys() if _id in cpp_keywords or
+        _id[0].isdigit()
+    ]
     for _id in invalid_ids:
         new_id = "_" + _id
         modules[new_id] = modules[_id]

diff --git a/tests/test_cli/test_codegen.py b/tests/test_cli/test_codegen.py
@@ -300,7 +300,7 @@ class MyModule : public Module {
         res = runner.invoke(run_module, ["-p", "csv"])
         assert res.exit_code == 0, repr(res.exception) or res.output
 
-def test_run_cpp_keyword_as_module_id():
+def test_run_invalid_module_ids():
     runner = CliRunner()
 
     with runner.isolated_filesystem():
@@ -321,6 +321,9 @@ def test_run_cpp_keyword_as_module_id():
             json.dump({
                 "for": {
                     "type": "module"
+                },
+                "123": {
+                    "type": "module"
                 }
             }, f)