- drop Annotation inside LHS

apache · Jan 24, 2025 · e59ed36 · e59ed36
1 parent 75bfe12
commit e59ed36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java b/...drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
@@ -4057,6 +4057,7 @@ void lhsPatternAnnotation() {
         assertThat(annotationDescr.getSingleValueAsString()).isEqualTo("!*, age");
     }
 
+    @DisabledIfSystemProperty(named = "drools.drl.antlr4.parser.enabled", matches = "true")
     @Test
     void prefixAndDescrAnnotation() {
         final String text =
@@ -4078,6 +4079,7 @@ void prefixAndDescrAnnotation() {
         assertThat(andDescr.getDescrs()).hasSize(2);
     }
 
+    @DisabledIfSystemProperty(named = "drools.drl.antlr4.parser.enabled", matches = "true")
     @Test
     void prefixOrDescrAnnotation() {
         final String text =
@@ -4100,6 +4102,7 @@ void prefixOrDescrAnnotation() {
         assertThat(orDescr.getDescrs()).hasSize(2);
     }
 
+    @DisabledIfSystemProperty(named = "drools.drl.antlr4.parser.enabled", matches = "true")
     @Test
     void infixAndDescrAnnotation() {
         final String text =
@@ -4120,6 +4123,7 @@ void infixAndDescrAnnotation() {
         assertThat(andDescr.getDescrs()).hasSize(3);
     }
 
+    @DisabledIfSystemProperty(named = "drools.drl.antlr4.parser.enabled", matches = "true")
     @Test
     void infixOrDescrAnnotation() {
         final String text =

diff --git a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL10Parser.g4 b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL10Parser.g4
@@ -122,10 +122,10 @@ lhs : DRL_WHEN lhsExpression* ;
 queryLhs : lhsExpression* ;
 
 lhsExpression : LPAREN lhsExpression RPAREN                             #lhsExpressionEnclosed
-              | DRL_OR drlAnnotation* lhsExpression+                                   #lhsOr
-              | lhsExpression ((DRL_OR) drlAnnotation* lhsExpression)+              #lhsOr
-              | DRL_AND drlAnnotation* lhsExpression+                                  #lhsAnd
-              | lhsExpression ((DRL_AND) drlAnnotation* lhsExpression)+            #lhsAnd
+              | DRL_OR lhsExpression+                                   #lhsOr
+              | lhsExpression ((DRL_OR) lhsExpression)+              #lhsOr
+              | DRL_AND lhsExpression+                                  #lhsAnd
+              | lhsExpression ((DRL_AND) lhsExpression)+            #lhsAnd
               | lhsUnary                                                               #lhsUnarySingle
               ;
 

diff --git a/...piler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java b/...piler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java
@@ -30,6 +30,7 @@
 import org.drools.testcoverage.common.util.KieBaseUtil;
 import org.drools.testcoverage.common.util.KieUtil;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.kie.api.KieBase;
@@ -273,6 +274,7 @@ public void testAnnotationNameClashWithRegularClass(KieBaseTestConfiguration kie
         int[] numbers();
     }
 
+    @DisabledIfSystemProperty(named = "drools.drl.antlr4.parser.enabled", matches = "true")
     @ParameterizedTest(name = "KieBase type={0}")
 	@MethodSource("parameters")
     public void testAnnotationOnLHSAndMerging(KieBaseTestConfiguration kieBaseTestConfiguration) {