Merge branch 'imports'

Author: adapap

Examples/imports.owpy

@@ -0,0 +1,5 @@
+#import "lib/child"
+
+Rule "Debug Import"
+    Actions
+        debug_func("Hello!")

Examples/lib/child.owpy

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

Examples/lib/lib2/child2.owpy

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

OWScript.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 import re
 import sys
 import time
@@ -7,7 +8,7 @@
 from OWScript.Parser import Parser
 from OWScript.Transpiler import Transpiler
 
-def transpile(text, args):
+def transpile(text, path, args):
     """Transpiles an OWScript code into Overwatch Workshop rules."""
     start = time.time()
     Errors.TEXT = text
@@ -23,7 +24,7 @@ def transpile(text, args):
     tree = parser.script()
     if args.tree:
         print(tree.string())
-    transpiler = Transpiler(tree=tree)
+    transpiler = Transpiler(tree=tree, path=path)
     code = transpiler.run()
     if args.min:
         code = re.sub(r'[\s\n]*', '', code)
@@ -50,10 +51,15 @@ def transpile(text, args):
     parser.add_argument('--tokens', action='store_true', help='Debug: shows the tokens created by the lexer')
     parser.add_argument('--tree', action='store_true', help='Debug: visualizes the AST generated by the parser')
     args = parser.parse_args()
-    file_input = args.input[0] if args.input else sys.stdin
-    with open(file_input) as f:
-        text = f.read()
+    if args.input:
+        file_input = args.input[0]
+        path = os.path.abspath(file_input)
+        with open(path) as f:
+            text = f.read()
+    else:
+        text = sys.stdin.read()
+        path = os.getcwd()
     try:
-        transpile(text, args=args)
+        transpile(text, path=path, args=args)
     except Errors.OWSError as ex:
         print('Error:', ex)

OWScript/AST.py

@@ -94,6 +94,13 @@ def __init__(self, code):
     def __repr__(self):
         return '<Raw {}>'.format(len(self.code))
 
+class Import(AST):
+    def __init__(self, path):
+        self.path = path
+
+    def __repr__(self):
+        return '#import {}'.format(self.path)
+
 # Workshop Types
 class WorkshopType(AST):
     @classmethod

OWScript/Errors.py

@@ -16,6 +16,9 @@ class LexError(OWSError):
 class ParseError(OWSError):
     pass
 
+class ImportError(OWSError):
+    pass
+
 class SyntaxError(OWSError):
     pass
 

OWScript/Importer.py

@@ -0,0 +1,19 @@
+from . import Errors
+from .Lexer import Lexer
+from .Parser import Parser
+
+def import_file(path):
+    error_text = Errors.TEXT
+    with open(path) as f:
+        text = f.read()
+    try:
+        Errors.TEXT = text
+        lexer = Lexer(text=text)
+        tokens = lexer.lex()
+        parser = Parser(tokens=tokens)
+        tree = parser.script()
+        Errors.TEXT = error_text
+        return tree
+    except Exception as ex:
+        Errors.TEXT = error_text
+        raise ex

OWScript/Lexer.py

@@ -1,12 +1,8 @@
 import functools
 import re
 
-try:
-    from . import Errors
-    from .Tokens import Token, Tokens
-except ImportError:
-    import Errors
-    from Tokens import Token, Tokens
+from . import Errors
+from .Tokens import Token, Tokens
 
 class Lexer:
     IGNORE = ('WHITESPACE', 'SEMI', 'COMMENT', 'ANNOTATION')

OWScript/Parser.py

@@ -2,14 +2,10 @@
 from collections import deque
 from functools import partial
 
-try:
-    from . import Errors
-    from .AST import *
-    from .Tokens import ALIASES
-    from .Workshop import *
-except ImportError:
-    import Errors
-    from AST import *
+from . import Errors
+from .AST import *
+from .Tokens import ALIASES
+from .Workshop import *
 
 class Parser:
     def __init__(self, tokens):
@@ -105,11 +101,13 @@ def script(self):
         return node
 
     def stmt(self):
-        """stmt : (funcdef | ruledef | line)"""
+        """stmt : (funcdef | ruledef | importdef | line)"""
         if self.curvalue == '%':
             return self.funcdef()
         elif self.curtype in ('DISABLED', 'RULE'):
             return self.ruledef()
+        elif self.curtype == 'IMPORT':
+            return self.importdef()
         else:
             return self.line()
 
@@ -207,6 +205,16 @@ def block(self):
             node.children.append(line)
         return node
 
+    def importdef(self):
+        """importdef : #import STRING"""
+        self.eat('IMPORT')
+        path = self.curvalue.strip('\'').strip('"').replace('/', '\\').rstrip('.owpy')
+        pos = self.curpos
+        self.eat('STRING')
+        node = Import(path=path)
+        node._pos = pos
+        return node
+
     def line(self):
         """line : 
                 ( if_stmt

OWScript/Tokens.py

@@ -85,6 +85,7 @@ class Tokens:
     RBRACK : r'\]'
     STRING : r'("[^\\\r\n\f]*?"|\'[^\\\r\n\f]*?\')'
     F_STRING : r'(`[^\\\r\n\f]*?`)'
+    IMPORT : r'#IMPORT\b'
     IF : r'IF\b'
     ELIF : r'ELIF\b'
     ELSE : r'ELSE\b'