Skip to content

Fix Negative Comparison #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2024
Merged

Fix Negative Comparison #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/github/sidhant92/boolparser/parser/antlr/BooleanFilterListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions ...test/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down