Merge pull request #43 from sidhant92/array_math_functions

Fix Negative Comparison
sidhant92 · Aug 24, 2024 · 86fb416 · 86fb416
2 parents 17dfb51 + 5cf9ac5
commit 86fb416
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java b/src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java
@@ -62,7 +62,7 @@ public void exitArithmeticExpression(BooleanExpressionParser.ArithmeticExpressio
 
     @Override
     public void exitUnaryArithmeticExpression(BooleanExpressionParser.UnaryArithmeticExpressionContext ctx) {
-        final Node leafNode = !currentNodes.isEmpty() ? currentNodes.pop() : mapTypesExpressionContext(
+        final Node leafNode = !currentNodes.isEmpty() && currentNodes.peek() instanceof ArithmeticNode ? currentNodes.pop() : mapTypesExpressionContext(
                 (BooleanExpressionParser.TypesExpressionContext) ctx.exp);
         currentNodes.add(ArithmeticNode.builder().left(leafNode).operator(Operator.UNARY).build());
         super.enterUnaryArithmeticExpression(ctx);

diff --git a/...test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java b/...test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java
@@ -587,6 +587,15 @@ public void testComparisonWithArithmeticFalseCondition1() {
         assertFalse(booleanOptional.get());
     }
 
+    @Test
+    public void testNegativeComparison() {
+        final Map<String, Object> data = new HashMap<>();
+        data.put("a", -6);
+        final Try<Boolean> resultOptional = booleanExpressionEvaluator.evaluate("a > -10 AND a < -2", data);
+        assertTrue(resultOptional.isSuccess());
+        assertEquals(resultOptional.get(), true);
+    }
+
     @Test
     public void testNullCheck() {
         final Map<String, Object> data = new HashMap<>();