Fix #7 using a name resolver on call arguments

Author: adapap

OWScript/AST.py

@@ -468,6 +468,11 @@ def __init__(self, name, player=None):
         super().__init__(name)
         self.player = player or Constant(name='Event Player')
 
+class VarType:
+    # Compares whether a value is a GlobalVar or PlayerVar
+    def __eq__(self, other):
+        return other in (GlobalVar, PlayerVar)
+
 class If(AST):
     def __init__(self, cond, true_block, false_block=None):
         self.cond = cond

OWScript/Transpiler.py

@@ -128,7 +128,6 @@ def resolve_skips(self):
             self.curblock[skip] = self.curblock[skip].format(jump)
 
     def resolve_import(self, node, scope):
-        # TODO - Resolves imports recursively
         children = self.visit(node, scope).children
         nodes = []
         for child in children:
@@ -142,6 +141,16 @@ def resolve_import(self, node, scope):
                 nodes.append(child)
         return nodes
 
+    def resolve_name(self, node, scope):
+        if type(node) == VarType():
+            node = scope.get(node.name)
+            if type(node) == Variable:
+                return node.value
+        elif type(node) == BinaryOp:
+            node.left = self.resolve_name(node.left, scope)
+            node.right = self.resolve_name(node.right, scope)
+        return node
+
     def visitScript(self, node, scope):
         code = r'rule("Generated by https://github.com/adapap/OWScript") { Event { Ongoing - Global; } Actions { Set Global Variable At Index(A, 0, Round To Integer(Add(Distance Between(Nearest Walkable Position(Vector(-500.000, 0, 0)), Nearest Walkable Position(Vector(500, 0, 0))), Distance Between(Nearest Walkable Position(Vector(0, 0, -500.000)), Nearest Walkable Position(Vector(0, 0, 500)))), Down)); }}' + '\n'
         while len(node.children) > 0:
@@ -232,7 +241,7 @@ def visitOWID(self, node, scope):
                 continue
             elif arg == Variable:
                 try:
-                    assert type(child) in (GlobalVar, PlayerVar)
+                    assert type(child) == VarType()
                     if child.name not in self.varconsts:
                         constgen = self.global_varconst if type(child) == GlobalVar else self.player_varconst
                         try:
@@ -351,7 +360,7 @@ def visitFor(self, node, scope):
         code = ''
         pointer = node.pointer
         iterable = node.iterable
-        if type(iterable) in (GlobalVar, PlayerVar) and type(scope.get(iterable.name).value) == Array:
+        if type(iterable) == VarType() and type(scope.get(iterable.name).value) == Array:
             lines = []
             array = scope.get(iterable.name).value
             for elem in scope.get(iterable.name).value.elements:
@@ -506,7 +515,7 @@ def visitArray(self, node, scope):
         return code
 
     def visitItem(self, node, scope):
-        if type(node.index) == Number and type(node.parent) in (GlobalVar, PlayerVar):
+        if type(node.index) == Number and type(node.parent) == VarType():
             try:
                 index = int(node.index.value)
                 var = scope.get(node.parent.name)
@@ -549,7 +558,7 @@ 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):
+            elif type(base_node) == VarType():
                 method = getattr(scope.get(base_node.name).value, parent.name)
             else:
                 method = getattr(base_node, parent.name)
@@ -562,7 +571,7 @@ def visitCall(self, node, scope):
             if result:
                 lines.append(self.visit(result, scope))
             return ';\n'.join(lines)
-        elif type(parent) in (GlobalVar, PlayerVar):
+        elif type(parent) == VarType():
             func_name = parent.name[5:]
         else:
             print('DEBUG - Call Origin:', type(parent))
@@ -576,8 +585,9 @@ def visitCall(self, node, scope):
             except AssertionError:
                 raise Errors.InvalidParameter('\'{}\' expected {} arguments, received {}'.format(func_name, len(func.params), len(node.args)), pos=node._pos)
             # Resolve variables in call
+            args = [self.resolve_name(arg, scope) for arg in node.args]
             scope = Scope(name=func_name, parent=scope)
-            scope.namespace.update(dict(zip(map(lambda p: p.name, func.params), node.args)))
+            scope.namespace.update(dict(zip(map(lambda p: p.name, func.params), args)))
             for child in func.children:
                 try:
                     lines.append(self.visit(child, scope=scope))

README.md

@@ -10,7 +10,6 @@ Setup
 - `-m | --min` Optional: minifies the output by stripping whitespace
 - `-s | --save [FILE]` Optional: saves to the target output file instead of stdout
 - `-c | --copy` Optional: copies code to clipboard (must have *pyperclip* installed: `pip install pyperclip`)
-- `--enable-imports` Optional: Enables the experimental import functionality.
 
 ## Syntax Highlighting
 In the `Syntax/` folder, you can find the raw Iro code which I used to generate a Sublime Text file with modifications. You can directly import the `OWScript.sublime-syntax` file by putting it in your ST3 `User` folder.
@@ -293,12 +292,9 @@ scores.append(123) // Method
 ## Imports
 OWScript allows bigger scripts and scripts that use common funcitonality to be broken up into modules and imported into a base file. All the "imported" files are directly copied into the base script to be transpiled to workshop code.
 
-To use this experimental feature, add the `--enable-imports` flag to the command and it will search your script for imports. This is recursive and allows for importing modules within modules. The modules you're importing **must** have the `.owpy` file ending to be properly imported or it will not be able to find the the module.
+You can import a file by using the `#import 'filepath'`. If the file is in a folder, put the relative path to the file as shown in the examples below:
 
-You can import a file by using the `#import 'filename'`
-
-### Example
-File: `lib/functions.owpy`
+**Imported File** `lib/functions.owpy`
 ```
 %CreateEffect(pos, type, color)
     Create Effect
@@ -310,7 +306,7 @@ File: `lib/functions.owpy`
         Reevaluation: Visible To
 ```
 
-File `src/setup.owpy`
+**Imported File** `src/setup.owpy`
 ```
 Rule "Setup Effects"
     Event
@@ -319,7 +315,7 @@ Rule "Setup Effects"
         CreateEffect(<0,0,0>, Ring, Red)
 ```
 
-File: `src/game.owpy`
+**Base File** `src/game.owpy`
 ```
 #import 'lib/functions'
 #import 'src/setup'