#2196 #2178 Extend the yield operand rule with expressions involving …

…yield operands This allows the body of expressions to use yield operands, not just single operands.
fieldenms · Mar 4, 2024 · b2d8e9a · b2d8e9a
1 parent dd0f493
commit b2d8e9a
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 126 deletions.
diff --git a/platform-eql-grammar/src/main/antlr4/EQL.g4 b/platform-eql-grammar/src/main/antlr4/EQL.g4
@@ -215,6 +215,7 @@ aliasedYield :
 
 yieldOperand :
       singleOperand # YieldOperand_SingleOperand
+    | BEGINEXPR first=yieldOperand (operators+=arithmeticalOperator rest+=yieldOperand)* ENDEXPR # YieldOperandExpr
     | COUNTALL # YieldOperand_CountAll
     | funcName=yieldOperandFunctionName argument=singleOperand # YieldOperandFunction
 ;

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
@@ -254,6 +254,7 @@ public final class CanonicalEqlGrammar {
 
         derive(YieldOperand).
             to(SingleOperand).
+            or(beginExpr, YieldOperand, repeat(ArithmeticalOperator, YieldOperand), endExpr).
             or(countAll).
             or(YieldOperandFunction).
 

diff --git a/platform-pojo-bl/src/main/java/ua/com/fielden/platform/eql/antlr/EQLBaseVisitor.java b/platform-pojo-bl/src/main/java/ua/com/fielden/platform/eql/antlr/EQLBaseVisitor.java
@@ -410,6 +410,13 @@ public class EQLBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements EQ
 	 * {@link #visitChildren} on {@code ctx}.</p>
 	 */
 	@Override public T visitYieldOperand_SingleOperand(EQLParser.YieldOperand_SingleOperandContext ctx) { return visitChildren(ctx); }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+	@Override public T visitYieldOperandExpr(EQLParser.YieldOperandExprContext ctx) { return visitChildren(ctx); }
 	/**
 	 * {@inheritDoc}
 	 *