handle negative comparison

sidhant92 · Aug 24, 2024 · 5d02762 · 5d02762
1 parent 99128b0
commit 5d02762
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/internal/parser/antlr/custom_listener.go b/internal/parser/antlr/custom_listener.go
@@ -154,7 +154,7 @@ func (l *CustomListener) ExitComparatorExpression(ctx *lib.ComparatorExpressionC
 
 func (l *CustomListener) ExitUnaryArithmeticExpression(ctx *lib.UnaryArithmeticExpressionContext) {
 	var leafNode logical.Node
-	if len(l.Nodes) > 0 {
+	if len(l.Nodes) > 0 && reflect.TypeOf(l.Nodes[0]) == reflect.TypeOf(&arithmetic.ArithmeticNode{}) {
 		leafNode = l.pop()
 	} else {
 		leafNode = l.mapTypesExpressionContext(ctx.GetExp().(*lib.TypesExpressionContext))

diff --git a/pkg/application/boolean_expression_evaluator_test.go b/pkg/application/boolean_expression_evaluator_test.go
@@ -470,6 +470,15 @@ func TestDefaultFieldFalse(t *testing.T) {
 	assert.False(t, res)
 }
 
+func TestNegativeComparison(t *testing.T) {
+	data := map[string]interface{}{
+		"a": -6,
+	}
+	res, err := evaluator.Evaluate("a > -10 AND a < -2", data)
+	assert.Nil(t, err)
+	assert.True(t, res)
+}
+
 func TestContainsAnyTrueCondition(t *testing.T) {
 	data := map[string]interface{}{
 		"age": []int32{1, 2, 3},