Merge pull request #3120 from sorig/enums

Meta-Language: Fix C# enum translation rule and uncaught bugs in tran…
shogun-toolbox · Mar 26, 2016 · 71c1eca · 71c1eca
2 parents 161431c + 8be3005
commit 71c1eca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/meta/generator/targets/csharp.json b/examples/meta/generator/targets/csharp.json
@@ -48,7 +48,7 @@
         "NumberLiteral": "$number",
         "MethodCall": "$object.$method($arguments)",
         "Identifier": "$identifier",
-        "Enum":"$value"
+        "Enum":"$type.$value"
     },
     "Print": "Console.Write($expr)",
     "OutputDirectoryName": "csharp",

diff --git a/examples/meta/generator/translate.py b/examples/meta/generator/translate.py
@@ -302,7 +302,7 @@ def translateExpr(self, expr):
             # Add enum to dependencies in case they need to be imported explicitly
             self.dependencies["Enums"].add((expr[key][0]["Identifier"], expr[key][1]["Identifier"]))
             template = Template(self.targetDict["Expr"]["Enum"])
-            return template.substitute(type=expr[key][0],value=expr[key][1]["Identifier"])
+            return template.substitute(type=expr[key][0]["Identifier"],value=expr[key][1]["Identifier"])
 
         raise Exception("Unknown expression type: " + key)
 
@@ -394,4 +394,4 @@ def loadTargetDict(targetJsonPath):
     else:
         programObject = json.load(sys.stdin)
 
-    print(translate(programObject, targetDict))
+    print(translate(programObject, targetDict, tags={}, storeVars=False))