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 ef1d992595 [incubator-kie-drools#5681] Experiment: New DRL Parser :
Test failure… (#5693)
ef1d992595 is described below
commit ef1d9925959289726584e7571252e6e9313c676a
Author: Toshiya Kobayashi <[email protected]>
AuthorDate: Tue Feb 20 16:48:54 2024 +0900
[incubator-kie-drools#5681] Experiment: New DRL Parser : Test failure…
(#5693)
* [incubator-kie-drools#5681] Experiment: New DRL Parser : Test failure :
Unknown language level
- Revert the introduction of LanguageLevelOption.DRL10. Use DRL6 as usual.
Instead, intorduced system property "drools.drl.antlr4.parser.enabled" for
parser impl switch
- Use a package name 'antlr4' instead of 'drl10' for the new parser
separation
* - Enable the new parser by default so that CI can run
- Also suppress some GHAs which don't run with a feature branch
---
.github/workflows/pr-downstream.yml | 1 +
.github/workflows/pr-drools-ansible.yml | 1 +
.../parser/antlr4}/DRLExprParserTest.java | 4 +-
.../parser/antlr4}/DRLParserTest.java | 8 +--
.../parser/antlr4}/DescrDumperTest.java | 4 +-
.../parser/antlr4}/MiscDRLParserTest.java | 4 +-
.../parser/antlr4}/Rule_with_Extends.drl | 0
.../parser/antlr4}/Rule_with_Metadata.drl | 0
.../parser/antlr4}/Rule_with_nested_LHS.drl | 0
.../parser => drl/parser/antlr4}/accumulate.drl | 0
.../parser/antlr4}/accumulateExternalFunction.drl | 0
.../parser/antlr4}/accumulateMultipleFunctions.drl | 0
.../accumulateMultipleFunctionsConstraint.drl | 0
.../parser/antlr4}/accumulateReverse.drl | 0
.../parser/antlr4}/accumulate_multi_pattern.drl | 0
.../parser/antlr4}/accumulate_with_bindings.drl | 0
.../parser/antlr4}/accumulate_with_nested_from.drl | 0
.../parser/antlr4}/almost_empty_rule.drl | 0
.../parser => drl/parser/antlr4}/and_or_rule.drl | 0
.../parser => drl/parser/antlr4}/autofocus.drl | 0
.../parser => drl/parser/antlr4}/basic_binding.drl | 0
.../parser => drl/parser/antlr4}/bindings.drl | 0
.../parser/antlr4}/brackets_precedence.drl | 0
.../parser => drl/parser/antlr4}/collect.drl | 0
.../parser/antlr4}/collect_with_nested_from.drl | 0
.../parser => drl/parser/antlr4}/comment.drl | 0
.../parser => drl/parser/antlr4}/complex.dsl | 0
.../parser/antlr4}/declaration-in-consequence.drl | 0
.../parser/antlr4}/declare_type_with_fields.drl | 0
.../parser => drl/parser/antlr4}/empty_rule.drl | 0
.../parser => drl/parser/antlr4}/enumeration.drl | 0
.../parser/antlr4}/eol_funny_business.drl | 0
.../parser/antlr4}/escaped-string.drl | 0
.../parser => drl/parser/antlr4}/eval_multiple.drl | 0
.../parser => drl/parser/antlr4}/eval_parsing.drl | 0
.../parser/antlr4}/eval_with_newline.drl | 0
.../antlr4}/expander_multiple_constraints.dslr | 0
.../expander_multiple_constraints_flush.dslr | 0
.../parser/antlr4}/expander_spread_lines.dslr | 0
.../parser/antlr4}/extra_lhs_newline.drl | 0
.../{drl10/parser => drl/parser/antlr4}/forall.drl | 0
.../parser/antlr4}/forallwithfrom.drl | 0
.../{drl10/parser => drl/parser/antlr4}/from.drl | 0
.../parser/antlr4}/function_arrays.drl | 0
.../parser => drl/parser/antlr4}/functions.drl | 0
.../parser => drl/parser/antlr4}/globals.drl | 0
.../parser/antlr4}/in_operator_test.drl | 0
.../parser/antlr4}/lhs_semicolon_delim.drl | 0
.../parser/antlr4}/literal_bool_and_negative.drl | 0
.../parser/antlr4}/multiple_constraints.dsl | 0
.../parser/antlr4}/multiple_rules.drl | 0
.../parser/antlr4}/nested_conditional_elements.drl | 0
.../parser => drl/parser/antlr4}/no-loop.drl | 0
.../parser/antlr4}/not_exist_with_brackets.drl | 0
.../parser/antlr4}/not_with_constraint.drl | 0
.../parser/antlr4}/notin_operator_test.drl | 0
.../parser => drl/parser/antlr4}/or_binding.drl | 0
.../parser/antlr4}/or_binding_complex.drl | 0
.../parser/antlr4}/or_binding_with_brackets.drl | 0
.../{drl10/parser => drl/parser/antlr4}/or_ce.drl | 0
.../parser => drl/parser/antlr4}/or_nesting.drl | 0
.../parser/antlr4}/package_attributes.drl | 0
.../parser/antlr4}/pluggable_operators.drl | 0
.../parser/antlr4}/qualified_classname.drl | 0
.../parser/antlr4}/query_and_rule.drl | 0
.../parser/antlr4}/quoted_string_name_rule.drl | 0
.../parser/antlr4}/restrictions_test.drl | 0
.../parser/antlr4}/rule_attributes.drl | 0
.../parser/antlr4}/rule_attributes2.drl | 0
.../parser/antlr4}/rule_attributes_alt.drl | 0
.../parser/antlr4}/rule_calendars_attribute.drl | 0
.../parser/antlr4}/rule_calendars_attribute2.drl | 0
.../parser/antlr4}/rule_duration_expression.drl | 0
.../parser/antlr4}/rule_enabled_expression.drl | 0
.../parser/antlr4}/rule_names_number_prefix.drl | 0
.../parser => drl/parser/antlr4}/rule_not.drl | 0
.../parser => drl/parser/antlr4}/ruleflowgroup.drl | 0
.../parser => drl/parser/antlr4}/semicolon.drl | 0
.../parser => drl/parser/antlr4}/simple_query.drl | 0
.../parser => drl/parser/antlr4}/simple_rule.drl | 0
.../parser/antlr4}/soundslike_operator.drl | 0
.../parser/antlr4}/statement_ordering_1.drl | 0
.../parser/antlr4}/ternary_expression.drl | 0
.../test_CommentLineNumbersInConsequence.drl | 0
.../antlr4}/test_ComplexChainedCallWithFrom.drl | 0
.../parser/antlr4}/test_EmptyPattern.drl | 0
.../parser/antlr4}/test_EndPosition.drl | 0
.../parser/antlr4}/test_FunctionImport.drl | 0
.../antlr4}/test_SimpleAccessorArgWithFrom.drl | 0
.../parser/antlr4}/test_SimpleAccessorWithFrom.drl | 0
.../antlr4}/test_SimpleFunctionCallWithFrom.drl | 0
.../antlr4}/test_SimpleMethodCallWithFrom.drl | 0
.../parser/antlr4}/type_with_meta.drl | 0
.../parser => drl/parser/antlr4}/with_eval.drl | 0
.../parser/antlr4}/with_predicate.drl | 0
.../parser => drl/parser/antlr4}/with_retval.drl | 0
drools-drl/drools-drl-parser/pom.xml | 2 +-
.../parser/antlr4}/DRL6Expressions.g4 | 0
.../parser => drl/parser/antlr4}/DRLLexer.g4 | 0
.../parser => drl/parser/antlr4}/DRLParser.g4 | 0
.../parser => drl/parser/antlr4}/JavaLexer.g4 | 0
.../parser => drl/parser/antlr4}/JavaParser.g4 | 0
.../java/org/drools/drl/parser/DRLFactory.java | 3 -
.../drools/drl/parser/DrlExprParserFactory.java | 6 +-
.../main/java/org/drools/drl/parser/DrlParser.java | 82 ++++++++++++++--------
.../parser/antlr4}/DRLErrorListener.java | 2 +-
.../parser/antlr4}/DRLExpressions.java | 2 +-
.../parser/antlr4}/DRLParserError.java | 2 +-
.../parser/antlr4}/DRLParserException.java | 2 +-
.../parser/antlr4}/DRLParserHelper.java | 12 +++-
.../parser/antlr4}/DRLParserWrapper.java | 13 +++-
.../parser/antlr4}/DRLVisitorImpl.java | 12 ++--
.../parser/antlr4}/Developer_Notes.md | 0
.../parser/antlr4/Drl6ExprParserAntlr4.java} | 6 +-
.../antlr4}/DroolsParserExceptionFactory.java | 2 +-
.../parser => drl/parser/antlr4}/ParserHelper.java | 2 +-
.../parser/antlr4}/ParserStringUtils.java | 2 +-
.../org/drools/drl/parser/lang/DRL10Lexer.java | 46 ------------
.../internal/builder/conf/LanguageLevelOption.java | 2 +-
pom.xml | 6 +-
120 files changed, 109 insertions(+), 117 deletions(-)
diff --git a/.github/workflows/pr-downstream.yml
b/.github/workflows/pr-downstream.yml
index 3d1cecd0e6..e29b9fd79a 100644
--- a/.github/workflows/pr-downstream.yml
+++ b/.github/workflows/pr-downstream.yml
@@ -14,6 +14,7 @@ on:
jobs:
kogito-downstream-build:
+ if false: # Temporally disabled because downstream build doesn't work with
the feature branch dev-new-parser
concurrency:
group: pr-${{ matrix.job_name }}_${{ matrix.os }}_${{
matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
cancel-in-progress: true
diff --git a/.github/workflows/pr-drools-ansible.yml
b/.github/workflows/pr-drools-ansible.yml
index 44f4abc86d..9b7fbd8e2d 100644
--- a/.github/workflows/pr-drools-ansible.yml
+++ b/.github/workflows/pr-drools-ansible.yml
@@ -14,6 +14,7 @@ on:
jobs:
drools-ansible:
+ if false: # Temporally disabled because downstream build doesn't work with
the feature branch dev-new-parser
concurrency:
group: pr-drools_ansible_${{ matrix.os }}_${{ matrix.java-version }}_${{
matrix.maven-version }}_${{ github.head_ref }}
cancel-in-progress: true
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLExprParserTest.java
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLExprParserTest.java
similarity index 99%
rename from
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLExprParserTest.java
rename to
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLExprParserTest.java
index 1f27a9c861..b573cd1ae5 100644
---
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLExprParserTest.java
+++
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLExprParserTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import static org.assertj.core.api.Assertions.assertThat;
@@ -41,7 +41,7 @@ public class DRLExprParserTest {
@BeforeEach
public void setUp() throws Exception {
- this.parser = new Drl10ExprParser(LanguageLevelOption.DRL6);
+ this.parser = new Drl6ExprParserAntlr4(LanguageLevelOption.DRL6);
}
@AfterEach
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLParserTest.java
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLParserTest.java
similarity index 94%
rename from
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLParserTest.java
rename to
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLParserTest.java
index 35c4638ebc..8aecc0fb05 100644
---
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DRLParserTest.java
+++
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DRLParserTest.java
@@ -1,4 +1,4 @@
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.List;
@@ -13,9 +13,9 @@ import org.drools.drl.ast.descr.RuleDescr;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.drools.drl10.parser.DRLParserHelper.computeTokenIndex;
-import static org.drools.drl10.parser.DRLParserHelper.createDrlParser;
-import static org.drools.drl10.parser.DRLParserHelper.parse;
+import static org.drools.drl.parser.antlr4.DRLParserHelper.computeTokenIndex;
+import static org.drools.drl.parser.antlr4.DRLParserHelper.createDrlParser;
+import static org.drools.drl.parser.antlr4.DRLParserHelper.parse;
class DRLParserTest {
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DescrDumperTest.java
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DescrDumperTest.java
similarity index 99%
rename from
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DescrDumperTest.java
rename to
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DescrDumperTest.java
index d98ec8ec89..ab644f7daf 100644
---
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/DescrDumperTest.java
+++
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/DescrDumperTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import static org.assertj.core.api.Assertions.assertThat;
@@ -358,7 +358,7 @@ public class DescrDumperTest {
}
public ConstraintConnectiveDescr parse( final String constraint ) {
- DrlExprParser parser = new Drl10ExprParser(LanguageLevelOption.DRL6);
+ DrlExprParser parser = new
Drl6ExprParserAntlr4(LanguageLevelOption.DRL6);
ConstraintConnectiveDescr result = parser.parse( constraint );
assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse();
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/MiscDRLParserTest.java
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
similarity index 99%
rename from
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/MiscDRLParserTest.java
rename to
drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
index 6353be53ac..ae45a8cc3e 100644
---
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl10/parser/MiscDRLParserTest.java
+++
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
@@ -1,4 +1,4 @@
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.io.BufferedReader;
import java.io.IOException;
@@ -39,7 +39,7 @@ import org.drools.drl.ast.descr.RuleDescr;
import org.drools.drl.ast.descr.TypeDeclarationDescr;
import org.drools.drl.ast.descr.TypeFieldDescr;
import org.drools.drl.ast.descr.WindowDeclarationDescr;
-import org.drools.drl10.parser.DRLParserWrapper;
+import org.drools.drl.parser.antlr4.DRLParserWrapper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_Extends.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_Extends.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_Extends.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_Extends.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_Metadata.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_Metadata.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_Metadata.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_Metadata.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_nested_LHS.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_nested_LHS.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/Rule_with_nested_LHS.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/Rule_with_nested_LHS.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateExternalFunction.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateExternalFunction.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateExternalFunction.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateExternalFunction.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateMultipleFunctions.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateMultipleFunctions.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateMultipleFunctions.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateMultipleFunctions.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateMultipleFunctionsConstraint.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateMultipleFunctionsConstraint.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateMultipleFunctionsConstraint.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateMultipleFunctionsConstraint.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateReverse.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateReverse.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulateReverse.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulateReverse.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_multi_pattern.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_multi_pattern.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_multi_pattern.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_multi_pattern.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_with_bindings.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_with_bindings.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_with_bindings.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_with_bindings.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_with_nested_from.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_with_nested_from.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/accumulate_with_nested_from.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/accumulate_with_nested_from.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/almost_empty_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/almost_empty_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/almost_empty_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/almost_empty_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/and_or_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/and_or_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/and_or_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/and_or_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/autofocus.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/autofocus.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/autofocus.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/autofocus.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/basic_binding.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/basic_binding.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/basic_binding.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/basic_binding.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/bindings.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/bindings.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/bindings.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/bindings.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/brackets_precedence.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/brackets_precedence.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/brackets_precedence.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/brackets_precedence.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/collect.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/collect.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/collect.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/collect.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/collect_with_nested_from.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/collect_with_nested_from.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/collect_with_nested_from.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/collect_with_nested_from.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/comment.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/comment.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/comment.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/comment.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/complex.dsl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/complex.dsl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/complex.dsl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/complex.dsl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/declaration-in-consequence.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/declaration-in-consequence.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/declaration-in-consequence.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/declaration-in-consequence.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/declare_type_with_fields.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/declare_type_with_fields.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/declare_type_with_fields.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/declare_type_with_fields.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/empty_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/empty_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/empty_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/empty_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/enumeration.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/enumeration.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/enumeration.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/enumeration.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eol_funny_business.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eol_funny_business.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eol_funny_business.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eol_funny_business.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/escaped-string.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/escaped-string.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/escaped-string.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/escaped-string.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_multiple.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_multiple.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_multiple.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_multiple.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_parsing.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_parsing.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_parsing.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_parsing.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_with_newline.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_with_newline.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/eval_with_newline.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/eval_with_newline.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_multiple_constraints.dslr
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_multiple_constraints.dslr
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_multiple_constraints_flush.dslr
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_multiple_constraints_flush.dslr
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_spread_lines.dslr
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/expander_spread_lines.dslr
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/extra_lhs_newline.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/extra_lhs_newline.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/extra_lhs_newline.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/extra_lhs_newline.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/forall.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/forall.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/forall.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/forall.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/forallwithfrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/forallwithfrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/forallwithfrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/forallwithfrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/from.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/from.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/from.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/from.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/function_arrays.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/function_arrays.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/function_arrays.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/function_arrays.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/functions.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/functions.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/functions.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/functions.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/globals.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/globals.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/globals.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/globals.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/in_operator_test.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/in_operator_test.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/in_operator_test.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/in_operator_test.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/lhs_semicolon_delim.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/lhs_semicolon_delim.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/lhs_semicolon_delim.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/lhs_semicolon_delim.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/literal_bool_and_negative.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/literal_bool_and_negative.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/literal_bool_and_negative.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/literal_bool_and_negative.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/multiple_constraints.dsl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/multiple_constraints.dsl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/multiple_constraints.dsl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/multiple_constraints.dsl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/multiple_rules.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/multiple_rules.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/multiple_rules.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/multiple_rules.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/nested_conditional_elements.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/nested_conditional_elements.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/nested_conditional_elements.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/nested_conditional_elements.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/no-loop.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/no-loop.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/no-loop.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/no-loop.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/not_exist_with_brackets.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/not_exist_with_brackets.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/not_exist_with_brackets.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/not_exist_with_brackets.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/not_with_constraint.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/not_with_constraint.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/not_with_constraint.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/not_with_constraint.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/notin_operator_test.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/notin_operator_test.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/notin_operator_test.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/notin_operator_test.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding_complex.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding_complex.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding_complex.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding_complex.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding_with_brackets.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding_with_brackets.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_binding_with_brackets.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_binding_with_brackets.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_ce.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_ce.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_ce.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_ce.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_nesting.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_nesting.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/or_nesting.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/or_nesting.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/package_attributes.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/package_attributes.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/package_attributes.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/package_attributes.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/pluggable_operators.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/pluggable_operators.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/pluggable_operators.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/pluggable_operators.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/qualified_classname.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/qualified_classname.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/qualified_classname.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/qualified_classname.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/query_and_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/query_and_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/query_and_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/query_and_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/quoted_string_name_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/quoted_string_name_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/quoted_string_name_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/quoted_string_name_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/restrictions_test.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/restrictions_test.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/restrictions_test.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/restrictions_test.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes2.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes2.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes2.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes2.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes_alt.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes_alt.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_attributes_alt.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_attributes_alt.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_calendars_attribute.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_calendars_attribute.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_calendars_attribute.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_calendars_attribute.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_calendars_attribute2.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_calendars_attribute2.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_calendars_attribute2.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_calendars_attribute2.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_duration_expression.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_duration_expression.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_duration_expression.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_duration_expression.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_enabled_expression.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_enabled_expression.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_enabled_expression.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_enabled_expression.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_names_number_prefix.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_names_number_prefix.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_names_number_prefix.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_names_number_prefix.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_not.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_not.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/rule_not.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/rule_not.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/ruleflowgroup.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/ruleflowgroup.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/ruleflowgroup.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/ruleflowgroup.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/semicolon.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/semicolon.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/semicolon.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/semicolon.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/simple_query.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/simple_query.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/simple_query.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/simple_query.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/simple_rule.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/simple_rule.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/simple_rule.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/simple_rule.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/soundslike_operator.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/soundslike_operator.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/soundslike_operator.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/soundslike_operator.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/statement_ordering_1.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/statement_ordering_1.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/statement_ordering_1.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/statement_ordering_1.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/ternary_expression.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/ternary_expression.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/ternary_expression.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/ternary_expression.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_CommentLineNumbersInConsequence.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_CommentLineNumbersInConsequence.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_CommentLineNumbersInConsequence.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_CommentLineNumbersInConsequence.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_ComplexChainedCallWithFrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_ComplexChainedCallWithFrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_ComplexChainedCallWithFrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_ComplexChainedCallWithFrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_EmptyPattern.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_EmptyPattern.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_EmptyPattern.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_EmptyPattern.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_EndPosition.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_EndPosition.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_EndPosition.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_EndPosition.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_FunctionImport.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_FunctionImport.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_FunctionImport.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_FunctionImport.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleAccessorArgWithFrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleAccessorArgWithFrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleAccessorArgWithFrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleAccessorArgWithFrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleAccessorWithFrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleAccessorWithFrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleAccessorWithFrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleAccessorWithFrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleFunctionCallWithFrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleFunctionCallWithFrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleFunctionCallWithFrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleFunctionCallWithFrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleMethodCallWithFrom.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleMethodCallWithFrom.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/test_SimpleMethodCallWithFrom.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/test_SimpleMethodCallWithFrom.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/type_with_meta.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/type_with_meta.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/type_with_meta.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/type_with_meta.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_eval.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_eval.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_eval.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_eval.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_predicate.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_predicate.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_predicate.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_predicate.drl
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_retval.drl
b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_retval.drl
similarity index 100%
rename from
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl10/parser/with_retval.drl
rename to
drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/with_retval.drl
diff --git a/drools-drl/drools-drl-parser/pom.xml
b/drools-drl/drools-drl-parser/pom.xml
index 0eeb787100..d8b66f13e5 100644
--- a/drools-drl/drools-drl-parser/pom.xml
+++ b/drools-drl/drools-drl-parser/pom.xml
@@ -140,7 +140,7 @@
<configuration>
<visitor>true</visitor>
<listener>false</listener>
-
<libDirectory>src/main/antlr4/org/drools/drl10/parser/</libDirectory>
+
<libDirectory>src/main/antlr4/org/drools/drl/parser/antlr4</libDirectory>
</configuration>
</execution>
</executions>
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRL6Expressions.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRL6Expressions.g4
rename to
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRL6Expressions.g4
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRLLexer.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRLLexer.g4
rename to
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLLexer.g4
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRLParser.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/DRLParser.g4
rename to
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/JavaLexer.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaLexer.g4
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/JavaLexer.g4
rename to
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaLexer.g4
diff --git
a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/JavaParser.g4
b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaParser.g4
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl10/parser/JavaParser.g4
rename to
drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaParser.g4
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DRLFactory.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DRLFactory.java
index 71b23c2fdd..15bf0addf0 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DRLFactory.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DRLFactory.java
@@ -25,7 +25,6 @@ import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.RecognizerSharedState;
import org.antlr.runtime.TokenStream;
-import org.drools.drl.parser.lang.DRL10Lexer;
import org.drools.drl.parser.lang.DRL5Expressions;
import org.drools.drl.parser.lang.DRL5Lexer;
import org.drools.drl.parser.lang.DRL5Parser;
@@ -114,8 +113,6 @@ public class DRLFactory {
case DRL6:
case DRL6_STRICT:
return new DRL6Lexer(input);
- case DRL10:
- return new DRL10Lexer();
}
throw new RuntimeException("Unknown language level");
}
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlExprParserFactory.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlExprParserFactory.java
index 9ee116faf3..ae3ffcf935 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlExprParserFactory.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlExprParserFactory.java
@@ -1,6 +1,6 @@
package org.drools.drl.parser;
-import org.drools.drl10.parser.Drl10ExprParser;
+import org.drools.drl.parser.antlr4.Drl6ExprParserAntlr4;
import org.kie.internal.builder.conf.LanguageLevelOption;
public class DrlExprParserFactory {
@@ -10,9 +10,7 @@ public class DrlExprParserFactory {
case DRL5:
case DRL6:
case DRL6_STRICT:
- return new Drl6ExprParser(languageLevel);
- case DRL10:
- return new Drl10ExprParser(languageLevel);
+ return DrlParser.ANTLR4_PARSER_ENABLED ? new
Drl6ExprParserAntlr4(languageLevel) : new Drl6ExprParser(languageLevel);
default:
throw new RuntimeException("Unsupported language level: " +
languageLevel);
}
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java
index d6ee0c042b..4bad571401 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java
@@ -18,8 +18,8 @@
*/
package org.drools.drl.parser;
-import org.drools.drl10.parser.DRLParserError;
-import org.drools.drl10.parser.DRLParserWrapper;
+import org.drools.drl.parser.antlr4.DRLParserError;
+import org.drools.drl.parser.antlr4.DRLParserWrapper;
import org.drools.io.InternalResource;
import org.drools.drl.ast.descr.PackageDescr;
import org.drools.drl.parser.lang.DRLLexer;
@@ -37,9 +37,11 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.function.Function;
/**
* This is a low level parser API. This will return textual AST representations
@@ -57,6 +59,9 @@ public class DrlParser {
private DRLLexer lexer = null;
private Resource resource = null;
+ public static final String ANTLR4_PARSER_ENABLED_PROPERTY =
"drools.drl.antlr4.parser.enabled";
+ public static final boolean ANTLR4_PARSER_ENABLED =
Boolean.parseBoolean(System.getProperty(ANTLR4_PARSER_ENABLED_PROPERTY,
"true")); // default is true
+
public static final LanguageLevelOption DEFAULT_LANGUAGE_LEVEL =
LanguageLevelOption.DRL6;
private final LanguageLevelOption languageLevel;
@@ -76,16 +81,28 @@ public class DrlParser {
public PackageDescr parse(final boolean isEditor,
final String text) throws DroolsParserException {
- lexer = DRLFactory.buildLexer(text, languageLevel);
- DRLParser parser = DRLFactory.buildParser(lexer, languageLevel);
- return compile(isEditor, parser);
+ System.out.println("### parse : ANTLR4_PARSER_ENABLED = " +
ANTLR4_PARSER_ENABLED);
+ if (ANTLR4_PARSER_ENABLED) {
+ // new parser based on antlr4
+ return compileWithAntlr4Parser(parser -> parser.parse(new
StringReader(text)));
+ } else {
+ lexer = DRLFactory.buildLexer(text, languageLevel);
+ DRLParser parser = DRLFactory.buildParser(lexer, languageLevel);
+ return compile(isEditor, parser);
+ }
}
public PackageDescr parse(final boolean isEditor,
final Reader reader) throws
DroolsParserException {
- lexer = DRLFactory.buildLexer(reader, languageLevel);
- DRLParser parser = DRLFactory.buildParser( lexer, languageLevel );
- return compile(isEditor, parser);
+ System.out.println("### parse : ANTLR4_PARSER_ENABLED = " +
ANTLR4_PARSER_ENABLED);
+ if (ANTLR4_PARSER_ENABLED) {
+ // new parser based on antlr4
+ return compileWithAntlr4Parser(parser -> parser.parse(reader));
+ } else {
+ lexer = DRLFactory.buildLexer(reader, languageLevel);
+ DRLParser parser = DRLFactory.buildParser(lexer, languageLevel);
+ return compile(isEditor, parser);
+ }
}
public PackageDescr parse(final Resource resource, final Reader reader)
throws DroolsParserException {
@@ -166,29 +183,10 @@ public class DrlParser {
final InputStream is) throws
DroolsParserException, IOException {
this.resource = resource;
String encoding = resource instanceof InternalResource ?
((InternalResource) resource).getEncoding() : null;
- System.out.println("### parse : languageLevel = " + languageLevel);
- if (languageLevel == LanguageLevelOption.DRL10) {
+ System.out.println("### parse : ANTLR4_PARSER_ENABLED = " +
ANTLR4_PARSER_ENABLED);
+ if (ANTLR4_PARSER_ENABLED) {
// new parser based on antlr4
- try {
- DRLParserWrapper parser = new DRLParserWrapper();
- PackageDescr packageDescr = parser.parse(is);
- for (final DRLParserError drlParserError : parser.getErrors())
{
- final ParserError err = new ParserError(resource,
-
drlParserError.getMessage(),
-
drlParserError.getLineNumber(),
-
drlParserError.getColumn());
- this.results.add(err);
- }
- return !this.hasErrors() ? packageDescr : null;
- } catch (Exception e) {
- LOG.error("Exception", e);
- final ParserError err = new ParserError(resource,
- GENERIC_ERROR_MESSAGE
+ e.toString() + "\n" + Arrays.toString(e.getStackTrace()),
- -1,
- 0);
- this.results.add(err);
- throw new DroolsParserException(GENERIC_ERROR_MESSAGE +
e.getMessage(), e);
- }
+ return compileWithAntlr4Parser(parser -> parser.parse(is));
} else {
// old parsers based on antlr3
lexer = DRLFactory.buildLexer(is, encoding, languageLevel);
@@ -197,6 +195,30 @@ public class DrlParser {
}
}
+ private PackageDescr compileWithAntlr4Parser(Function<DRLParserWrapper,
PackageDescr> packageDescrFunction) throws DroolsParserException {
+ try {
+ // we don't use languageLevel here, assuming DRL6 compatible
+ DRLParserWrapper parser = new DRLParserWrapper();
+ PackageDescr packageDescr = packageDescrFunction.apply(parser);
+ for (final DRLParserError drlParserError : parser.getErrors()) {
+ final ParserError err = new ParserError(resource,
+
drlParserError.getMessage(),
+
drlParserError.getLineNumber(),
+
drlParserError.getColumn());
+ this.results.add(err);
+ }
+ return !this.hasErrors() ? packageDescr : null;
+ } catch (Exception e) {
+ LOG.error("Exception", e);
+ final ParserError err = new ParserError(resource,
+ GENERIC_ERROR_MESSAGE +
e.toString() + "\n" + Arrays.toString(e.getStackTrace()),
+ -1,
+ 0);
+ this.results.add(err);
+ throw new DroolsParserException(GENERIC_ERROR_MESSAGE +
e.getMessage(), e);
+ }
+ }
+
/**
* This will expand the DRL. useful for debugging.
*
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLErrorListener.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLErrorListener.java
similarity index 97%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLErrorListener.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLErrorListener.java
index 0e5b5985b6..00f9c4bc48 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLErrorListener.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLErrorListener.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.ArrayList;
import java.util.List;
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLExpressions.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLExpressions.java
similarity index 98%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLExpressions.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLExpressions.java
index e7aa8102c4..4c057189a1 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLExpressions.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLExpressions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.LinkedList;
import java.util.List;
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserError.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserError.java
similarity index 98%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserError.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserError.java
index 4b893e11e4..7c8f2c6890 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserError.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserError.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
/**
* Error information while parsing DRL
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserException.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserException.java
similarity index 96%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserException.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserException.java
index 833d1aa8df..79bd114d99 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserException.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
public class DRLParserException extends RuntimeException {
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserHelper.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserHelper.java
similarity index 93%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserHelper.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserHelper.java
index f4436bf44b..3d91f782a4 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserHelper.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserHelper.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Reader;
import java.io.UncheckedIOException;
import org.antlr.v4.runtime.CharStream;
@@ -63,6 +64,15 @@ public class DRLParserHelper {
}
}
+ public static DRLParser createDrlParser(Reader reader) {
+ try {
+ CharStream charStream = CharStreams.fromReader(reader);
+ return createDrlParser(charStream);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
private static DRLParser createDrlParser(CharStream charStream) {
DRLLexer drlLexer = new DRLLexer(charStream);
CommonTokenStream commonTokenStream = new CommonTokenStream(drlLexer);
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserWrapper.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserWrapper.java
similarity index 87%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserWrapper.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserWrapper.java
index 914255e137..c28e57b997 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLParserWrapper.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLParserWrapper.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.io.InputStream;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -27,7 +28,7 @@ import org.drools.drl.ast.descr.PackageDescr;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.drools.drl10.parser.DRLParserHelper.compilationUnitContext2PackageDescr;
+import static
org.drools.drl.parser.antlr4.DRLParserHelper.compilationUnitContext2PackageDescr;
/**
* Wrapper for DRLParser. Somewhat duplicated from DRLParserHelper, but this
class is instantiated and holds errors.
@@ -54,6 +55,14 @@ public class DRLParserWrapper {
return parse(drlParser);
}
+ /**
+ * Main entry point for parsing DRL
+ */
+ public PackageDescr parse(Reader reader) {
+ DRLParser drlParser = DRLParserHelper.createDrlParser(reader);
+ return parse(drlParser);
+ }
+
private PackageDescr parse(DRLParser drlParser) {
DRLErrorListener errorListener = new DRLErrorListener();
drlParser.addErrorListener(errorListener);
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLVisitorImpl.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
similarity index 98%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLVisitorImpl.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
index a977fee988..a3cae67b9b 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DRLVisitorImpl.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.ArrayList;
import java.util.List;
@@ -58,11 +58,11 @@ import org.drools.drl.ast.descr.TypeFieldDescr;
import org.drools.drl.ast.descr.UnitDescr;
import org.drools.drl.ast.descr.WindowDeclarationDescr;
-import static org.drools.drl10.parser.DRLParserHelper.getTextWithoutErrorNode;
-import static
org.drools.drl10.parser.ParserStringUtils.getTextPreservingWhitespace;
-import static
org.drools.drl10.parser.ParserStringUtils.getTokenTextPreservingWhitespace;
-import static
org.drools.drl10.parser.ParserStringUtils.safeStripStringDelimiters;
-import static org.drools.drl10.parser.ParserStringUtils.trimThen;
+import static
org.drools.drl.parser.antlr4.DRLParserHelper.getTextWithoutErrorNode;
+import static
org.drools.drl.parser.antlr4.ParserStringUtils.getTextPreservingWhitespace;
+import static
org.drools.drl.parser.antlr4.ParserStringUtils.getTokenTextPreservingWhitespace;
+import static
org.drools.drl.parser.antlr4.ParserStringUtils.safeStripStringDelimiters;
+import static org.drools.drl.parser.antlr4.ParserStringUtils.trimThen;
import static org.drools.util.StringUtils.unescapeJava;
/**
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/Developer_Notes.md
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/Developer_Notes.md
similarity index 100%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/Developer_Notes.md
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/Developer_Notes.md
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/Drl10ExprParser.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/Drl6ExprParserAntlr4.java
similarity index 94%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/Drl10ExprParser.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/Drl6ExprParserAntlr4.java
index 19ec473536..220c8bb066 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/Drl10ExprParser.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/Drl6ExprParserAntlr4.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.Collections;
import java.util.List;
@@ -34,13 +34,13 @@ import org.kie.internal.builder.conf.LanguageLevelOption;
* This is a helper class that provides helper methods to parse expressions
* using both the DRLExpressions parser and the DRLExprTree parser.
*/
-public class Drl10ExprParser implements DrlExprParser {
+public class Drl6ExprParserAntlr4 implements DrlExprParser {
private ParserHelper helper = null;
private final LanguageLevelOption languageLevel;
- public Drl10ExprParser(LanguageLevelOption languageLevel) {
+ public Drl6ExprParserAntlr4(LanguageLevelOption languageLevel) {
this.languageLevel = languageLevel;
}
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DroolsParserExceptionFactory.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DroolsParserExceptionFactory.java
similarity index 99%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DroolsParserExceptionFactory.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DroolsParserExceptionFactory.java
index abf586c55d..622ea8ae3b 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/DroolsParserExceptionFactory.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DroolsParserExceptionFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserHelper.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java
similarity index 99%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserHelper.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java
index f729115b7c..82d40b6302 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserHelper.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java
@@ -29,7 +29,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import java.util.ArrayDeque;
import java.util.ArrayList;
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserStringUtils.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserStringUtils.java
similarity index 98%
rename from
drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserStringUtils.java
rename to
drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserStringUtils.java
index ef22da2dce..22ea2a7fa6 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl10/parser/ParserStringUtils.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserStringUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.drl10.parser;
+package org.drools.drl.parser.antlr4;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.TokenStream;
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL10Lexer.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL10Lexer.java
deleted file mode 100644
index 15f6157bd3..0000000000
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/lang/DRL10Lexer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.drools.drl.parser.lang;
-
-import java.util.List;
-
-import org.antlr.runtime.Token;
-import org.drools.drl.parser.DroolsParserException;
-
-/**
- * No implementation because everything is handled by DRL10Parser
- */
-public class DRL10Lexer implements DRLLexer {
-
- @Override
- public String getSourceName() {
- throw new UnsupportedOperationException("This method should not be
called");
- }
-
- @Override
- public Token nextToken() {
- throw new UnsupportedOperationException("This method should not be
called");
- }
-
- @Override
- public List<DroolsParserException> getErrors() {
- throw new UnsupportedOperationException("This method should not be
called");
- }
-
-}
\ No newline at end of file
diff --git
a/kie-internal/src/main/java/org/kie/internal/builder/conf/LanguageLevelOption.java
b/kie-internal/src/main/java/org/kie/internal/builder/conf/LanguageLevelOption.java
index 86266a0f2d..ca8b96ee91 100644
---
a/kie-internal/src/main/java/org/kie/internal/builder/conf/LanguageLevelOption.java
+++
b/kie-internal/src/main/java/org/kie/internal/builder/conf/LanguageLevelOption.java
@@ -25,7 +25,7 @@ import org.kie.api.conf.OptionKey;
*/
public enum LanguageLevelOption implements SingleValueRuleBuilderOption {
- DRL5(false), DRL6(false), DRL6_STRICT(true), DRL10(false);
+ DRL5(false), DRL6(false), DRL6_STRICT(true);
private final boolean useJavaAnnotations;
diff --git a/pom.xml b/pom.xml
index 4766589618..ac6be77dbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,10 +262,10 @@
</profile>
<profile>
- <id>DRL10</id>
+ <id>disableNewParser</id>
<activation>
<property>
- <name>DRL10</name>
+ <name>disableNewParser</name>
</property>
</activation>
<build>
@@ -275,7 +275,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <drools.lang.level>DRL10</drools.lang.level>
+
<drools.drl.antlr4.parser.enabled>false</drools.drl.antlr4.parser.enabled>
</systemPropertyVariables>
</configuration>
</plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
