fix negation/infix precedence

chanzuckerberg · Nov 21, 2019 · 10e9cbb · 10e9cbb
1 parent a5fe0ca
commit 10e9cbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/WDL/_parser.py b/WDL/_parser.py
@@ -138,7 +138,7 @@
 ?expr_core: "(" expr ")"
           | literal
           | string
-          | "!" expr -> negate
+          | "!" expr_core -> negate
 
           | "[" [expr ("," expr)*] ","? "]" -> array
           | expr_core "[" expr "]" -> at

diff --git a/tests/test_0eval.py b/tests/test_0eval.py
@@ -131,7 +131,10 @@ def test_logic(self):
             ("!!true", "true"),
             ("!false", "true"),
             ("!false && true", "true"),
-            ("!(false && true)", "true")
+            ("!false && false", "false"),
+            ("!true && false", "false"),
+            ("!(false && false)", "true"),
+            ("!(false && true)", "true"),
         )
 
     def test_arithmetic(self):