#2178 Correct the Predicate rule

fieldenms · Feb 16, 2024 · 769a847 · 769a847
1 parent 383ee28
commit 769a847
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/platform-eql-grammar/src/main/java/fielden/platform/eql/CanonicalEqlGrammar.java b/platform-eql-grammar/src/main/java/fielden/platform/eql/CanonicalEqlGrammar.java
@@ -68,10 +68,10 @@ public final class CanonicalEqlGrammar {
             to(Predicate).or(Condition, and, Condition).or(Condition, or, Condition).or(begin, Condition, end).
 
         derive(Predicate).
-            to(Operand, UnaryComparisonOperator).
-            or(Operand, ComparisonOperator, ComparisonOperand).
-            or(Operand, QuantifiedComparisonOperator, QuantifiedOperand).
-            or(Operand, MembershipOperator, MembershipOperand).
+            to(ComparisonOperand, UnaryComparisonOperator).
+            or(ComparisonOperand, ComparisonOperator, ComparisonOperand).
+            or(ComparisonOperand, QuantifiedComparisonOperator, QuantifiedOperand).
+            or(ComparisonOperand, MembershipOperator, MembershipOperand).
             or(SingleConditionPredicate).
 
         derive(UnaryComparisonOperator).
@@ -265,7 +265,7 @@ public enum EqlVariable implements Variable {
         Expression,
         Where,
         Condition, Predicate,
-        Operand, SingleOperand, MultiOperand,
+        SingleOperand, MultiOperand,
         AnyProp, ExtProp, Prop,
         UnaryComparisonOperator, BinaryComparisonOperator, Val, Param,
         ArithmeticalOperator, SingleOperandOrExpr, ExprBody, Expr,