Complete rewrite, update docs again, add for loop

The new rewrite is very close to a full release of the project. Documentation needs to be updated, syntax highlighting is incomplete, but the core functionality of the transpiling process is done.

Author: adapap

.gitignore

@@ -1 +1,2 @@
-__pycache__/
+__pycache__/
+temp.out

Examples/attributes.owpy

@@ -7,4 +7,6 @@ Rule "Attributes"
     Conditions
         Position Of
             Event Player
-        .X.Y == True
+        .X < 10
+        Event Player.moving == True
+        Event Player.jumping == True

Examples/for.owpy

@@ -0,0 +1,8 @@
+Rule "For Loop"
+    Event
+        On Global
+    Actions
+        angles = [15, 30, 45, 60, 75, 90]
+        angles2 = range(15, 91, 15)
+        for ang in angles:
+            Msg(Event Player, ang)

Examples/func_args.owpy

@@ -19,13 +19,11 @@
             All
             All
         Conditions
-            Array Contains
-                Players In Radius
-                    Center: origin
-                    Radius: radius
-                    Team: All
-                    LOS: Surfaces
-                Event Player 
+            Event Player in Players In Radius
+                Center: origin
+                Radius: radius
+                Team: All
+                LOS: Surfaces    
             == True
         Actions
             Teleport

Examples/time.owpy

@@ -1,6 +1,5 @@
 Rule "Time Shorthands"
     Actions
         Wait(16ms)
-        Wait 3.5s
         Wait /* It takes a parameter, so indent if you please! */
             0.35min

Examples/variables.owpy

@@ -3,4 +3,4 @@ Rule "Variables"
         On Global
 
     Actions
-        pVar h@Event Player = 1
+        pvar h@Event Player = 1

OWScript.py

@@ -1,43 +1,38 @@
 import argparse
-import os
-import re
 import sys
-from antlr4 import *
-from src.OWScriptLexer import OWScriptLexer
-from src.OWScriptParser import OWScriptParser
-from src.ASTBuilder import ASTBuilder
-from src.Transpiler import Transpiler
+from OWScript.Lexer import Lexer
+from OWScript.Parser import Parser
+from OWScript.Transpiler import Transpiler
+
+class DEBUG:
+    """Bit flags used for debug code."""
+    TOKENS = 1
+    TREE = 2
+
+def transpile(text, minify=False, save=None, debug=0):
+    """Transpiles an OWScript code into Overwatch Workshop rules."""
+    lexer = Lexer(text=text)
+    tokens = lexer.lex()
+    if debug & DEBUG.TOKENS:
+        lexer.print_tokens()
+    parser = Parser(tokens=tokens)
+    tree = parser.script()
+    if debug & DEBUG.TREE:
+        print(tree.string())
+    transpiler = Transpiler(tree=tree)
+    code = transpiler.run()
+    print(code)
+
 
-class UppercaseStream(FileStream):
-    def _loadString(self):
-        self._index = 0
-        self.data = [ord(c.upper()) for c in self.strdata]
-        self._size = len(self.data)
- 
-def process(code, minify=False, save=None):
-    input_stream = UppercaseStream(code, 'utf-8')
-    lexer = OWScriptLexer(input_stream)
-    stream = CommonTokenStream(lexer)
-    parser = OWScriptParser(stream)
-    ast = ASTBuilder().run(parser.script())
-    # print(ast)
-    output = Transpiler().run(ast)
-    if minify:
-        output = re.sub(r'[\s\n]*', '', output)
-    if not save:
-        sys.stdout.write(output)
-    else:
-        with open(save, 'w') as f:
-            f.write(output)
- 
 if __name__ == '__main__':
-    sys.path.append(os.path.join(os.getcwd(), 'src'))
     parser = argparse.ArgumentParser(description='Generate Overwatch Workshop code from OWScript')
     parser.add_argument('input', nargs='*', type=str, help='Standard input to process')
     parser.add_argument('-m', '--min', action='store_true', help='Minifies the output by removing whitespace')
     parser.add_argument('-s', '--save', help='Save the output to a file instead of printing it')
+    parser.add_argument('-d', '--debug', type=int, help='Debugging tool used for development')
     args = parser.parse_args()
-    if not args.input:
-        process(sys.stdin)
-    for file in args.input:
-        process(file, minify=args.min, save=args.save)
+    file_input = args.input[0] if args.input else sys.stdin
+    with open(file_input) as f:
+        text = f.read()
+    transpile(text, minify=args.min, save=args.save, debug=args.debug)
+    

OWScript/AST.py

@@ -1,11 +1,22 @@
 class AST:
+    children = []
     def __init__(self):
         self.children = []
 
     @property 
     def format_children(self):
         return ', '.join(map(repr, self.children))
 
+    def string(self, indent=0):
+        string = ''
+        if not self.__class__ == Block:
+            string += ' ' * indent + '{}'.format(self.__class__.__name__) + '\n'
+        else:
+            indent -= 3
+        for child in self.children:
+            string += child.string(indent=indent + 3)
+        return string
+
     def __repr__(self):
         if not self.children:
             return self.__class__.__name__
@@ -69,15 +80,18 @@ class Const(Terminal):
 class String(Terminal):
     pass
 
+class Time(Terminal):
+    pass
+
 class Numeral(Terminal):
     pass
 
 class OWID(Data):
     pass
 
 class Array(AST):
-    def __init__(self):
-        self.elements = []
+    def __init__(self, elements=None):
+        self.elements = elements or []
 
     def append(self, elem):
         self.elements.append(elem)
@@ -120,6 +134,32 @@ def __init__(self, cond, true_block, false_block=None):
     def __repr__(self):
         return 'if {}: {} | else: {}'.format(self.cond, self.true_block, self.false_block)
 
+class While:
+    def __init__(self, cond, body):
+        self.cond = cond
+        self.body = body
+    
+    def __repr__(self):
+        return 'while {}: {}'.format(self.cond, self.body)
+
+class For:
+    def __init__(self, pointer, iterable, body):
+        self.pointer = pointer
+        self.iterable = iterable
+        self.body = body
+
+    def __repr__(self):
+        return 'for {} in {}: {}'.format(self.pointer, self.iterable, self.body)
+
+class Function(AST):
+    def __init__(self, name, params):
+        super().__init__()
+        self.name = name
+        self.params = params
+
+    def __repr__(self):
+        return '%{}({}): {}'.format(self.name, ', '.join(self.params), self.format_children)
+
 class Attribute(Trailer):
     def __init__(self, name, parent):
         super().__init__(parent)