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

…d for backward compatibility (apache#5977)
tkobayas · Jun 11, 2024 · e13629a · e13629a
1 parent 88a3adc
commit e13629a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
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
@@ -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");
+    }
 }
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
@@ -241,6 +241,7 @@ drlKeywords returns [Token token]
     | DRL_GLOBAL
     | DRL_DECLARE
     | DRL_TRAIT
+    | DRL_TYPE
     | DRL_RULE
     | DRL_QUERY
     | DRL_WHEN

diff --git a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4 b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4
@@ -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';

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
@@ -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