binops

ahk_ast/model.py

@@ -121,6 +121,8 @@ class BinOp(Expression):
     def __init__(self, op: str, left: Expression, right: Expression):
         assert isinstance(op, str)
         assert op in (
+            '**',
+            '//',
             '+',
             '-',
             '*',

ahk_ast/parser.py

@@ -71,9 +71,9 @@ def seen_ASSIGN(self, p: YaccProduction) -> Any:
     def assignment_statement(self, p: YaccProduction) -> Assignment:
         return Assignment(location=p.location, value=p.expression)
 
-    @_('literal', 'location')
+    @_('literal', 'location', 'bin_op')
     def expression(self, p: YaccProduction) -> Any:
-        self.expecting.pop()
+        # self.expecting.pop()
         return p[0]
 
     @_('INTEGER')
@@ -145,6 +145,14 @@ def function_call(self, p: YaccProduction) -> FunctionCall:
             else None,
         )
 
+    @_('PLUS', 'MINUS', 'TIMES', 'DIVIDE', 'INT_DIVIDE', 'EXP')
+    def bin_operator(self, p: YaccProduction) -> Any:
+        return p[0]
+
+    @_('expression [ WHITESPACE ] bin_operator [ WHITESPACE ] expression')
+    def bin_op(self, p: YaccProduction) -> BinOp:
+        return BinOp(op=p.bin_operator, left=p.expression0, right=p.expression1)
+
     def error(self, token: Union[AHKToken, None]) -> NoReturn:
         if token:
             if self.expecting:

tests/test_bin_op.py

@@ -0,0 +1,34 @@
+import json
+import os
+import sys
+from importlib.machinery import SourceFileLoader
+from importlib.util import module_from_spec
+from importlib.util import spec_from_file_location
+from textwrap import dedent
+
+import pytest
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../')))
+from ahk_ast import parser
+from ahk_ast.model import *
+from ahk_ast.tokenizer import tokenize
+
+tests_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'examples'))
+
+
+@pytest.mark.parametrize('op', argvalues=[('+',), ('-',), ('*',), ('/',), ('//',), ('**',)])
+def test_math_binop(op):
+    op = op[0]
+    script = dedent(
+        f"""\
+        a := 1 {op} 1
+        """
+    )
+    expected = Program(
+        Assignment(
+            location=Identifier(name='a'),
+            value=BinOp(left=Integer(value=1), right=Integer(value=1), op=op),
+        )
+    )
+    model = parser.parse(script)
+    assert model == expected