[jboss-svn-commits] JBL Code SVN: r35928 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/compiler/xml/rules and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 9 23:40:39 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-11-09 23:40:38 -0500 (Tue, 09 Nov 2010)
New Revision: 35928
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/rules/ExpressionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ParserHelper.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/ErrorsParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java
Log:
Parser fixes, related to 35927.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -31,9 +31,9 @@
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree;
-import org.drools.lang.DRLLexer;
-import org.drools.lang.DRLParser;
-import org.drools.lang.DescrBuilderTree;
+import org.drools.lang.DRL5xLexer;
+import org.drools.lang.DRL5xParser;
+import org.drools.lang.DescrBuilderTree5x;
import org.drools.lang.DroolsSentence;
import org.drools.lang.DroolsTree;
import org.drools.lang.DroolsTreeAdaptor;
@@ -53,8 +53,8 @@
private final List<DroolsError> results = new ArrayList<DroolsError>();
private List<DroolsSentence> editorSentences = null;
private Location location = new Location( Location.LOCATION_UNKNOWN );
- private DescrBuilderTree walker = null;
- private DRLLexer lexer = null;
+ private DescrBuilderTree5x walker = null;
+ private DRL5xLexer lexer = null;
public DrlParser() {
}
@@ -67,14 +67,14 @@
public PackageDescr parse(final boolean isEditor,
final String text) throws DroolsParserException {
- final DRLParser parser = getParser( text );
+ final DRL5xParser parser = getParser( text );
return compile( isEditor,
parser );
}
public PackageDescr parse(final boolean isEditor,
final Reader reader) throws DroolsParserException {
- final DRLParser parser = getParser( reader );
+ final DRL5xParser parser = getParser( reader );
return compile( isEditor,
parser );
}
@@ -139,7 +139,7 @@
public PackageDescr parse(final boolean isEditor,
final InputStream is) throws DroolsParserException {
- final DRLParser parser = getParser( is );
+ final DRL5xParser parser = getParser( is );
return compile( isEditor,
parser );
}
@@ -223,7 +223,7 @@
}
private PackageDescr compile(boolean isEditor,
- final DRLParser parser) throws DroolsParserException {
+ final DRL5xParser parser) throws DroolsParserException {
try {
if ( isEditor ) {
parser.enableEditorInterface();
@@ -260,13 +260,13 @@
// AST nodes have payload that point into token stream
nodes.setTokenStream( tokenStream );
// Create a tree walker attached to the nodes stream
- walker = new DescrBuilderTree( nodes );
+ walker = new DescrBuilderTree5x( nodes );
walker.compilation_unit();
return walker.getPackageDescr();
}
/** Convert the antlr exceptions to drools parser exceptions */
- private void makeErrorList(final DRLParser parser) {
+ private void makeErrorList(final DRL5xParser parser) {
for ( final DroolsParserException recogErr : lexer.getErrors() ) {
final ParserError err = new ParserError( recogErr.getMessage(),
recogErr.getLineNumber(),
@@ -285,17 +285,17 @@
* @return An instance of a RuleParser should you need one (most folks will
* not).
*/
- private DRLParser getParser(final String text) {
- lexer = new DRLLexer( new ANTLRStringStream( text ) );
- DRLParser parser = new DRLParser( new CommonTokenStream( lexer ));
+ private DRL5xParser getParser(final String text) {
+ lexer = new DRL5xLexer( new ANTLRStringStream( text ) );
+ DRL5xParser parser = new DRL5xParser( new CommonTokenStream( lexer ));
parser.setTreeAdaptor( new DroolsTreeAdaptor() );
return parser;
}
- private DRLParser getParser(final Reader reader) {
+ private DRL5xParser getParser(final Reader reader) {
try {
- lexer = new DRLLexer( new ANTLRReaderStream( reader ) );
- DRLParser parser = new DRLParser( new CommonTokenStream( lexer ));
+ lexer = new DRL5xLexer( new ANTLRReaderStream( reader ) );
+ DRL5xParser parser = new DRL5xParser( new CommonTokenStream( lexer ));
parser.setTreeAdaptor( new DroolsTreeAdaptor() );
return parser;
} catch ( final Exception e ) {
@@ -304,10 +304,10 @@
}
}
- private DRLParser getParser(final InputStream is) {
+ private DRL5xParser getParser(final InputStream is) {
try {
- lexer = new DRLLexer( new ANTLRInputStream( is ) );
- DRLParser parser = new DRLParser( new CommonTokenStream( lexer ));
+ lexer = new DRL5xLexer( new ANTLRInputStream( is ) );
+ DRL5xParser parser = new DRL5xParser( new CommonTokenStream( lexer ));
parser.setTreeAdaptor( new DroolsTreeAdaptor() );
return parser;
} catch ( final Exception e ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/rules/ExpressionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/rules/ExpressionHandler.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/xml/rules/ExpressionHandler.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -25,11 +25,11 @@
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree;
-import org.drools.lang.DRLLexer;
-import org.drools.lang.DRLParser;
-import org.drools.lang.DescrBuilderTree;
+import org.drools.lang.DRL5xLexer;
+import org.drools.lang.DRL5xParser;
+import org.drools.lang.DescrBuilderTree5x;
import org.drools.lang.DroolsTreeAdaptor;
-import org.drools.lang.DescrBuilderTree.from_source_clause_return;
+import org.drools.lang.DescrBuilderTree5x.from_source_clause_return;
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.FromDescr;
import org.drools.xml.BaseAbstractHandler;
@@ -87,9 +87,9 @@
FromDescr parent = (FromDescr) parser.getParent();
final CharStream charStream = new ANTLRStringStream( expression.trim() );
- final DRLLexer lexer = new DRLLexer( charStream );
+ final DRL5xLexer lexer = new DRL5xLexer( charStream );
final TokenStream tokenStream = new CommonTokenStream( lexer );
- final DRLParser drlParser = new DRLParser( tokenStream );
+ final DRL5xParser drlParser = new DRL5xParser( tokenStream );
drlParser.setTreeAdaptor(new DroolsTreeAdaptor());
try {
@@ -97,7 +97,7 @@
if (!drlParser.hasErrors()){
CommonTreeNodeStream nodes = new CommonTreeNodeStream(fromSourceTree);
nodes.setTokenStream(tokenStream);
- DescrBuilderTree walker = new DescrBuilderTree(nodes);
+ DescrBuilderTree5x walker = new DescrBuilderTree5x(nodes);
from_source_clause_return fromReturn = walker.from_source_clause();
parent.setDataSource(fromReturn.retAccessorDescr);
parent = fromReturn.fromDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -296,63 +296,63 @@
*/
private String getBetterToken(int tokenType, String defaultValue) {
switch (tokenType) {
- case DRLLexer.DECIMAL:
+ case DRL5xLexer.INT:
return defaultValue == null ? "int" : defaultValue;
- case DRLLexer.FLOAT:
+ case DRL5xLexer.FLOAT:
return defaultValue == null ? "float" : defaultValue;
- case DRLLexer.STRING:
+ case DRL5xLexer.STRING:
return defaultValue == null ? "string" : defaultValue;
- case DRLLexer.BOOL:
+ case DRL5xLexer.BOOL:
return defaultValue == null ? "boolean" : defaultValue;
- case DRLLexer.NULL:
+ case DRL5xLexer.NULL:
return "null";
- case DRLLexer.THEN:
+ case DRL5xLexer.THEN:
return "then";
- case DRLLexer.SEMICOLON:
+ case DRL5xLexer.SEMICOLON:
return ";";
- case DRLLexer.DOT_STAR:
+ case DRL5xLexer.DOT_STAR:
return ".*";
- case DRLLexer.COLON:
+ case DRL5xLexer.COLON:
return ":";
- case DRLLexer.EQUALS:
+ case DRL5xLexer.EQUALS:
return "==";
- case DRLLexer.NOT_EQUALS:
+ case DRL5xLexer.NOT_EQUAL:
return "!=";
- case DRLLexer.GREATER:
+ case DRL5xLexer.GREATER:
return ">";
- case DRLLexer.GREATER_EQUALS:
+ case DRL5xLexer.GREATER_EQUAL:
return ">=";
- case DRLLexer.LESS:
+ case DRL5xLexer.LESS:
return "<";
- case DRLLexer.LESS_EQUALS:
+ case DRL5xLexer.LESS_EQUAL:
return "<=";
- case DRLLexer.ARROW:
+ case DRL5xLexer.ARROW:
return "->";
- case DRLLexer.ID:
+ case DRL5xLexer.ID:
return defaultValue == null ? "identifier" : defaultValue;
- case DRLLexer.LEFT_PAREN:
+ case DRL5xLexer.LEFT_PAREN:
return "(";
- case DRLLexer.RIGHT_PAREN:
+ case DRL5xLexer.RIGHT_PAREN:
return ")";
- case DRLLexer.LEFT_SQUARE:
+ case DRL5xLexer.LEFT_SQUARE:
return "[";
- case DRLLexer.RIGHT_SQUARE:
+ case DRL5xLexer.RIGHT_SQUARE:
return "]";
- case DRLLexer.LEFT_CURLY:
+ case DRL5xLexer.LEFT_CURLY:
return "{";
- case DRLLexer.RIGHT_CURLY:
+ case DRL5xLexer.RIGHT_CURLY:
return "}";
- case DRLLexer.COMMA:
+ case DRL5xLexer.COMMA:
return ",";
- case DRLLexer.DOT:
+ case DRL5xLexer.DOT:
return ".";
- case DRLLexer.DOUBLE_AMPER:
+ case DRL5xLexer.DOUBLE_AMPER:
return "&&";
- case DRLLexer.DOUBLE_PIPE:
+ case DRL5xLexer.DOUBLE_PIPE:
return "||";
- case DRLLexer.MISC:
+ case DRL5xLexer.MISC:
return defaultValue == null ? "misc" : defaultValue;
- case DRLLexer.EOF:
+ case DRL5xLexer.EOF:
return "<eof>";
default:
return tokenType > tokenNames.length ? "unknown"
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -30,91 +30,91 @@
tree.setStartCharOffset(((CommonToken) token).getStartIndex());
tree.setEndCharOffset(((CommonToken) token).getStopIndex());
- if (token.getType() == DRLLexer.VK_END
- || token.getType() == DRLLexer.VK_EVAL
- || token.getType() == DRLLexer.THEN
- || token.getType() == DRLLexer.WHEN
- || token.getType() == DRLLexer.ACCUMULATE
- || token.getType() == DRLLexer.VK_ACTION
- || token.getType() == DRLLexer.VK_ACTIVATION_GROUP
- || token.getType() == DRLLexer.VK_AGENDA_GROUP
- || token.getType() == DRLLexer.VK_AND
- || token.getType() == DRLLexer.VK_ATTRIBUTES
- || token.getType() == DRLLexer.VK_AUTO_FOCUS
- || token.getType() == DRLLexer.COLLECT
- || token.getType() == DRLLexer.VK_DATE_EFFECTIVE
- || token.getType() == DRLLexer.VK_DATE_EXPIRES
- || token.getType() == DRLLexer.VK_DECLARE
- || token.getType() == DRLLexer.VK_DIALECT
- || token.getType() == DRLLexer.VK_TIMER
- || token.getType() == DRLLexer.VK_ENABLED
- || token.getType() == DRLLexer.VK_ENTRY_POINT
- || token.getType() == DRLLexer.VK_EXISTS
- || token.getType() == DRLLexer.VK_FORALL
- || token.getType() == DRLLexer.FROM
- || token.getType() == DRLLexer.VK_FUNCTION
- || token.getType() == DRLLexer.VK_GLOBAL
- || token.getType() == DRLLexer.VK_IMPORT
- || token.getType() == DRLLexer.VK_IN
- || token.getType() == DRLLexer.VK_INIT
- || token.getType() == DRLLexer.VK_LOCK_ON_ACTIVE
- || token.getType() == DRLLexer.VK_NO_LOOP
- || token.getType() == DRLLexer.VK_NOT
- || token.getType() == DRLLexer.VK_OR
- || token.getType() == DRLLexer.VK_PACKAGE
- || token.getType() == DRLLexer.VK_QUERY
- || token.getType() == DRLLexer.VK_RESULT
- || token.getType() == DRLLexer.VK_REVERSE
- || token.getType() == DRLLexer.VK_RULE
- || token.getType() == DRLLexer.VK_RULEFLOW_GROUP
- || token.getType() == DRLLexer.VK_SALIENCE) {
+ if (token.getType() == DRL5xLexer.VK_END
+ || token.getType() == DRL5xLexer.VK_EVAL
+ || token.getType() == DRL5xLexer.THEN
+ || token.getType() == DRL5xLexer.WHEN
+ || token.getType() == DRL5xLexer.ACCUMULATE
+ || token.getType() == DRL5xLexer.VK_ACTION
+ || token.getType() == DRL5xLexer.VK_ACTIVATION_GROUP
+ || token.getType() == DRL5xLexer.VK_AGENDA_GROUP
+ || token.getType() == DRL5xLexer.VK_AND
+ || token.getType() == DRL5xLexer.VK_ATTRIBUTES
+ || token.getType() == DRL5xLexer.VK_AUTO_FOCUS
+ || token.getType() == DRL5xLexer.COLLECT
+ || token.getType() == DRL5xLexer.VK_DATE_EFFECTIVE
+ || token.getType() == DRL5xLexer.VK_DATE_EXPIRES
+ || token.getType() == DRL5xLexer.VK_DECLARE
+ || token.getType() == DRL5xLexer.VK_DIALECT
+ || token.getType() == DRL5xLexer.VK_TIMER
+ || token.getType() == DRL5xLexer.VK_ENABLED
+ || token.getType() == DRL5xLexer.VK_ENTRY_POINT
+ || token.getType() == DRL5xLexer.VK_EXISTS
+ || token.getType() == DRL5xLexer.VK_FORALL
+ || token.getType() == DRL5xLexer.FROM
+ || token.getType() == DRL5xLexer.VK_FUNCTION
+ || token.getType() == DRL5xLexer.VK_GLOBAL
+ || token.getType() == DRL5xLexer.VK_IMPORT
+ || token.getType() == DRL5xLexer.VK_IN
+ || token.getType() == DRL5xLexer.VK_INIT
+ || token.getType() == DRL5xLexer.VK_LOCK_ON_ACTIVE
+ || token.getType() == DRL5xLexer.VK_NO_LOOP
+ || token.getType() == DRL5xLexer.VK_NOT
+ || token.getType() == DRL5xLexer.VK_OR
+ || token.getType() == DRL5xLexer.VK_PACKAGE
+ || token.getType() == DRL5xLexer.VK_QUERY
+ || token.getType() == DRL5xLexer.VK_RESULT
+ || token.getType() == DRL5xLexer.VK_REVERSE
+ || token.getType() == DRL5xLexer.VK_RULE
+ || token.getType() == DRL5xLexer.VK_RULEFLOW_GROUP
+ || token.getType() == DRL5xLexer.VK_SALIENCE) {
tree.setEditorElementType(DroolsEditorType.KEYWORD);
- } else if (token.getType() == DRLLexer.FLOAT
- || token.getType() == DRLLexer.DECIMAL) {
+ } else if (token.getType() == DRL5xLexer.FLOAT
+ || token.getType() == DRL5xLexer.INT) {
tree.setEditorElementType(DroolsEditorType.NUMERIC_CONST);
- } else if (token.getType() == DRLLexer.STRING) {
+ } else if (token.getType() == DRL5xLexer.STRING) {
tree.setEditorElementType(DroolsEditorType.STRING_CONST);
- } else if (token.getType() == DRLLexer.BOOL) {
+ } else if (token.getType() == DRL5xLexer.BOOL) {
tree.setEditorElementType(DroolsEditorType.BOOLEAN_CONST);
- } else if (token.getType() == DRLLexer.NULL) {
+ } else if (token.getType() == DRL5xLexer.NULL) {
tree.setEditorElementType(DroolsEditorType.NULL_CONST);
- } else if (token.getType() == DRLLexer.VT_SQUARE_CHUNK
- || token.getType() == DRLLexer.VT_PAREN_CHUNK
- || token.getType() == DRLLexer.VT_CURLY_CHUNK
- || token.getType() == DRLLexer.VT_RHS_CHUNK) {
+ } else if (token.getType() == DRL5xLexer.VT_SQUARE_CHUNK
+ || token.getType() == DRL5xLexer.VT_PAREN_CHUNK
+ || token.getType() == DRL5xLexer.VT_CURLY_CHUNK
+ || token.getType() == DRL5xLexer.VT_RHS_CHUNK) {
tree.setEditorElementType(DroolsEditorType.CODE_CHUNK);
- } else if (token.getType() == DRLLexer.MISC
- || token.getType() == DRLLexer.DOUBLE_PIPE
- || token.getType() == DRLLexer.DOUBLE_AMPER
- || token.getType() == DRLLexer.DOT
- || token.getType() == DRLLexer.COMMA
- || token.getType() == DRLLexer.RIGHT_CURLY
- || token.getType() == DRLLexer.LEFT_CURLY
- || token.getType() == DRLLexer.RIGHT_SQUARE
- || token.getType() == DRLLexer.LEFT_SQUARE
- || token.getType() == DRLLexer.RIGHT_PAREN
- || token.getType() == DRLLexer.LEFT_PAREN
- || token.getType() == DRLLexer.ARROW
- || token.getType() == DRLLexer.LESS_EQUALS
- || token.getType() == DRLLexer.LESS
- || token.getType() == DRLLexer.GREATER_EQUALS
- || token.getType() == DRLLexer.GREATER
- || token.getType() == DRLLexer.NOT_EQUALS
- || token.getType() == DRLLexer.EQUALS
- || token.getType() == DRLLexer.COLON
- || token.getType() == DRLLexer.SEMICOLON) {
+ } else if (token.getType() == DRL5xLexer.MISC
+ || token.getType() == DRL5xLexer.DOUBLE_PIPE
+ || token.getType() == DRL5xLexer.DOUBLE_AMPER
+ || token.getType() == DRL5xLexer.DOT
+ || token.getType() == DRL5xLexer.COMMA
+ || token.getType() == DRL5xLexer.RIGHT_CURLY
+ || token.getType() == DRL5xLexer.LEFT_CURLY
+ || token.getType() == DRL5xLexer.RIGHT_SQUARE
+ || token.getType() == DRL5xLexer.LEFT_SQUARE
+ || token.getType() == DRL5xLexer.RIGHT_PAREN
+ || token.getType() == DRL5xLexer.LEFT_PAREN
+ || token.getType() == DRL5xLexer.ARROW
+ || token.getType() == DRL5xLexer.LESS_EQUAL
+ || token.getType() == DRL5xLexer.LESS
+ || token.getType() == DRL5xLexer.GREATER_EQUAL
+ || token.getType() == DRL5xLexer.GREATER
+ || token.getType() == DRL5xLexer.NOT_EQUAL
+ || token.getType() == DRL5xLexer.EQUALS
+ || token.getType() == DRL5xLexer.COLON
+ || token.getType() == DRL5xLexer.SEMICOLON) {
tree.setEditorElementType(DroolsEditorType.SYMBOL);
- } else if (token.getType() == DRLLexer.ID
- || token.getType() == DRLLexer.DOT_STAR
- || token.getType() == DRLLexer.VT_GLOBAL_ID
- || token.getType() == DRLLexer.VT_FUNCTION_ID
- || token.getType() == DRLLexer.VT_QUERY_ID
- || token.getType() == DRLLexer.VT_RULE_ID
- || token.getType() == DRLLexer.VT_ENTRYPOINT_ID) {
+ } else if (token.getType() == DRL5xLexer.ID
+ || token.getType() == DRL5xLexer.DOT_STAR
+ || token.getType() == DRL5xLexer.VT_GLOBAL_ID
+ || token.getType() == DRL5xLexer.VT_FUNCTION_ID
+ || token.getType() == DRL5xLexer.VT_QUERY_ID
+ || token.getType() == DRL5xLexer.VT_RULE_ID
+ || token.getType() == DRL5xLexer.VT_ENTRYPOINT_ID) {
tree.setEditorElementType(DroolsEditorType.IDENTIFIER);
- } else if (token.getType() == DRLLexer.VT_DATA_TYPE) {
+ } else if (token.getType() == DRL5xLexer.VT_DATA_TYPE) {
tree.setEditorElementType(DroolsEditorType.IDENTIFIER_TYPE);
- } else if (token.getType() == DRLLexer.VT_PATTERN_TYPE) {
+ } else if (token.getType() == DRL5xLexer.VT_PATTERN_TYPE) {
tree.setEditorElementType(DroolsEditorType.IDENTIFIER_PATTERN);
}
@@ -171,7 +171,7 @@
tParent.setEndCharOffset(tChild.getEndCharOffset());
}
}
- if (DRLLexer.RIGHT_PAREN != ((Tree) child).getType()) {
+ if (DRL5xLexer.RIGHT_PAREN != ((Tree) child).getType()) {
((Tree) t).addChild((Tree) child);
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ParserHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ParserHelper.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/ParserHelper.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -16,7 +16,7 @@
import org.antlr.runtime.TokenStream;
import org.drools.compiler.DroolsParserException;
-import static org.drools.lang.DRLParser.*;
+import static org.drools.lang.DRL5xParser.*;
/**
* This is a class to hold all the helper functions/methods used
@@ -30,12 +30,12 @@
private Stack<Map<DroolsParaphraseTypes, String>> paraphrases = new Stack<Map<DroolsParaphraseTypes, String>>();
// parameters from parser
- private DRLParser parser = null;
+ private DRL5xParser parser = null;
private DroolsParserExceptionFactory errorMessageFactory = null;
private TokenStream input = null;
private RecognizerSharedState state = null;
- public ParserHelper(DRLParser parser,
+ public ParserHelper(DRL5xParser parser,
String[] tokenNames,
TokenStream input,
RecognizerSharedState state) {
@@ -408,7 +408,7 @@
private boolean memberOfFollowSet(BitSet follow) {
boolean isMember = follow.member(input.LA(1));
- if( input.LA( 1 ) == DRLParser.ID ) {
+ if( input.LA( 1 ) == DRL5xParser.ID ) {
String token = input.LT( 1 ).getText();
isMember = ( DroolsSoftKeywords.IMPORT.equals( token ) ||
DroolsSoftKeywords.GLOBAL.equals( token ) ||
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -21,7 +21,7 @@
public void testCheckLHSLocationDetermination_OPERATORS_AND_COMPLEMENT1()
throws DroolsParserException, RecognitionException {
String input = "rule MyRule when Class ( property memberOf collection ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -36,7 +36,7 @@
public void testCheckLHSLocationDetermination_OPERATORS_AND_COMPLEMENT2()
throws DroolsParserException, RecognitionException {
String input = "rule MyRule when Class ( property not memberOf collection";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -51,7 +51,7 @@
public void testCheckLHSLocationDetermination_COMPOSITE_OPERATOR1()
throws DroolsParserException, RecognitionException {
String input = "rule MyRule when Class ( property in ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -66,7 +66,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION1()
throws DroolsParserException, RecognitionException {
String input = "rule MyRule \n" + " when \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -82,7 +82,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class( condition == true ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -99,7 +99,7 @@
+ " class: Class( condition == true, condition2 == null ) \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -114,7 +114,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION4() {
String input = "rule MyRule \n" + " when \n" + " Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -130,7 +130,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class( condition == true ) \n" + " Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -145,7 +145,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION6() {
String input = "rule MyRule \n" + " when \n" + " class: Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -160,7 +160,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION7() {
String input = "rule MyRule \n" + " when \n" + " class:Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -176,7 +176,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START1() {
String input = "rule MyRule \n" + " when \n" + " Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -191,7 +191,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START2() {
String input = "rule MyRule \n" + " when \n" + " Class ( na";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -207,7 +207,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name.subProperty['test'].subsu";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -223,7 +223,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( condition == true, ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -239,7 +239,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( condition == true, na";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -254,7 +254,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START6() {
String input = "rule MyRule \n" + " when \n" + " Class ( \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -270,7 +270,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( condition == true, \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -286,7 +286,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( c: condition, \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -307,7 +307,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START9a() {
String input = "rule MyRule \n" + " when \n" + " Class ( name:";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -322,7 +322,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START9b() {
String input = "rule MyRule \n" + " when \n" + " Class ( name: ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -337,7 +337,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START10() {
String input = "rule MyRule \n" + " when \n" + " Class ( name:";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -353,7 +353,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR1() {
String input = "rule MyRule \n" + " when \n" + " Class ( property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -368,7 +368,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR2() {
String input = "rule MyRule \n" + " when \n" + " Class(property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -384,7 +384,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name : property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -400,7 +400,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class (name:property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -416,7 +416,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class (name:property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -432,7 +432,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name1 : property1, name : property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -448,7 +448,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name1 : property1 == \"value\", name : property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -464,7 +464,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name1 : property1 == \"value\",property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -480,7 +480,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name1 : property1, \n" + " name : property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -496,7 +496,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT1() {
String input = "rule MyRule \n" + " when \n" + " Class ( property == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -511,7 +511,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT2() {
String input = "rule MyRule \n" + " when \n" + " Class ( property== ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -527,7 +527,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name : property <= ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -543,7 +543,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name:property != ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -559,7 +559,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name1 : property1, property2 == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -575,7 +575,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class (name:property== ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -591,7 +591,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property == otherPropertyN";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -607,7 +607,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property == otherPropertyN ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -623,7 +623,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property == \"someth";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -639,7 +639,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property contains ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -655,7 +655,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not contains ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -671,7 +671,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property excludes ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -687,7 +687,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property matches \"prop";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -702,7 +702,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT12() {
String input = "rule MyRule \n" + " when \n" + " Class ( property in ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -718,7 +718,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property in ('1', '2') ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -734,7 +734,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property in ('1', '2'), ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -750,7 +750,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not in ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -766,7 +766,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not in ('1', '2') ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -782,7 +782,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not in ('1', '2'), ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -798,7 +798,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property memberOf ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -817,7 +817,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property memberOf collection ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -833,7 +833,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property memberOf collection, ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -849,7 +849,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not memberOf ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -865,7 +865,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not memberOf collection ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -881,7 +881,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property not memberOf collection, ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -901,7 +901,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS1() {
String input = "rule MyRule \n" + " when \n" + " exists ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -916,7 +916,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS2() {
String input = "rule MyRule \n" + " when \n" + " exists ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -931,7 +931,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS3() {
String input = "rule MyRule \n" + " when \n" + " exists(";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -946,7 +946,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS4() {
String input = "rule MyRule \n" + " when \n" + " exists Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -961,7 +961,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS5() {
String input = "rule MyRule \n" + " when \n" + " exists ( Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -976,7 +976,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS6() {
String input = "rule MyRule \n" + " when \n" + " exists ( name : Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -991,7 +991,7 @@
public void testCheckLHSLocationDeterminationINSIDE_CONDITION_START16() {
String input = "rule MyRule \n" + " when \n" + " exists Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1007,7 +1007,7 @@
String input = "rule MyRule \n" + " when \n" + " exists Class ( ) \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1023,7 +1023,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_NOT1() {
String input = "rule MyRule \n" + " when \n" + " not ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1038,7 +1038,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_NOT2() {
String input = "rule MyRule \n" + " when \n" + " not Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1053,7 +1053,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS7() {
String input = "rule MyRule \n" + " when \n" + " not exists ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1068,7 +1068,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS8() {
String input = "rule MyRule \n" + " when \n" + " not exists Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1083,7 +1083,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START21() {
String input = "rule MyRule \n" + " when \n" + " not Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1098,7 +1098,7 @@
public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START22() {
String input = "rule MyRule \n" + " when \n" + " not exists Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1114,7 +1114,7 @@
String input = "rule MyRule \n" + " when \n"
+ " not exists name : Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1130,7 +1130,7 @@
String input = "rule MyRule \n" + " when \n" + " not Class () \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1146,7 +1146,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR1() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) and ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1161,7 +1161,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR2() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) and ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1176,7 +1176,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR3() {
String input = "rule MyRule \n" + " when \n" + " Class () and ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1192,7 +1192,7 @@
String input = "rule MyRule \n" + " when \n"
+ " name : Class ( name: property ) and ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1213,7 +1213,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name: property ) \n" + " and ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1228,7 +1228,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR6() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) and Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1244,7 +1244,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and name : Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1260,7 +1260,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and name : Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1276,7 +1276,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and Class ( ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1292,7 +1292,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and not Class ( ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1308,7 +1308,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and exists Class ( ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1324,7 +1324,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and Class ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1340,7 +1340,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and Class ( name ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1356,7 +1356,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and Class ( name == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1372,7 +1372,7 @@
String input = "rule MyRule \n" + " when \n"
+ " exists Class ( ) and not ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1388,7 +1388,7 @@
String input = "rule MyRule \n" + " when \n"
+ " exists Class ( ) and exists ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1404,7 +1404,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) and not Class ( ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1420,7 +1420,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR21() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) or ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1435,7 +1435,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR22() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) or ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1450,7 +1450,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR23() {
String input = "rule MyRule \n" + " when \n" + " Class () or ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1466,7 +1466,7 @@
String input = "rule MyRule \n" + " when \n"
+ " name : Class ( name: property ) or ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1482,7 +1482,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name: property ) \n" + " or ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1497,7 +1497,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR26() {
String input = "rule MyRule \n" + " when \n" + " Class ( ) or Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1513,7 +1513,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or name : Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1529,7 +1529,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or name : Cl";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1545,7 +1545,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or Class ( ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1561,7 +1561,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or Class ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1577,7 +1577,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or Class ( name ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1593,7 +1593,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( ) or Class ( name == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1609,7 +1609,7 @@
String input = "rule MyRule \n" + " when \n"
+ " exists Class ( ) or not ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1625,7 +1625,7 @@
String input = "rule MyRule \n" + " when \n"
+ " exists Class ( ) or exists ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1641,7 +1641,7 @@
public void testCheckLHSLocationDetermination_INSIDE_EVAL1() {
String input = "rule MyRule \n" + " when \n" + " eval ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1656,7 +1656,7 @@
public void testCheckLHSLocationDetermination_INSIDE_EVAL2() {
String input = "rule MyRule \n" + " when \n" + " eval(";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1671,7 +1671,7 @@
public void testCheckLHSLocationDetermination_INSIDE_EVAL3() {
String input = "rule MyRule \n" + " when \n" + " eval( myCla";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1686,7 +1686,7 @@
public void testCheckLHSLocationDetermination_INSIDE_EVAL4() {
String input = "rule MyRule \n" + " when \n" + " eval( param.getMetho";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1702,7 +1702,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getMethod(";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1718,7 +1718,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getMethod().get";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1734,7 +1734,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getMethod(\"someStringWith)))\").get";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1750,7 +1750,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getMethod(\"someStringWith(((\").get";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1765,7 +1765,7 @@
public void testCheckLHSLocationDetermination_INSIDE_EVAL9() {
String input = "rule MyRule \n" + " when \n" + " eval( true )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1781,7 +1781,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getProperty(name).isTrue() )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1797,7 +1797,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getProperty(\"someStringWith(((\").isTrue() )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1813,7 +1813,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getProperty((((String) s) )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1829,7 +1829,7 @@
String input = "rule MyRule \n" + " when \n"
+ " eval( param.getProperty((((String) s))))";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1845,7 +1845,7 @@
String input = "rule MyRule \n" + " when \n" + " eval( true ) \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1862,7 +1862,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1878,7 +1878,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name : property1, property2 > 0 && ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1894,7 +1894,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property1 < 20, property2 > 0 && ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1910,7 +1910,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && < ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1926,7 +1926,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && < 10 ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1942,7 +1942,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && < 10, ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1958,7 +1958,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 || ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1974,7 +1974,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -1990,7 +1990,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name : property1, property2 > 0 || ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2006,7 +2006,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property1 < 20, property2 > 0 || ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2022,7 +2022,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2038,7 +2038,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2054,7 +2054,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 && < 10 ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2070,7 +2070,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 || < 10 ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2086,7 +2086,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property == \"test\" || == \"test2\" ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2103,7 +2103,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2119,7 +2119,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) fr";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2135,7 +2135,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2150,7 +2150,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from myGlob";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2165,7 +2165,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from myGlobal.get";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2181,7 +2181,7 @@
+ " Class ( property > 0 ) from myGlobal.getList() \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2198,7 +2198,7 @@
+ " Class ( property > 0 ) from getDroolsFunction() \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2215,7 +2215,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from accumulate ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2231,7 +2231,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from accumulate(";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2252,7 +2252,7 @@
+ " result( new Integer( total ) ) \n" + " ) \n"
+ " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2269,7 +2269,7 @@
+ " Class ( property > 0 ) from accumulate( \n"
+ " $cheese : Cheese( type == $likes ), \n" + " init( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2287,7 +2287,7 @@
+ " $cheese : Cheese( type == $likes ), \n"
+ " init( int total = 0; ), \n" + " action( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2305,7 +2305,7 @@
+ " $cheese : Cheese( type == $likes ), \n"
+ " init( int total = 0; ), \n" + " action( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2325,7 +2325,7 @@
+ " action( total += $cheese.getPrice(); ), \n"
+ " result( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2343,7 +2343,7 @@
+ " $cheese : Cheese( type == $likes ), \n"
+ " init( int total =";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2361,7 +2361,7 @@
+ " $cheese : Cheese( type == $likes ), \n"
+ " init( int total = 0; ), \n" + " action( total += $ch";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2381,7 +2381,7 @@
+ " action( total += $cheese.getPrice(); ), \n"
+ " result( new Integer( tot";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2398,7 +2398,7 @@
+ " Class ( property > 0 ) from accumulate( \n"
+ " $cheese : Cheese( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2415,7 +2415,7 @@
+ " Class ( property > 0 ) from accumulate( \n"
+ " $cheese : Cheese( type ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2432,7 +2432,7 @@
+ " Class ( property > 0 ) from accumulate( \n"
+ " $cheese : Cheese( type == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2449,7 +2449,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from collect ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2465,7 +2465,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from collect(";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2482,7 +2482,7 @@
+ " Class ( property > 0 ) from collect ( \n"
+ " Cheese( type == $likes )" + " ) \n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2498,7 +2498,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( property > 0 ) from collect ( \n" + " Cheese( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2515,7 +2515,7 @@
+ " Class ( property > 0 ) from collect ( \n"
+ " Cheese( type ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2532,7 +2532,7 @@
+ " Class ( property > 0 ) from collect ( \n"
+ " Cheese( type == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2550,7 +2550,7 @@
+ " when \n"
+ " ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2567,7 +2567,7 @@
+ " when \n"
+ " ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) from ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2583,7 +2583,7 @@
+ " when \n"
+ " ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2600,7 +2600,7 @@
+ " when \n"
+ " ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2617,7 +2617,7 @@
+ " when \n"
+ " ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2632,7 +2632,7 @@
public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION81() {
String input = "rule MyRule \n" + " when \n" + " forall ( ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2648,7 +2648,7 @@
String input = "rule MyRule \n" + " when \n" + " forall ( "
+ " Class ( pr";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2664,7 +2664,7 @@
String input = "rule MyRule \n" + " when \n" + " forall ( "
+ " Class ( property ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2680,7 +2680,7 @@
String input = "rule MyRule \n" + " when \n" + " forall ( "
+ " Class ( property == ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2696,7 +2696,7 @@
String input = "rule MyRule \n" + " when \n" + " forall ( "
+ " Class ( property == \"test\")" + " C";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2713,7 +2713,7 @@
+ " when \n"
+ " ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() ) ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2730,7 +2730,7 @@
+ " when \n"
+ " ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() )";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2746,7 +2746,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name :";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2762,7 +2762,7 @@
String input = "rule MyRule \n" + " when \n"
+ " Class ( name : ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2778,7 +2778,7 @@
String input = "rule MyRule \n" + " when\n" + " Class ( )\n"
+ " then\n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2793,7 +2793,7 @@
String input = "rule MyRule \n" + " when\n" + " Class ( )\n"
+ " then\n" + " assert(null);\n" + " ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2808,7 +2808,7 @@
String input = "rule MyRule \n" + " when\n" + " Class ( )\n"
+ " then\n" + " meth";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2822,7 +2822,7 @@
public void testCheckRuleHeaderLocationDetermination() {
String input = "rule MyRule ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2836,7 +2836,7 @@
public void testCheckRuleHeaderLocationDetermination2() {
String input = "rule MyRule \n" + " salience 12 activation-group \"my";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2856,7 +2856,7 @@
public void testCheckRuleHeaderLocationDetermination3() {
String input = "rule \"Hello World\" ruleflow-group \"hello\" s";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2870,7 +2870,7 @@
public void testCheckRuleHeaderLocationDetermination_dialect1() {
String input = "rule MyRule \n" + " dialect \"java\"";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2884,7 +2884,7 @@
public void testCheckRuleHeaderLocationDetermination_dialect2() {
String input = "rule MyRule \n" + " dialect \"mvel\"";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2898,7 +2898,7 @@
public void testCheckRuleHeaderLocationDetermination_dialect3() {
String input = "rule MyRule \n" + " dialect ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2918,7 +2918,7 @@
public void testCheckRuleHeaderLocationDetermination_dialect4() {
String input = "rule MyRule \n" + " dialect \"";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2940,7 +2940,7 @@
public void testCheckQueryLocationDetermination_RULE_HEADER1() {
String input = "query MyQuery ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2954,7 +2954,7 @@
public void testCheckQueryLocationDetermination_RULE_HEADER2() {
String input = "query \"MyQuery\" ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2968,7 +2968,7 @@
public void testCheckQueryLocationDetermination_LHS_BEGIN_OF_CONDITION() {
String input = "query MyQuery() ";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -2983,7 +2983,7 @@
public void testCheckQueryLocationDetermination_LHS_INSIDE_CONDITION_START() {
String input = "query MyQuery \n" + " Class (";
- DRLParser parser = getParser(input);
+ DRL5xParser parser = getParser(input);
parser.enableEditorInterface();
try {
parser.compilation_unit();
@@ -3022,8 +3022,8 @@
* @return An instance of a RuleParser should you need one (most folks will
* not).
*/
- private DRLParser getParser(final String text) {
- DRLParser parser = new DRLParser(new CommonTokenStream(new DRLLexer(
+ private DRL5xParser getParser(final String text) {
+ DRL5xParser parser = new DRL5xParser(new CommonTokenStream(new DRL5xLexer(
new ANTLRStringStream(text))));
parser.setTreeAdaptor(new DroolsTreeAdaptor());
return parser;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/ErrorsParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/ErrorsParserTest.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/ErrorsParserTest.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -34,7 +34,7 @@
public class ErrorsParserTest extends TestCase {
- private DRLParser parser;
+ private DRL5xParser parser;
protected void setUp() throws Exception {
super.setUp();
@@ -80,7 +80,7 @@
}
public void testNotBindindShouldBarf() throws Exception {
- final DRLParser parser = parseResource( "not_with_binding_error.drl" );
+ final DRL5xParser parser = parseResource( "not_with_binding_error.drl" );
parser.compilation_unit();
System.out.println( this.getName() );
for ( String message : this.parser.getErrorMessages() ) {
@@ -96,7 +96,7 @@
final Expander expander = new DefaultExpander();
final String expanded = expander.expand( this.getReader( name ) );
- final DRLParser parser = parse( name,
+ final DRL5xParser parser = parse( name,
expanded );
parser.compilation_unit();
assertTrue( parser.hasErrors() );
@@ -183,7 +183,7 @@
}
public void testErrorMessageForMisplacedParenthesis() throws Exception {
- final DRLParser parser = parseResource( "misplaced_parenthesis.drl" );
+ final DRL5xParser parser = parseResource( "misplaced_parenthesis.drl" );
parser.compilation_unit();
System.out.println( this.getName() );
@@ -203,7 +203,7 @@
}
public void testNPEOnParser() throws Exception {
- final DRLParser parser = parseResource( "npe_on_parser.drl" );
+ final DRL5xParser parser = parseResource( "npe_on_parser.drl" );
parser.compilation_unit();
System.out.println( this.getName() );
for ( String message : this.parser.getErrorMessages() ) {
@@ -219,7 +219,7 @@
}
public void testCommaMisuse() throws Exception {
- final DRLParser parser = parseResource( "comma_misuse.drl" );
+ final DRL5xParser parser = parseResource( "comma_misuse.drl" );
try {
parser.compilation_unit();
// System.out.println( this.getName() );
@@ -236,12 +236,12 @@
}
}
- private DRLParser parse(final String text) throws Exception {
+ private DRL5xParser parse(final String text) throws Exception {
this.parser = newParser( newTokenStream( newLexer( newCharStream( text ) ) ) );
return this.parser;
}
- private DRLParser parse(final String source,
+ private DRL5xParser parse(final String source,
final String text) throws Exception {
this.parser = newParser( newTokenStream( newLexer( newCharStream( text ) ) ) );
// this.parser.setSource( source );
@@ -254,7 +254,7 @@
return new InputStreamReader( in );
}
- private DRLParser parseResource(final String name) throws Exception {
+ private DRL5xParser parseResource(final String name) throws Exception {
final Reader reader = getReader( name );
@@ -277,16 +277,16 @@
return new ANTLRStringStream( text );
}
- private DRLLexer newLexer(final CharStream charStream) {
- return new DRLLexer( charStream );
+ private DRL5xLexer newLexer(final CharStream charStream) {
+ return new DRL5xLexer( charStream );
}
private TokenStream newTokenStream(final Lexer lexer) {
return new CommonTokenStream( lexer );
}
- private DRLParser newParser(final TokenStream tokenStream) {
- final DRLParser p = new DRLParser( tokenStream );
+ private DRL5xParser newParser(final TokenStream tokenStream) {
+ final DRL5xParser p = new DRL5xParser( tokenStream );
p.setTreeAdaptor( new DroolsTreeAdaptor() );
return p;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -106,9 +106,9 @@
CharStream charStream) {
Object treeRuleReturn = null;
try {
- DRLLexer lexer = new DRLLexer(charStream);
+ DRL5xLexer lexer = new DRL5xLexer(charStream);
CommonTokenStream tokens = new CommonTokenStream(lexer);
- DRLParser parser = new DRLParser(tokens);
+ DRL5xParser parser = new DRL5xParser(tokens);
parser.setTreeAdaptor(new DroolsTreeAdaptor());
/** Use Reflection to get rule method from parser */
Method ruleName = Class.forName("org.drools.lang.DRLParser")
@@ -128,7 +128,7 @@
// AST nodes have payload that point into token stream
nodes.setTokenStream(tokens);
// Create a tree walker attached to the nodes stream
- DescrBuilderTree walker = new DescrBuilderTree(nodes);
+ DescrBuilderTree5x walker = new DescrBuilderTree5x(nodes);
/** Invoke the tree rule, and store the return value if there is */
Method treeRuleName = Class.forName(
"org.drools.lang.DescrBuilderTree").getMethod(
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -78,8 +78,8 @@
public class RuleParserTest extends TestCase {
- private DescrBuilderTree walker;
- DRLParser parser;
+ private DescrBuilderTree5x walker;
+ DRL5xParser parser;
protected void setUp() throws Exception {
super.setUp();
@@ -4211,9 +4211,9 @@
CharStream charStream) {
Object treeRuleReturn = null;
try {
- DRLLexer lexer = new DRLLexer( charStream );
+ DRL5xLexer lexer = new DRL5xLexer( charStream );
CommonTokenStream tokens = new CommonTokenStream( lexer );
- parser = new DRLParser( tokens );
+ parser = new DRL5xParser( tokens );
parser.setTreeAdaptor( new DroolsTreeAdaptor() );
/** Use Reflection to get rule method from parser */
Method ruleName = Class.forName( "org.drools.lang.DRLParser" ).getMethod( testRuleName );
@@ -4231,7 +4231,7 @@
// AST nodes have payload that point into token stream
nodes.setTokenStream( tokens );
// Create a tree walker attached to the nodes stream
- this.walker = new DescrBuilderTree( nodes );
+ this.walker = new DescrBuilderTree5x( nodes );
/** Invoke the tree rule, and store the return value if there is */
Method treeRuleName = Class.forName( "org.drools.lang.DescrBuilderTree" ).getMethod( testTreeRuleName );
treeRuleReturn = treeRuleName.invoke( walker );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -1487,9 +1487,9 @@
input = new ANTLRStringStream(testInput);
}
try {
- DRLLexer lexer = new DRLLexer(input);
+ DRL5xLexer lexer = new DRL5xLexer(input);
CommonTokenStream tokens = new CommonTokenStream(lexer);
- DRLParser parser = new DRLParser(tokens);
+ DRL5xParser parser = new DRL5xParser(tokens);
parser.setTreeAdaptor(new DroolsTreeAdaptor());
/** Use Reflection to get rule method from parser */
Method ruleName = Class.forName("org.drools.lang.DRLParser").getMethod(testRuleName);
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2010-11-10 03:33:00 UTC (rev 35927)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2010-11-10 04:40:38 UTC (rev 35928)
@@ -1450,9 +1450,9 @@
input = new ANTLRStringStream(testInput);
}
try {
- DRLLexer lexer = new DRLLexer(input);
+ DRL5xLexer lexer = new DRL5xLexer(input);
CommonTokenStream tokens = new CommonTokenStream(lexer);
- DRLParser parser = new DRLParser(tokens);
+ DRL5xParser parser = new DRL5xParser(tokens);
parser.setTreeAdaptor(new DroolsTreeAdaptor());
/** Use Reflection to get rule method from parser */
Method ruleName = Class.forName("org.drools.lang.DRLParser").getMethod(testRuleName);
More information about the jboss-svn-commits
mailing list