- fix error in string pre-processing

- add tests for pre-processed tree evaluation

1 files changed, 72 insertions, 2 deletions

diff --git a/pint/testsuite/test_pint_eval.py b/pint/testsuite/test_pint_eval.py
index bed8105..d396929 100644
--- a/pint/testsuite/test_pint_eval.py
+++ b/pint/testsuite/test_pint_eval.py
@@ -2,10 +2,13 @@ import pytest
 
 from pint.compat import tokenizer
 from pint.pint_eval import build_eval_tree
+from pint.util import string_preprocessor
 
 
 class TestPintEval:
-    def _test_one(self, input_text, parsed):
+    def _test_one(self, input_text, parsed, preprocess=False):
+        if preprocess:
+            input_text = string_preprocessor(input_text)
         assert build_eval_tree(tokenizer(input_text)).to_string() == parsed
 
     @pytest.mark.parametrize(
@@ -13,6 +16,7 @@ class TestPintEval:
         (
             ("3", "3"),
             ("1 + 2", "(1 + 2)"),
+            ("1 - 2", "(1 - 2)"),
             ("2 * 3 + 4", "((2 * 3) + 4)"),  # order of operations
             ("2 * (3 + 4)", "(2 * (3 + 4))"),  # parentheses
             (
@@ -71,4 +75,70 @@ class TestPintEval:
         ),
     )
     def test_build_eval_tree(self, input_text, parsed):
-        self._test_one(input_text, parsed)
+        self._test_one(input_text, parsed, preprocess=False)
+
+    @pytest.mark.parametrize(
+        ("input_text", "parsed"),
+        (
+            ("3", "3"),
+            ("1 + 2", "(1 + 2)"),
+            ("1 - 2", "(1 - 2)"),
+            ("2 * 3 + 4", "((2 * 3) + 4)"),  # order of operations
+            ("2 * (3 + 4)", "(2 * (3 + 4))"),  # parentheses
+            (
+                "1 + 2 * 3 ** (4 + 3 / 5)",
+                "(1 + (2 * (3 ** (4 + (3 / 5)))))",
+            ),  # more order of operations
+            (
+                "1 * ((3 + 4) * 5)",
+                "(1 * ((3 + 4) * 5))",
+            ),  # nested parentheses at beginning
+            ("1 * (5 * (3 + 4))", "(1 * (5 * (3 + 4)))"),  # nested parentheses at end
+            (
+                "1 * (5 * (3 + 4) / 6)",
+                "(1 * ((5 * (3 + 4)) / 6))",
+            ),  # nested parentheses in middle
+            ("-1", "(- 1)"),  # unary
+            ("3 * -1", "(3 * (- 1))"),  # unary
+            ("3 * --1", "(3 * (- (- 1)))"),  # double unary
+            ("3 * -(2 + 4)", "(3 * (- (2 + 4)))"),  # parenthetical unary
+            ("3 * -((2 + 4))", "(3 * (- (2 + 4)))"),  # parenthetical unary
+            # implicit op
+            ("3 4", "(3 * 4)"),
+            # implicit op, then parentheses
+            ("3 (2 + 4)", "(3 (2 + 4))"),
+            # parentheses, then implicit
+            ("(3 ** 4 ) 5", "((3 ** 4) 5)"),
+            # implicit op, then exponentiation
+            ("3 4 ** 5", "(3 * (4 ** 5))"),
+            # implicit op, then addition
+            ("3 4 + 5", "((3 * 4) + 5)"),
+            # power followed by implicit
+            ("3 ** 4 5", "((3 ** 4) * 5)"),
+            # implicit with parentheses
+            ("3 (4 ** 5)", "(3 (4 ** 5))"),
+            # exponent with e
+            ("3e-1", "3e-1"),
+            # multiple units with exponents
+            ("kg ** 1 * s ** 2", "((kg ** 1) * (s ** 2))"),
+            # multiple units with neg exponents
+            ("kg ** -1 * s ** -2", "((kg ** (- 1)) * (s ** (- 2)))"),
+            # multiple units with neg exponents
+            ("kg^-1 * s^-2", "((kg ** (- 1)) * (s ** (- 2)))"),
+            # multiple units with neg exponents, implicit op
+            ("kg^-1 s^-2", "((kg ** (- 1)) * (s ** (- 2)))"),
+            # nested power
+            ("2 ^ 3 ^ 2", "(2 ** (3 ** 2))"),
+            # nested power
+            ("gram * second / meter ** 2", "((gram * second) / (meter ** 2))"),
+            # nested power
+            ("gram / meter ** 2 / second", "((gram / (meter ** 2)) / second)"),
+            # units should behave like numbers, so we don't need a bunch of extra tests for them
+            # implicit op, then addition
+            ("3 kg + 5", "((3 * kg) + 5)"),
+            ("(5 % 2) m", "((5 % 2) m)"),  # mod operator
+            ("(5 // 2) m", "((5 // 2) m)"),  # floordiv operator
+        ),
+    )
+    def test_preprocessed_eval_tree(self, input_text, parsed):
+        self._test_one(input_text, parsed, preprocess=True)