Fixed negation bug in parser.

10cc67ca · Sander Mathijs van Veen · 84c9dcb4 · 10cc67ca · 10cc67ca
Commit 10cc67ca authored Dec 11, 2011 by Sander Mathijs van Veen
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

src/parser.py src/parser.py +1 -2

tests/test_calc.py tests/test_calc.py +7 -0

No files found.
--- a/src/parser.py
+++ b/src/parser.py
@@ -239,8 +239,7 @@ class Parser(BisonParser):
                               + combine('+', values[2])))

        if option == 1:  # rule: exp MINUS exp
-            return Node('-', *(combine('-', values[0])
-                               + combine('-', values[2])))
+            return Node('-', values[0], values[2])

        if option == 2:  # rule: exp TIMES exp
            return Node('*', *(combine('*', values[0])

--- a/tests/test_calc.py
+++ b/tests/test_calc.py
@@ -79,3 +79,10 @@ class TestCalc(unittest.TestCase):
                      ]

        run_expressions(Parser, expressions)
+
+    def test_negation(self):
+        run_expressions(Parser, [
+            ('-9', N('-', L(9))),
+            ('--9', N('-', N('-', L(9)))),
+            ('a--9', N('-', L('a'), N('-', L(9)))),
+            ])