Recursive imports

Author: adapap

Examples/imports.owpy

@@ -2,4 +2,4 @@
 
 Rule "Debug Import"
     Actions
-        debug_msg("Hello!")
+        debug_func("Hello!")

Examples/lib/child.owpy

@@ -1,6 +1,5 @@
 #import 'lib2/child2.owpy'
 
-%debug_msg(text)
+%debug_func(text)
     Msg(Everyone, text)
-
-nested(Lucio)
+    nested(Lucio)

Examples/lib/lib2/child2.owpy

@@ -1,2 +1,2 @@
 %nested(hero_)
-    Set Hero(hero_)
+    Set Hero(Event Player, hero_)

OWScript/Transpiler.py

@@ -122,25 +122,29 @@ def resolve_skips(self):
         for skip, jump in zip(skips, skip_to[::-1]):
             self.curblock[skip] = self.curblock[skip].format(jump)
 
-    def resolve_import(self, node):
+    def resolve_import(self, node, scope):
         # TODO - Resolves imports recursively
-        children = self.visit(child).children
+        children = self.visit(node, scope).children
         nodes = []
         for child in children:
             if type(child) == Import:
-                pass
+                cur_path = self.path
+                self.path = os.path.join(os.path.dirname(self.path), os.path.dirname(node.path)) + '\\'
+                result = self.resolve_import(child, scope)
+                self.path = cur_path
+                nodes = result + nodes
             else:
                 nodes.append(child)
-        return nodes + node.children[1:]
+        return nodes
 
     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:
             child = node.children[0]
             if type(child) == Import:
-                node.children = self.resolve_import(node)
+                node.children = self.resolve_import(child, scope) + node.children[1:]
             else:
-                code += self.visit(child)
+                code += self.visit(child, scope)
                 node.children = node.children[1:]
         return code.rstrip('\n')