[DROOLS-7285] Failed to parse and/or with parentheses in LHS (#15)

kiegroup · Oct 24, 2024 · 72ac496 · 72ac496
1 parent 413d4cf
commit 72ac496
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
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
@@ -39,7 +39,7 @@ ruledef : DRL_RULE name=stringId (EXTENDS stringId)? drlAnnotation* attributes?
 lhs : DRL_WHEN lhsExpression? ;
 lhsExpression : lhsOr+ ;
 lhsOr : LPAREN DRL_OR lhsAnd+ RPAREN | lhsAnd (DRL_OR lhsAnd)* ;
-lhsAnd : LPAREN DRL_AND lhsUnary+ RPAREN | lhsUnary (DRL_AND lhsUnary)* ;
+lhsAnd : LPAREN lhsAnd RPAREN | LPAREN DRL_AND lhsUnary+ RPAREN | lhsUnary (DRL_AND lhsUnary)* ;
 
 /*
 lhsUnary : ( lhsExists namedConsequence?

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
@@ -301,6 +301,9 @@ public BaseDescr visitLhsOr(DRLParser.LhsOrContext ctx) {
 
     @Override
     public BaseDescr visitLhsAnd(DRLParser.LhsAndContext ctx) {
+        if (ctx.lhsAnd() != null) {
+            return visitLhsAnd(ctx.lhsAnd());
+        }
         if (!ctx.DRL_AND().isEmpty()) {
             AndDescr andDescr = new AndDescr();
             List<BaseDescr> descrList = visitDescrChildren(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
@@ -1224,7 +1224,6 @@ public void parse_BoundVariables() throws Exception {
         assertThat(fld.getExpression()).isEqualTo("likes == $type");
     }
 
-    @Disabled("Priority : High | Failed to parse and/or with parentheses in LHS")
     @Test
     public void parse_OrNesting() throws Exception {
         final PackageDescr pkg = parseAndGetPackageDescrFromFile(