Merge pull request #66 from ciobis/fix-boolean-negation

Fix parsing for boolean expressions starting with negation
burtcorp · Dec 4, 2021 · c9cb9f3 · c9cb9f3
2 parents f119644 + 93701c6
commit c9cb9f3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/jmespath-core/src/main/antlr4/io/burt/jmespath/parser/JmesPath.g4 b/jmespath-core/src/main/antlr4/io/burt/jmespath/parser/JmesPath.g4
@@ -7,10 +7,10 @@ expression
   | expression bracketSpecifier # bracketedExpression
   | bracketSpecifier # bracketExpression
   | expression COMPARATOR expression # comparisonExpression
+  | '!' expression # notExpression
   | expression '&&' expression # andExpression
   | expression '||' expression # orExpression
   | identifier # identifierExpression
-  | '!' expression # notExpression
   | '(' expression ')' # parenExpression
   | wildcard # wildcardExpression
   | multiSelectList # multiSelectListExpression

diff --git a/jmespath-core/src/test/java/io/burt/jmespath/parser/ParserTest.java b/jmespath-core/src/test/java/io/burt/jmespath/parser/ParserTest.java
@@ -805,6 +805,32 @@ public void bareNegatedExpression() {
     assertThat(actual, is(expected));
   }
 
+  @Test
+  public void negatedBooleansTripleConjunctionExpression() {
+    Expression<Object> expected = And(
+        And(
+            Negate(Property("foo")),
+            Negate(Property("bar"))
+        ),
+        Negate(Property("buzz"))
+    );
+    Expression<Object> actual = compile("!foo && !bar && !buzz");
+    assertThat(actual, is(expected));
+  }
+
+  @Test
+  public void negatedBooleansTripleDisjunctionExpression() {
+    Expression<Object> expected = Or(
+        Or(
+            Negate(Property("foo")),
+            Negate(Property("bar"))
+        ),
+        Negate(Property("buzz"))
+    );
+    Expression<Object> actual = compile("!foo || !bar || !buzz");
+    assertThat(actual, is(expected));
+  }
+
   @Test
   public void negatedSelectionExpression() {
     Expression<Object> expected = Sequence(