Fix constants with colons parsing, evaluating objects in function calls

adapap · adapap · commit edf77d041bf1 · 2019-06-16T05:46:26.000-04:00
Soldier: 76 was matching as an annotation, so the order of lexical analysis was modified. Function body is not necessarily a ruleblock, so lines need to be joined by hand.
diff --git a/OWScript/AST.py b/OWScript/AST.py
@@ -35,6 +35,12 @@ def __init__(self, name):
         super().__init__()
         self.name = name
 
+    def __eq__(self, other):
+        return self.name == other.name
+
+    def __hash__(self):
+        return hash(self.__class__.__name__ + self.name)
+
     def __repr__(self):
         if not self.children:
             return self.name
diff --git a/OWScript/Tokens.py b/OWScript/Tokens.py
@@ -83,8 +83,8 @@ class Tokens:
     PVAR : r'PVAR\b'
     GVAR : r'GVAR\b'
     RULE : r'RULE\b'
-    ANNOTATION : r'[_a-zA-Z0-9][_a-zA-Z0-9]*:(?!\n)'
     OWID : fr'({"|".join(OWID)})(?=[\b\s\n\(\),]+)'
+    ANNOTATION : r'[_a-zA-Z0-9][_a-zA-Z0-9]*:(?!\n)'
     RULEBLOCK : r'(EVENT|CONDITIONS|ACTIONS)\b'
     NAME : r'[_a-zA-Z][_\-a-zA-Z0-9]*'
     WHITESPACE : r'[ \t]+'
diff --git a/OWScript/Transpiler.py b/OWScript/Transpiler.py
@@ -258,7 +258,7 @@ def visitGlobalVar(self, node):
         for scope in self.scopes[::-1]:
             if node.name in scope.namespace:
                 value = scope.namespace.get(node.name)
-                if value == node:
+                if type(value) == type(node) and value == node:
                     continue
                 result = self.visit(value)
                 return result
@@ -330,7 +330,7 @@ def visitCall(self, node):
             if method == 'append':
                 try:
                     assert len(args) == 1
-                    value = node.args[0]
+                    value = self.visit(node.args[0])
                     self.arrays[callee.parent.name].append(value)
                     index = self.lookup(callee.parent)
                     if type(callee.parent) == GlobalVar:
@@ -350,7 +350,7 @@ def visitCall(self, node):
                     scope = Scope(name=callee.name)
                     scope.namespace.update(dict(zip(params, node.args)))
                     self.scopes.append(scope)
-                    code += self.visitChildren(function)
+                    code += (';\n' + self.tabs).join(map(self.visit, function.children))
                     self.scopes.pop()
                 else:
                     try:
