This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch dev-new-parser
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/dev-new-parser by this push:
new f148383103 Add missing DRL soft keywords to the drlIdentfier rule
(#5861)
f148383103 is described below
commit f148383103451ed9b224e32cc0b9b8a56cf20792
Author: Jiří Locker <[email protected]>
AuthorDate: Tue Apr 23 08:40:59 2024 +0200
Add missing DRL soft keywords to the drlIdentfier rule (#5861)
---
.../src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4 | 5 +++++
.../src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4 | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
index 138f79ede2..f17ed63936 100644
---
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
+++
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
@@ -187,6 +187,7 @@ drlKeywords returns [Token token]
| DRL_FUNCTION
| DRL_GLOBAL
| DRL_DECLARE
+ | DRL_TRAIT
| DRL_RULE
| DRL_QUERY
| DRL_WHEN
@@ -198,6 +199,7 @@ drlKeywords returns [Token token]
| DRL_NOT
| DRL_IN
| DRL_FROM
+ | DRL_COLLECT
| DRL_ACCUMULATE
| DRL_ACC
| DRL_INIT
@@ -206,6 +208,8 @@ drlKeywords returns [Token token]
| DRL_RESULT
| DRL_ENTRY_POINT
| DRL_EVAL
+ | DRL_FORALL
+ | DRL_OVER
| DRL_SALIENCE
| DRL_ENABLED
| DRL_NO_LOOP
@@ -222,6 +226,7 @@ drlKeywords returns [Token token]
| DRL_CALENDARS
| DRL_TIMER
| DRL_DURATION
+ | DRL_WINDOW
;
builtInOperator returns[Token token]
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
index 0d6c42b8d7..f4358ccf70 100644
---
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
+++
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
@@ -403,7 +403,7 @@ consequenceBody : ( RHS_STRING_LITERAL | RHS_CHUNK )* ;
// THEN LEFT_SQUARE ID RIGHT_SQUARE chunk
namedConsequence : RHS_NAMED_CONSEQUENCE_THEN consequenceBody ;
-stringId : ( IDENTIFIER | DRL_STRING_LITERAL ) ;
+stringId : ( drlIdentifier | DRL_STRING_LITERAL ) ;
type : (classOrInterfaceType | primitiveType) typeArguments? ( DOT IDENTIFIER
typeArguments? )* (LBRACK RBRACK)* ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
