[#655] DMN 1.5: Explicit equality operators in unary tests (DMN15-108)

goldmansachs · Nov 26, 2024 · 4ba3ca6 · 4ba3ca6
1 parent e915805
commit 4ba3ca6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/analysis/syntax/ast/test/OperatorRange.java b/dmn-core/src/main/java/com/gs/dmn/feel/analysis/syntax/ast/test/OperatorRange.java
@@ -28,6 +28,8 @@ public OperatorRange(String operator, Expression<T> endpoint) {
         this.endpoint = endpoint;
         if (operator == null || "=".equals(operator)) {
             this.endpointsRange = new EndpointsRange<>(false, endpoint, false, endpoint);
+        } else if ("!=".equals(operator)) {
+            this.endpointsRange = new EndpointsRange<>(false, endpoint, false, endpoint);
         } else if ("<".equals(operator)) {
             this.endpointsRange = new EndpointsRange<>(true, null, true, endpoint);
         } else if ("<=".equals(operator)) {

diff --git a/dmn-core/src/main/resources/dmn/1.5/FEELParser.g4 b/dmn-core/src/main/resources/dmn/1.5/FEELParser.g4
@@ -80,9 +80,14 @@ positiveUnaryTest returns [Expression ast]:
     {$ast = astFactory.toPositiveUnaryTest($expression.ast);}
 ;
 
+opRel returns [String ast]:
+    (op = EQ | op = NE | op = LT | op = GT | op = LE | op = GE)
+    {$ast = $op.text;}
+;
+
 simplePositiveUnaryTest returns [Expression ast] :
-    ( op = LT | op = LE | op = GT | op = GE ) opd = endpoint
-    {$ast = $op == null ? astFactory.toOperatorRange(null, $opd.ast) : astFactory.toOperatorRange($op.text, $opd.ast);}
+    op = opRel opd = endpoint
+    {$ast = astFactory.toOperatorRange($op.ast, $opd.ast);}
     |
     opd2 = interval
     {$ast = $opd2.ast;}
@@ -235,7 +240,7 @@ comparison returns [Expression ast] :
     ae1 = arithmeticExpression
     {$ast = $ae1.ast;}
     (
-        (op = EQ | op = NE | op = LT | op = GT | op = LE | op = GE) ae2 = arithmeticExpression
+        op = opRel ae2 = arithmeticExpression
         {$ast = astFactory.toComparison($op.text, $ae1.ast, $ae2.ast);}
         |
         BETWEEN leftEndpoint = expression AND rightEndpoint = expression

diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java
@@ -433,6 +433,18 @@ public void testOperatorRange() {
         //
         // Simple Types
         //
+        doUnaryTestsTest(entries, "number", "= 123.45",
+                "PositiveUnaryTests(OperatorRange(=,NumericLiteral(123.45)))",
+                "TupleType(boolean)",
+                "numericEqual(number, number(\"123.45\"))",
+                this.lib.numericEqual(number, this.lib.number("123.45")),
+                false);
+        doUnaryTestsTest(entries, "number", "!= 123.45",
+                "PositiveUnaryTests(OperatorRange(!=,NumericLiteral(123.45)))",
+                "TupleType(boolean)",
+                "numericNotEqual(number, number(\"123.45\"))",
+                this.lib.numericNotEqual(number, this.lib.number("123.45")),
+                true);
         doUnaryTestsTest(entries, "number", "< 123.45",
                 "PositiveUnaryTests(OperatorRange(<,NumericLiteral(123.45)))",
                 "TupleType(boolean)",