#2196 #2178 Eliminate recursion from the groupBy rule

fieldenms · Mar 1, 2024 · 2b4c3ce · 2b4c3ce
1 parent b73225f
commit 2b4c3ce
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 233 deletions.
diff --git a/platform-eql-grammar/src/main/antlr4/EQL.g4 b/platform-eql-grammar/src/main/antlr4/EQL.g4
@@ -201,7 +201,7 @@ joinCondition :
 ;
 
 groupBy :
-      GROUPBY operand=singleOperand groupBy?
+      (GROUPBY operands+=singleOperand)+
 ;
 
 anyYield :

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
@@ -238,7 +238,7 @@ public final class CanonicalEqlGrammar {
             to(on, Condition).
 
         derive(GroupBy).
-            to(groupBy, label("operand", SingleOperand), opt(GroupBy)).
+            to(repeat1(groupBy, label("operand", SingleOperand))).
 
         specialize(AnyYield).
             into(Yield1, YieldMany).