[DROOLS-7294] Implement forall (apache#34)

tkobayas · Feb 15, 2024 · 0388d4d · 0388d4d
1 parent fad4c7d
commit 0388d4d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/drools-drl/drools-drl10-parser/src/main/antlr4/org/drools/parser/DRLLexer.g4 b/drools-drl/drools-drl10-parser/src/main/antlr4/org/drools/parser/DRLLexer.g4
@@ -51,6 +51,7 @@ DRL_REVERSE : 'reverse';
 DRL_RESULT : 'result';
 DRL_ENTRY_POINT : 'entry-point';
 DRL_EVAL : 'eval';
+DRL_FORALL : 'forall';
 
 DRL_SALIENCE : 'salience';
 DRL_ENABLED : 'enabled';

diff --git a/drools-drl/drools-drl10-parser/src/main/antlr4/org/drools/parser/DRLParser.g4 b/drools-drl/drools-drl10-parser/src/main/antlr4/org/drools/parser/DRLParser.g4
@@ -68,9 +68,10 @@ lhsUnary : (
            lhsExists
            | lhsNot
            | lhsEval
+           | lhsForall
            | lhsAccumulate
            | lhsPatternBind
-           ) ;
+           ) SEMI? ;
 
 lhsPatternBind : label? ( LPAREN lhsPattern (DRL_OR lhsPattern)* RPAREN | lhsPattern ) ;
 
@@ -330,6 +331,12 @@ lhsNot : DRL_NOT lhsPatternBind ;
  */
 lhsEval : DRL_EVAL LPAREN conditionalOrExpression RPAREN ;
 
+/**
+ * lhsForall := FORALL LEFT_PAREN lhsPatternBind+ RIGHT_PAREN
+ */
+
+lhsForall : DRL_FORALL LPAREN lhsPatternBind+ RPAREN ;
+
 /**
  * lhsAccumulate := (ACCUMULATE|ACC) LEFT_PAREN lhsAnd (COMMA|SEMICOLON)
  *                      accumulateFunctionBinding (COMMA accumulateFunctionBinding)*

diff --git a/drools-drl/drools-drl10-parser/src/main/java/org/drools/parser/DRLVisitorImpl.java b/drools-drl/drools-drl10-parser/src/main/java/org/drools/parser/DRLVisitorImpl.java
@@ -19,6 +19,7 @@
 import org.drools.drl.ast.descr.EvalDescr;
 import org.drools.drl.ast.descr.ExistsDescr;
 import org.drools.drl.ast.descr.ExprConstraintDescr;
+import org.drools.drl.ast.descr.ForallDescr;
 import org.drools.drl.ast.descr.FromDescr;
 import org.drools.drl.ast.descr.FunctionDescr;
 import org.drools.drl.ast.descr.FunctionImportDescr;
@@ -262,6 +263,13 @@ public PatternDescr visitLhsPattern(DRLParser.LhsPatternContext ctx) {
         return patternDescr;
     }
 
+    @Override
+    public ForallDescr visitLhsForall(DRLParser.LhsForallContext ctx) {
+        ForallDescr forallDescr = new ForallDescr();
+        visitDescrChildren(ctx).forEach(forallDescr::addDescr);
+        return forallDescr;
+    }
+
     @Override
     public PatternDescr visitLhsAccumulate(DRLParser.LhsAccumulateContext ctx) {
         AccumulateDescr accumulateDescr = new AccumulateDescr();
@@ -398,7 +406,7 @@ public BaseDescr visitLhsAndForAccumulate(DRLParser.LhsAndForAccumulateContext c
 
     @Override
     public BaseDescr visitLhsUnary(DRLParser.LhsUnaryContext ctx) {
-        return (BaseDescr) visitChildren(ctx);
+        return visitDescrChildren(ctx).get(0);
     }
 
     private void populateStartEnd(BaseDescr descr, ParserRuleContext ctx) {

diff --git a/drools-drl/drools-drl10-parser/src/test/java/org/drools/parser/MiscDRLParserTest.java b/drools-drl/drools-drl10-parser/src/test/java/org/drools/parser/MiscDRLParserTest.java
@@ -2126,7 +2126,6 @@ public void parse_NestedCEs() throws Exception {
         assertThat("Cheese").isEqualTo(cheese3.getObjectType());
     }
 
-    @Disabled("Priority : High | Implement forall")
     @Test
     public void parse_Forall() throws Exception {
         final PackageDescr pkg = parseAndGetPackageDescrFromFile(
@@ -2147,7 +2146,6 @@ public void parse_Forall() throws Exception {
         assertThat(cheese.getObjectType()).isEqualTo("Cheese");
     }
 
-    @Disabled("Priority : High | Implement forall")
     @Test
     public void parse_ForallWithFrom() throws Exception {
         final PackageDescr pkg = parseAndGetPackageDescrFromFile(