Bugfixes with arrays and functions

adapap · adapap · commit 27767a4c1a36 · 2019-07-19T21:20:17.000-04:00
diff --git a/Gamemodes/Clicker.owpy b/Gamemodes/Clicker.owpy
@@ -595,13 +595,13 @@ SaveInput("Left", 2, save_pos - x_offset)
 SaveInput("Right", 3, save_pos + x_offset)
 
 %UnlockHero(hero_)
+    pvar save_code_effect = Last Text Id
     Destroy In-World Text(pvar save_code_effect)
     Set Hero(Event Player, hero_)
     Wait(0.5s)
     Big Msg(Event Player, `You Unlocked {}`(Hero Icon String(hero_)))
     SuccessSound()
     Wait(0.25)
-    pvar save_code_effect = Last Text Id
 
 Rule "Buy Prestige Item"
     Each(Team 1)
@@ -624,19 +624,19 @@ Rule "Check Save Code"
         // 3: Right
         if pvar save_code == [0, 0, 0, 0, 0]:
             UnlockHero(Hero(McCree))
-            CodeText(Event Player, "Up", "Up", "Up", "Up", "Up", save_pos + Up * 1.25, 2)
+            CodeText(Event Player, ["Up", "Up", "Up", "Up", "Up"], save_pos + Up * 1.25, 2)
         elif pvar save_code == [3, 1, 2, 3, 2]:
             UnlockHero(Hero(Soldier: 76))
-            CodeText(Event Player, "Right", "Down", "Left", "Right", "Left", save_pos + Up * 1.25, 2)
+            CodeText(Event Player, ["Right", "Down", "Left", "Right", "Left"], save_pos + Up * 1.25, 2)
         elif pvar save_code == [0, 2, 2, 1, 3]:
             UnlockHero(Hero(Ashe))
-            CodeText(Event Player, "Up", "Left", "Left", "Down", "Right", save_pos + Up * 1.25, 2)
+            CodeText(Event Player, ["Up", "Left", "Left", "Down", "Right"], save_pos + Up * 1.25, 2)
         elif pvar save_code == [2, 3, 2, 0, 0]:
             UnlockHero(Hero(Genji))
-            CodeText(Event Player, "Left", "Right", "Left", "Up", "Up", save_pos + Up * 1.25, 2)
+            CodeText(Event Player, ["Left", "Right", "Left", "Up", "Up"], save_pos + Up * 1.25, 2)
         elif pvar save_code == [1, 1, 3, 1, 2]:
             UnlockHero(Hero(Hanzo))
-            CodeText(Event Player, "Down", "Down", "Right", "Down", "Left", save_pos + Up * 1.25, 2)
+            CodeText(Event Player, ["Down", "Down", "Right", "Down", "Left"], save_pos + Up * 1.25, 2)
         elif pvar save_code == [2, 0, 1, 0, 3]: // Secrets
             Big Msg(Event Player, "Hacked")
             // You Unlocked Hidden Save 2
diff --git a/OWScript/AST.py b/OWScript/AST.py
@@ -376,7 +376,7 @@ def __init__(self, name):
     def __repr__(self):
         return self.name
 
-    def halt(self):
+    def halt(self, tp):
         return Raw(code='Apply Impulse({}, Down, Multiply(0.001, 0.001), To World, Cancel Contrary Motion)'.format(self.name.title()))
 
 class BinaryOp(AST):
@@ -423,8 +423,7 @@ def __init__(self, elements=None):
         self.elements = elements or []
 
     def append(self, tp, elem):
-        if type(elem) == GlobalVar:
-            elem = tp.scope.get(elem.name).value
+        elem = Raw(code=tp.visit(elem, tp.scope))
         self.elements.append(elem)
 
     def index(self, elem):
diff --git a/OWScript/Transpiler.py b/OWScript/Transpiler.py
@@ -54,12 +54,14 @@ def range(tp, *args):
         return array
 
     def ceil(tp, n):
-        node = OWID(name='Round To Integer')
+        node = OWID(name='Round To Integer', args=(Number, Any))
+        node._pos = n._pos
         node.children.extend([n, OWID(name='Up')])
         return node
 
     def floor(tp, n):
-        node = OWID(name='Round To Integer')
+        node = OWID(name='Round To Integer', args=(Number, Any))
+        node._pos = n._pos
         node.children.extend([n, OWID(name='Down')])
         return node
 
@@ -139,6 +141,7 @@ def visitRaw(self, node, scope):
 
     def visitFunction(self, node, scope):
         scope.assign('gvar_' + node.name, node)
+        node.closure = scope
         return ''
 
     def visitBlock(self, node, scope):
@@ -378,7 +381,10 @@ def visitGlobalVar(self, node, scope):
             return self.visit(var, scope)
         elif type(var.value) == String:
             return var.value.value
-        code = 'Value In Array(Global Variable(A), {})'.format(var.index)
+        if var.index != None:
+            code = 'Value In Array(Global Variable(A), {})'.format(var.index)
+        else:
+            code = '{}'.format(var.value)
         return code
 
     def visitPlayerVar(self, node, scope):
@@ -454,12 +460,11 @@ def visitItem(self, node, scope):
                 print('DEBUG - Item Error 01:', ex)
         else:
             try:
-                print(node.index, scope, node.parent.name)
                 index = int(scope.get(node.index.name).value)
                 item = scope.get(node.parent.name).value[index]
                 return self.visit(item, scope)
             except Exception as er:
-                print('DEBUG - Item Error 02:', er)
+                #print('DEBUG - Item Error 02:', er)
                 return 'Value In Array(' + self.visit(node.parent, scope) + ', ' + self.visit(node.index, scope) + ')'
 
     def visitAttribute(self, node, scope):
@@ -480,20 +485,23 @@ def visitCall(self, node, scope):
         if type(parent) == Attribute:
             if type(base_node) == Variable:
                 method = getattr(base_node.value, parent.name)
+            elif type(base_node) in (GlobalVar, PlayerVar):
+                method = getattr(scope.get(base_node.name).value, parent.name)
             else:
                 method = getattr(base_node, parent.name)
             try:
                 self.scope = scope
                 result = method(self, *node.args)
             except TypeError as ex:
+                print('Invalid method arguments:', ex)
                 raise Errors.InvalidParameter("'{}' method received invalid arguments".format(parent.name), pos=parent._pos)
             if result:
                 lines.append(self.visit(result, scope))
             return ';\n'.join(lines)
         elif type(parent) in (GlobalVar, PlayerVar):
             func_name = parent.name[5:]
         else:
-            print('DEBUG - called by:', type(parent))
+            print('DEBUG - Call Origin:', type(parent))
         if not base_node:
             raise Errors.NameError('Undefined function \'{}\''.format(base_name[5:]), pos=parent._pos)
         func = base_node if type(base_node) != Variable else base_node.value
