Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[incubator-kie-drools-5911] [new-parser] Support optional type keywor… #5977

Merged
merged 2 commits into from
Jun 4, 2024
Merged

[incubator-kie-drools-5911] [new-parser] Support optional type keywor… #5977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a565b
[incubator-kie-drools-5911] [new-parser] Support optional type keywor…
tkobayas Jun 3, 2024
f7df263
Merge remote-tracking branch 'upstream/dev-new-parser' into incubator…
tkobayas Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5327,4 +5327,17 @@ void functionWithAnonymousClass() {
" }\n" +
" };");
}

@Test
void typeDeclarationWithTypeToken() {
final String drl = "declare type Foo\n" + // "type" is just optional
" id : int\n" +
"end";
final PackageDescr pkg = parseAndGetPackageDescr(drl);

TypeDeclarationDescr typeDeclarationDescr = pkg.getTypeDeclarations().get(0);
assertThat(typeDeclarationDescr.getTypeName()).isEqualTo("Foo");
TypeFieldDescr typeFieldDescr = typeDeclarationDescr.getFields().get("id");
assertThat(typeFieldDescr.getPattern().getObjectType()).isEqualTo("int");
}
}
1 change: 1 addition & 0 deletions drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ drlKeywords returns [Token token]
| DRL_GLOBAL
| DRL_DECLARE
| DRL_TRAIT
| DRL_TYPE
| DRL_RULE
| DRL_QUERY
| DRL_WHEN
Expand Down
1 change: 1 addition & 0 deletions drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ DRL_FUNCTION : 'function';
DRL_GLOBAL : 'global';
DRL_DECLARE : 'declare';
DRL_TRAIT : 'trait';
DRL_TYPE : 'type';
DRL_RULE : 'rule';
DRL_QUERY : 'query';
DRL_WHEN : 'when';
Expand Down
2 changes: 1 addition & 1 deletion drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ declaredef : DRL_DECLARE (
* END
*/

typeDeclaration : DRL_TRAIT? name=drlQualifiedName (EXTENDS superTypes+=drlQualifiedName (COMMA superTypes+=drlQualifiedName)* )? drlAnnotation* field* DRL_END ;
typeDeclaration : DRL_TRAIT? DRL_TYPE? name=drlQualifiedName (EXTENDS superTypes+=drlQualifiedName (COMMA superTypes+=drlQualifiedName)* )? drlAnnotation* field* DRL_END ;

// entryPointDeclaration := ENTRY-POINT stringId annotation* END

Expand Down
Loading