[jboss-svn-commits] JBL Code SVN: r9011 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/lang/descr and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 24 17:04:03 EST 2007
Author: tirelli
Date: 2007-01-24 17:04:03 -0500 (Wed, 24 Jan 2007)
New Revision: 9011
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/ColumnBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractHashTable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
labs/jbossrules/trunk/drools-ide-test/src/test/java/org/drools/ide/editors/completion/IncompleteParsingTest.java
Log:
JBRULES-439: Fixing tests and updating grammar
JBRULES-556: Additional predicate syntax now supported without the variable bind
Unit tests and integration tests updated.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-23 12:01:05
+// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-23 16:40:48
package org.drools.lang;
@@ -1088,10 +1088,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:37:7: ( '==' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:37:7: '=='
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:37:7: ( '->' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:37:7: '->'
{
- match("=="); if (failed) return ;
+ match("->"); if (failed) return ;
}
@@ -1120,11 +1120,12 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:38:7: ( '>' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:38:7: '>'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:38:7: ( '==' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:38:7: '=='
{
- match('>'); if (failed) return ;
+ match("=="); if (failed) return ;
+
}
@@ -1151,12 +1152,11 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:39:7: ( '>=' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:39:7: '>='
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:39:7: ( '>' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:39:7: '>'
{
- match(">="); if (failed) return ;
+ match('>'); if (failed) return ;
-
}
@@ -1183,11 +1183,12 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:40:7: ( '<' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:40:7: '<'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:40:7: ( '>=' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:40:7: '>='
{
- match('<'); if (failed) return ;
+ match(">="); if (failed) return ;
+
}
@@ -1214,12 +1215,11 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:41:7: ( '<=' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:41:7: '<='
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:41:7: ( '<' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:41:7: '<'
{
- match("<="); if (failed) return ;
+ match('<'); if (failed) return ;
-
}
@@ -1246,10 +1246,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:42:7: ( '!=' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:42:7: '!='
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:42:7: ( '<=' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:42:7: '<='
{
- match("!="); if (failed) return ;
+ match("<="); if (failed) return ;
}
@@ -1278,10 +1278,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:43:7: ( 'contains' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:43:7: 'contains'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:43:7: ( '!=' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:43:7: '!='
{
- match("contains"); if (failed) return ;
+ match("!="); if (failed) return ;
}
@@ -1310,10 +1310,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:44:7: ( 'matches' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:44:7: 'matches'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:44:7: ( 'contains' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:44:7: 'contains'
{
- match("matches"); if (failed) return ;
+ match("contains"); if (failed) return ;
}
@@ -1342,10 +1342,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:45:7: ( 'excludes' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:45:7: 'excludes'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:45:7: ( 'matches' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:45:7: 'matches'
{
- match("excludes"); if (failed) return ;
+ match("matches"); if (failed) return ;
}
@@ -1374,10 +1374,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:46:7: ( 'null' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:46:7: 'null'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:46:7: ( 'excludes' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:46:7: 'excludes'
{
- match("null"); if (failed) return ;
+ match("excludes"); if (failed) return ;
}
@@ -1406,10 +1406,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:47:7: ( '->' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:47:7: '->'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:47:7: ( 'null' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:47:7: 'null'
{
- match("->"); if (failed) return ;
+ match("null"); if (failed) return ;
}
@@ -1662,10 +1662,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1382:17: ( ( ' ' | '\\t' | '\\f' | EOL ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1382:17: ( ' ' | '\\t' | '\\f' | EOL )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1376:17: ( ( ' ' | '\\t' | '\\f' | EOL ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1376:17: ( ' ' | '\\t' | '\\f' | EOL )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1382:17: ( ' ' | '\\t' | '\\f' | EOL )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1376:17: ( ' ' | '\\t' | '\\f' | EOL )
int alt1=4;
switch ( input.LA(1) ) {
case ' ':
@@ -1684,35 +1684,35 @@
default:
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1382:17: ( ' ' | '\\t' | '\\f' | EOL )", 1, 0, input);
+ new NoViableAltException("1376:17: ( ' ' | '\\t' | '\\f' | EOL )", 1, 0, input);
throw nvae;
}
switch (alt1) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1382:19: ' '
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1376:19: ' '
{
match(' '); if (failed) return ;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1383:19: '\\t'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1377:19: '\\t'
{
match('\t'); if (failed) return ;
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1384:19: '\\f'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1378:19: '\\f'
{
match('\f'); if (failed) return ;
}
break;
case 4 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1385:19: EOL
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1379:19: EOL
{
mEOL(); if (failed) return ;
@@ -1746,10 +1746,10 @@
public void mEOL() throws RecognitionException {
try {
ruleNestingLevel++;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1392:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1392:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1386:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1386:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1392:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1386:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
int alt2=3;
int LA2_0 = input.LA(1);
if ( (LA2_0=='\r') ) {
@@ -1766,13 +1766,13 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1392:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+ new NoViableAltException("1386:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
throw nvae;
}
switch (alt2) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1392:14: ( '\\r\\n' )=> '\\r\\n'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1386:14: ( '\\r\\n' )=> '\\r\\n'
{
match("\r\n"); if (failed) return ;
@@ -1780,14 +1780,14 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:25: '\\r'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1387:25: '\\r'
{
match('\r'); if (failed) return ;
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1394:25: '\\n'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1388:25: '\\n'
{
match('\n'); if (failed) return ;
@@ -1815,10 +1815,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:4: ( ( '-' )? ( '0' .. '9' )+ )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:4: ( '-' )? ( '0' .. '9' )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:4: ( ( '-' )? ( '0' .. '9' )+ )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:4: ( '-' )? ( '0' .. '9' )+
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:4: ( '-' )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:4: ( '-' )?
int alt3=2;
int LA3_0 = input.LA(1);
if ( (LA3_0=='-') ) {
@@ -1826,7 +1826,7 @@
}
switch (alt3) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:5: '-'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:5: '-'
{
match('-'); if (failed) return ;
@@ -1835,7 +1835,7 @@
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:10: ( '0' .. '9' )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:10: ( '0' .. '9' )+
int cnt4=0;
loop4:
do {
@@ -1848,7 +1848,7 @@
switch (alt4) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1399:11: '0' .. '9'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1393:11: '0' .. '9'
{
matchRange('0','9'); if (failed) return ;
@@ -1892,10 +1892,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:4: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:4: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:4: ( '-' )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:4: ( '-' )?
int alt5=2;
int LA5_0 = input.LA(1);
if ( (LA5_0=='-') ) {
@@ -1903,7 +1903,7 @@
}
switch (alt5) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:5: '-'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:5: '-'
{
match('-'); if (failed) return ;
@@ -1912,7 +1912,7 @@
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:10: ( '0' .. '9' )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:10: ( '0' .. '9' )+
int cnt6=0;
loop6:
do {
@@ -1925,7 +1925,7 @@
switch (alt6) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:11: '0' .. '9'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:11: '0' .. '9'
{
matchRange('0','9'); if (failed) return ;
@@ -1943,7 +1943,7 @@
} while (true);
match('.'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:26: ( '0' .. '9' )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:26: ( '0' .. '9' )+
int cnt7=0;
loop7:
do {
@@ -1956,7 +1956,7 @@
switch (alt7) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1403:27: '0' .. '9'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1397:27: '0' .. '9'
{
matchRange('0','9'); if (failed) return ;
@@ -2000,7 +2000,7 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:8: ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:8: ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) )
int alt10=2;
int LA10_0 = input.LA(1);
if ( (LA10_0=='\"') ) {
@@ -2012,19 +2012,19 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1406:1: STRING : ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) );", 10, 0, input);
+ new NoViableAltException("1400:1: STRING : ( ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' ) | ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' ) );", 10, 0, input);
throw nvae;
}
switch (alt10) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:9: '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:8: ( '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:9: '\"' ( EscapeSequence | ~ ('\\\\'|'\"'))* '\"'
{
match('\"'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:13: ( EscapeSequence | ~ ('\\\\'|'\"'))*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:13: ( EscapeSequence | ~ ('\\\\'|'\"'))*
loop8:
do {
int alt8=3;
@@ -2039,14 +2039,14 @@
switch (alt8) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:15: EscapeSequence
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:15: EscapeSequence
{
mEscapeSequence(); if (failed) return ;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1407:32: ~ ('\\\\'|'\"')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1401:32: ~ ('\\\\'|'\"')
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -2076,13 +2076,13 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:9: '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\''
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:8: ( '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\'' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:9: '\\'' ( EscapeSequence | ~ ('\\\\'|'\\''))* '\\''
{
match('\''); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:14: ( EscapeSequence | ~ ('\\\\'|'\\''))*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:14: ( EscapeSequence | ~ ('\\\\'|'\\''))*
loop9:
do {
int alt9=3;
@@ -2097,14 +2097,14 @@
switch (alt9) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:16: EscapeSequence
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:16: EscapeSequence
{
mEscapeSequence(); if (failed) return ;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1408:33: ~ ('\\\\'|'\\'')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:33: ~ ('\\\\'|'\\'')
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
input.consume();
@@ -2154,8 +2154,8 @@
public void mHexDigit() throws RecognitionException {
try {
ruleNestingLevel++;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1412:12: ( ('0'..'9'|'a'..'f'|'A'..'F'))
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1412:12: ('0'..'9'|'a'..'f'|'A'..'F')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1406:12: ( ('0'..'9'|'a'..'f'|'A'..'F'))
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1406:12: ('0'..'9'|'a'..'f'|'A'..'F')
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) {
input.consume();
@@ -2182,7 +2182,7 @@
public void mEscapeSequence() throws RecognitionException {
try {
ruleNestingLevel++;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1416:9: ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1410:9: ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape )
int alt11=3;
int LA11_0 = input.LA(1);
if ( (LA11_0=='\\') ) {
@@ -2213,7 +2213,7 @@
default:
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1414:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape );", 11, 1, input);
+ new NoViableAltException("1408:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape );", 11, 1, input);
throw nvae;
}
@@ -2222,13 +2222,13 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1414:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape );", 11, 0, input);
+ new NoViableAltException("1408:1: fragment EscapeSequence : ( '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\') | UnicodeEscape | OctalEscape );", 11, 0, input);
throw nvae;
}
switch (alt11) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1416:9: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1410:9: '\\\\' ('b'|'t'|'n'|'f'|'r'|'\\\"'|'\\''|'\\\\')
{
match('\\'); if (failed) return ;
if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
@@ -2246,14 +2246,14 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:9: UnicodeEscape
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1411:9: UnicodeEscape
{
mUnicodeEscape(); if (failed) return ;
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:9: OctalEscape
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1412:9: OctalEscape
{
mOctalEscape(); if (failed) return ;
@@ -2272,7 +2272,7 @@
public void mOctalEscape() throws RecognitionException {
try {
ruleNestingLevel++;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
int alt12=3;
int LA12_0 = input.LA(1);
if ( (LA12_0=='\\') ) {
@@ -2301,7 +2301,7 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1421:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+ new NoViableAltException("1415:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
throw nvae;
}
@@ -2309,31 +2309,31 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1421:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+ new NoViableAltException("1415:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
throw nvae;
}
switch (alt12) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:14: ( '0' .. '3' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:15: '0' .. '3'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:14: ( '0' .. '3' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:15: '0' .. '3'
{
matchRange('0','3'); if (failed) return ;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:25: ( '0' .. '7' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:26: '0' .. '7'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:25: ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:26: '0' .. '7'
{
matchRange('0','7'); if (failed) return ;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:36: ( '0' .. '7' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1423:37: '0' .. '7'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:36: ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1417:37: '0' .. '7'
{
matchRange('0','7'); if (failed) return ;
@@ -2343,18 +2343,18 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
{
match('\\'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:14: ( '0' .. '7' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:15: '0' .. '7'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:14: ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:15: '0' .. '7'
{
matchRange('0','7'); if (failed) return ;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:25: ( '0' .. '7' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:26: '0' .. '7'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:25: ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:26: '0' .. '7'
{
matchRange('0','7'); if (failed) return ;
@@ -2364,11 +2364,11 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1425:9: '\\\\' ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1419:9: '\\\\' ( '0' .. '7' )
{
match('\\'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1425:14: ( '0' .. '7' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1425:15: '0' .. '7'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1419:14: ( '0' .. '7' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1419:15: '0' .. '7'
{
matchRange('0','7'); if (failed) return ;
@@ -2390,8 +2390,8 @@
public void mUnicodeEscape() throws RecognitionException {
try {
ruleNestingLevel++;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1430:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1430:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1424:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
{
match('\\'); if (failed) return ;
match('u'); if (failed) return ;
@@ -2418,10 +2418,10 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:4: ( ( 'true' | 'false' ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:4: ( 'true' | 'false' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:4: ( ( 'true' | 'false' ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:4: ( 'true' | 'false' )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:4: ( 'true' | 'false' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:4: ( 'true' | 'false' )
int alt13=2;
int LA13_0 = input.LA(1);
if ( (LA13_0=='t') ) {
@@ -2433,13 +2433,13 @@
else {
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1434:4: ( 'true' | 'false' )", 13, 0, input);
+ new NoViableAltException("1428:4: ( 'true' | 'false' )", 13, 0, input);
throw nvae;
}
switch (alt13) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:5: 'true'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:5: 'true'
{
match("true"); if (failed) return ;
@@ -2447,7 +2447,7 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1434:12: 'false'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1428:12: 'false'
{
match("false"); if (failed) return ;
@@ -2484,8 +2484,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:11: ( 'rule' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:11: 'rule'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1431:11: ( 'rule' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1431:11: 'rule'
{
match("rule"); if (failed) return ;
@@ -2516,8 +2516,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1439:11: ( 'when' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1439:11: 'when'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1433:11: ( 'when' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1433:11: 'when'
{
match("when"); if (failed) return ;
@@ -2548,8 +2548,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1441:12: ( 'then' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1441:12: 'then'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1435:12: ( 'then' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1435:12: 'then'
{
match("then"); if (failed) return ;
@@ -2580,8 +2580,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1443:11: ( 'end' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1443:11: 'end'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:11: ( 'end' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1437:11: 'end'
{
match("end"); if (failed) return ;
@@ -2612,8 +2612,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:4: ( ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:4: ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:4: ( ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:4: ('a'..'z'|'A'..'Z'|'_'|'$'|'\\u00c0'..'\\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
{
if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
input.consume();
@@ -2626,7 +2626,7 @@
recover(mse); throw mse;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:50: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:50: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff'))*
loop14:
do {
int alt14=2;
@@ -2638,7 +2638,7 @@
switch (alt14) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1446:51: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:51: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\\u00c0'..'\\u00ff')
{
if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
input.consume();
@@ -2687,11 +2687,11 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:4: ( '#' ( options {greedy=false; } : . )* EOL )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:4: '#' ( options {greedy=false; } : . )* EOL
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:4: ( '#' ( options {greedy=false; } : . )* EOL )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:4: '#' ( options {greedy=false; } : . )* EOL
{
match('#'); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:8: ( options {greedy=false; } : . )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:8: ( options {greedy=false; } : . )*
loop15:
do {
int alt15=2;
@@ -2709,7 +2709,7 @@
switch (alt15) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:35: .
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:35: .
{
matchAny(); if (failed) return ;
@@ -2752,12 +2752,12 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:4: ( '//' ( options {greedy=false; } : . )* EOL )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:4: '//' ( options {greedy=false; } : . )* EOL
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:4: ( '//' ( options {greedy=false; } : . )* EOL )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:4: '//' ( options {greedy=false; } : . )* EOL
{
match("//"); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:9: ( options {greedy=false; } : . )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:9: ( options {greedy=false; } : . )*
loop16:
do {
int alt16=2;
@@ -2775,7 +2775,7 @@
switch (alt16) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:36: .
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1451:36: .
{
matchAny(); if (failed) return ;
@@ -2818,8 +2818,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1463:11: ( '(' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1463:11: '('
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:11: ( '(' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1457:11: '('
{
match('('); if (failed) return ;
@@ -2849,8 +2849,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1467:11: ( ')' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1467:11: ')'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1461:11: ( ')' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1461:11: ')'
{
match(')'); if (failed) return ;
@@ -2880,8 +2880,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1471:11: ( '[' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1471:11: '['
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:11: ( '[' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1465:11: '['
{
match('['); if (failed) return ;
@@ -2911,8 +2911,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:11: ( ']' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1475:11: ']'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1469:11: ( ']' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1469:11: ']'
{
match(']'); if (failed) return ;
@@ -2942,8 +2942,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1479:11: ( '{' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1479:11: '{'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1473:11: ( '{' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1473:11: '{'
{
match('{'); if (failed) return ;
@@ -2973,8 +2973,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1483:11: ( '}' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1483:11: '}'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1477:11: ( '}' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1477:11: '}'
{
match('}'); if (failed) return ;
@@ -3004,12 +3004,12 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1487:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1487:4: '/*' ( options {greedy=false; } : . )* '*/'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1481:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1481:4: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*"); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1487:9: ( options {greedy=false; } : . )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1481:9: ( options {greedy=false; } : . )*
loop17:
do {
int alt17=2;
@@ -3032,7 +3032,7 @@
switch (alt17) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1487:35: .
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1481:35: .
{
matchAny(); if (failed) return ;
@@ -3076,8 +3076,8 @@
int _line = getLine();
int _charPosition = getCharPositionInLine();
int _channel = Token.DEFAULT_CHANNEL;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1491:7: ( ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\'))
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1492:3: ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\')
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1485:7: ( ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\'))
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1486:3: ('!'|'@'|'$'|'%'|'^'|'&'|'*'|'_'|'-'|'+'|'?'|'|'|','|'='|'/'|'\\''|'\\\\')
{
if ( input.LA(1)=='!'||(input.LA(1)>='$' && input.LA(1)<='\'')||(input.LA(1)>='*' && input.LA(1)<='-')||input.LA(1)=='/'||input.LA(1)=='='||(input.LA(1)>='?' && input.LA(1)<='@')||input.LA(1)=='\\'||(input.LA(1)>='^' && input.LA(1)<='_')||input.LA(1)=='|' ) {
input.consume();
@@ -3604,88 +3604,88 @@
protected DFA18 dfa18 = new DFA18(this);
public static final String DFA18_eotS =
- "\2\uffff\3\52\1\64\1\52\1\uffff\2\52\1\uffff\10\52\1\115\1\117\1"+
- "\53\1\122\1\124\1\53\1\52\1\53\1\52\1\uffff\1\131\1\uffff\1\53\1"+
- "\52\2\uffff\1\53\10\uffff\7\52\2\uffff\1\52\1\uffff\24\52\1\177"+
- "\12\uffff\1\52\1\uffff\1\52\2\uffff\1\52\2\uffff\21\52\1\u0094\3"+
- "\52\1\u0098\4\52\1\u009d\1\uffff\5\52\1\uffff\1\52\1\u00a4\3\52"+
- "\1\u00a8\2\52\1\u00ab\3\52\1\u00af\1\u00b0\6\52\1\uffff\3\52\1\uffff"+
- "\2\52\1\u00bd\1\52\1\uffff\1\u00bf\1\u00c0\4\52\1\uffff\1\u00c5"+
- "\2\52\1\uffff\1\52\1\u00b0\1\uffff\2\52\1\u00cb\2\uffff\1\52\1\uffff"+
- "\5\52\1\uffff\4\52\1\uffff\1\52\2\uffff\4\52\1\uffff\1\52\1\u00dd"+
- "\1\52\1\u00df\1\u00e0\1\uffff\2\52\1\u00e3\3\52\1\uffff\2\52\1\u00eb"+
- "\2\52\1\u00ee\3\52\1\u00f2\1\uffff\1\52\2\uffff\2\52\1\uffff\2\52"+
- "\3\uffff\1\52\1\u00f9\1\uffff\2\52\1\uffff\1\u00fc\1\52\1\u00fe"+
- "\1\uffff\1\u00ff\1\u0100\3\52\1\u0104\1\uffff\1\u0105\1\u0106\1"+
- "\uffff\1\u0107\3\uffff\3\52\4\uffff\1\u010b\1\52\1\u010d\3\uffff";
+ "\2\uffff\3\52\1\64\1\52\1\uffff\2\52\1\uffff\10\52\1\115\1\117\2"+
+ "\53\1\123\1\125\1\53\2\52\1\uffff\1\131\1\uffff\1\53\1\52\2\uffff"+
+ "\1\53\10\uffff\7\52\2\uffff\1\52\1\uffff\24\52\1\177\13\uffff\2"+
+ "\52\2\uffff\1\52\2\uffff\21\52\1\u0094\3\52\1\u0098\4\52\1\u009d"+
+ "\1\uffff\5\52\1\uffff\1\52\1\u00a4\3\52\1\u00a8\2\52\1\u00ab\3\52"+
+ "\1\u00af\1\u00b0\6\52\1\uffff\3\52\1\uffff\2\52\1\u00bd\1\52\1\uffff"+
+ "\1\u00bf\1\u00c0\4\52\1\uffff\1\u00c5\2\52\1\uffff\1\52\1\u00b0"+
+ "\1\uffff\2\52\1\u00cb\2\uffff\1\52\1\uffff\5\52\1\uffff\4\52\1\uffff"+
+ "\1\52\2\uffff\4\52\1\uffff\1\52\1\u00dd\1\52\1\u00df\1\u00e0\1\uffff"+
+ "\2\52\1\u00e3\3\52\1\uffff\2\52\1\u00eb\2\52\1\u00ee\3\52\1\u00f2"+
+ "\1\uffff\1\52\2\uffff\2\52\1\uffff\2\52\3\uffff\1\52\1\u00f9\1\uffff"+
+ "\2\52\1\uffff\1\u00fc\1\52\1\u00fe\1\uffff\1\u00ff\1\u0100\3\52"+
+ "\1\u0104\1\uffff\1\u0105\1\u0106\1\uffff\1\u0107\3\uffff\3\52\4"+
+ "\uffff\1\u010b\1\52\1\u010d\3\uffff";
public static final String DFA18_eofS =
"\u010e\uffff";
public static final String DFA18_minS =
"\1\11\1\uffff\1\141\1\155\1\141\1\52\1\154\1\uffff\1\165\1\145\1"+
"\uffff\1\143\1\141\1\156\1\141\1\157\1\145\1\157\1\162\1\174\1\46"+
- "\4\75\1\141\1\60\1\163\1\uffff\1\56\1\uffff\1\0\1\150\2\uffff\1"+
+ "\1\60\4\75\1\141\1\163\1\uffff\1\56\1\uffff\1\0\1\150\2\uffff\1"+
"\52\10\uffff\1\143\1\160\1\151\1\156\1\154\1\157\1\162\2\uffff\1"+
"\157\1\uffff\2\145\1\165\1\155\1\164\1\143\1\164\1\145\1\144\1\164"+
- "\1\162\1\141\1\143\1\141\1\154\1\55\2\154\1\163\1\154\1\60\12\uffff"+
- "\1\164\1\uffff\1\145\2\uffff\1\145\2\uffff\1\153\1\157\1\164\1\143"+
- "\1\163\1\155\1\141\1\142\1\162\1\156\1\145\1\160\1\157\1\165\1\151"+
- "\1\162\1\156\1\60\1\145\1\141\1\142\1\60\1\163\2\154\1\151\1\60"+
- "\1\uffff\1\154\1\145\1\165\1\154\1\164\1\uffff\1\143\1\60\1\156"+
- "\1\141\1\162\1\60\1\164\1\145\1\60\1\154\1\141\1\171\2\60\1\154"+
- "\1\55\1\155\1\157\1\151\1\144\1\uffff\1\55\1\164\1\154\1\uffff\1"+
- "\164\1\165\1\60\1\145\1\uffff\2\60\1\154\1\145\1\141\1\150\1\uffff"+
- "\1\60\1\147\1\164\1\uffff\1\151\1\60\1\uffff\2\154\1\60\2\uffff"+
- "\1\141\1\uffff\1\165\1\156\1\141\1\142\1\141\1\145\1\151\1\145\1"+
- "\163\1\144\1\uffff\1\156\2\uffff\1\164\1\143\1\151\1\145\1\uffff"+
- "\1\145\1\60\1\157\2\60\1\uffff\1\164\1\154\1\60\1\164\1\165\1\55"+
- "\1\146\1\157\1\144\1\60\1\145\1\143\1\60\1\164\1\156\1\163\1\60"+
- "\1\uffff\1\156\2\uffff\1\145\1\141\1\uffff\1\151\1\164\3\uffff\1"+
- "\156\1\60\1\uffff\1\163\1\145\1\uffff\1\60\1\163\1\60\1\uffff\2"+
- "\60\1\164\1\157\1\145\1\60\1\uffff\2\60\1\uffff\1\60\3\uffff\1\145"+
- "\1\156\1\163\4\uffff\1\60\1\55\1\60\3\uffff";
+ "\1\162\1\141\1\143\1\141\1\154\1\55\2\154\1\163\1\154\1\60\13\uffff"+
+ "\1\164\1\145\2\uffff\1\145\2\uffff\1\153\1\157\1\164\1\143\1\163"+
+ "\1\155\1\141\1\142\1\162\1\156\1\145\1\160\1\157\1\165\1\151\1\162"+
+ "\1\156\1\60\1\145\1\141\1\142\1\60\1\163\2\154\1\151\1\60\1\uffff"+
+ "\1\154\1\145\1\165\1\154\1\164\1\uffff\1\143\1\60\1\156\1\141\1"+
+ "\162\1\60\1\164\1\145\1\60\1\154\1\141\1\171\2\60\1\154\1\55\1\155"+
+ "\1\157\1\151\1\144\1\uffff\1\55\1\164\1\154\1\uffff\1\164\1\165"+
+ "\1\60\1\145\1\uffff\2\60\1\154\1\145\1\141\1\150\1\uffff\1\60\1"+
+ "\147\1\164\1\uffff\1\151\1\60\1\uffff\2\154\1\60\2\uffff\1\141\1"+
+ "\uffff\1\165\1\156\1\141\1\142\1\141\1\145\1\151\1\145\1\163\1\144"+
+ "\1\uffff\1\156\2\uffff\1\164\1\143\1\151\1\145\1\uffff\1\145\1\60"+
+ "\1\157\2\60\1\uffff\1\164\1\154\1\60\1\164\1\165\1\55\1\146\1\157"+
+ "\1\144\1\60\1\145\1\143\1\60\1\164\1\156\1\163\1\60\1\uffff\1\156"+
+ "\2\uffff\1\145\1\141\1\uffff\1\151\1\164\3\uffff\1\156\1\60\1\uffff"+
+ "\1\163\1\145\1\uffff\1\60\1\163\1\60\1\uffff\2\60\1\164\1\157\1"+
+ "\145\1\60\1\uffff\2\60\1\uffff\1\60\3\uffff\1\145\1\156\1\163\4"+
+ "\uffff\1\60\1\55\1\60\3\uffff";
public static final String DFA18_maxS =
"\1\u00ff\1\uffff\1\141\1\156\1\165\1\52\1\154\1\uffff\1\165\1\162"+
- "\1\uffff\2\165\1\170\1\141\2\165\1\157\1\162\1\174\1\46\4\75\1\141"+
- "\1\76\1\163\1\uffff\1\71\1\uffff\1\ufffe\1\150\2\uffff\1\57\10\uffff"+
- "\1\143\1\160\1\151\1\156\1\154\1\157\1\162\2\uffff\1\157\1\uffff"+
- "\2\145\1\165\1\155\3\164\1\145\1\144\1\164\1\162\1\144\1\151\1\141"+
- "\1\154\1\164\2\154\1\163\1\156\1\u00ff\12\uffff\1\164\1\uffff\1"+
- "\145\2\uffff\1\145\2\uffff\1\153\1\157\1\164\1\143\1\163\1\155\1"+
- "\141\1\142\1\162\1\156\1\145\1\160\1\157\1\165\1\151\1\162\1\156"+
- "\1\u00ff\1\145\1\141\1\142\1\u00ff\1\163\2\154\1\151\1\u00ff\1\uffff"+
- "\1\154\1\145\1\165\1\154\1\164\1\uffff\1\143\1\u00ff\1\156\1\141"+
- "\1\162\1\u00ff\1\164\1\145\1\u00ff\1\154\1\141\1\171\2\u00ff\1\154"+
- "\1\55\1\155\1\166\1\151\1\144\1\uffff\1\55\1\164\1\154\1\uffff\1"+
- "\164\1\165\1\u00ff\1\145\1\uffff\2\u00ff\1\154\1\145\1\141\1\150"+
- "\1\uffff\1\u00ff\1\147\1\164\1\uffff\1\151\1\u00ff\1\uffff\2\154"+
- "\1\u00ff\2\uffff\1\141\1\uffff\1\165\1\156\1\141\1\142\1\141\1\145"+
- "\1\151\1\145\1\163\1\144\1\uffff\1\156\2\uffff\1\164\1\143\1\151"+
- "\1\145\1\uffff\1\145\1\u00ff\1\157\2\u00ff\1\uffff\1\164\1\154\1"+
- "\u00ff\1\164\1\165\1\55\1\170\1\157\1\144\1\u00ff\1\145\1\143\1"+
- "\u00ff\1\164\1\156\1\163\1\u00ff\1\uffff\1\156\2\uffff\1\145\1\141"+
- "\1\uffff\1\151\1\164\3\uffff\1\156\1\u00ff\1\uffff\1\163\1\145\1"+
- "\uffff\1\u00ff\1\163\1\u00ff\1\uffff\2\u00ff\1\164\1\157\1\145\1"+
- "\u00ff\1\uffff\2\u00ff\1\uffff\1\u00ff\3\uffff\1\145\1\156\1\163"+
- "\4\uffff\1\u00ff\1\55\1\u00ff\3\uffff";
+ "\1\uffff\2\165\1\170\1\141\2\165\1\157\1\162\1\174\1\46\1\76\4\75"+
+ "\1\141\1\163\1\uffff\1\71\1\uffff\1\ufffe\1\150\2\uffff\1\57\10"+
+ "\uffff\1\143\1\160\1\151\1\156\1\154\1\157\1\162\2\uffff\1\157\1"+
+ "\uffff\2\145\1\165\1\155\3\164\1\145\1\144\1\164\1\162\1\144\1\151"+
+ "\1\141\1\154\1\164\2\154\1\163\1\156\1\u00ff\13\uffff\1\164\1\145"+
+ "\2\uffff\1\145\2\uffff\1\153\1\157\1\164\1\143\1\163\1\155\1\141"+
+ "\1\142\1\162\1\156\1\145\1\160\1\157\1\165\1\151\1\162\1\156\1\u00ff"+
+ "\1\145\1\141\1\142\1\u00ff\1\163\2\154\1\151\1\u00ff\1\uffff\1\154"+
+ "\1\145\1\165\1\154\1\164\1\uffff\1\143\1\u00ff\1\156\1\141\1\162"+
+ "\1\u00ff\1\164\1\145\1\u00ff\1\154\1\141\1\171\2\u00ff\1\154\1\55"+
+ "\1\155\1\166\1\151\1\144\1\uffff\1\55\1\164\1\154\1\uffff\1\164"+
+ "\1\165\1\u00ff\1\145\1\uffff\2\u00ff\1\154\1\145\1\141\1\150\1\uffff"+
+ "\1\u00ff\1\147\1\164\1\uffff\1\151\1\u00ff\1\uffff\2\154\1\u00ff"+
+ "\2\uffff\1\141\1\uffff\1\165\1\156\1\141\1\142\1\141\1\145\1\151"+
+ "\1\145\1\163\1\144\1\uffff\1\156\2\uffff\1\164\1\143\1\151\1\145"+
+ "\1\uffff\1\145\1\u00ff\1\157\2\u00ff\1\uffff\1\164\1\154\1\u00ff"+
+ "\1\164\1\165\1\55\1\170\1\157\1\144\1\u00ff\1\145\1\143\1\u00ff"+
+ "\1\164\1\156\1\163\1\u00ff\1\uffff\1\156\2\uffff\1\145\1\141\1\uffff"+
+ "\1\151\1\164\3\uffff\1\156\1\u00ff\1\uffff\1\163\1\145\1\uffff\1"+
+ "\u00ff\1\163\1\u00ff\1\uffff\2\u00ff\1\164\1\157\1\145\1\u00ff\1"+
+ "\uffff\2\u00ff\1\uffff\1\u00ff\3\uffff\1\145\1\156\1\163\4\uffff"+
+ "\1\u00ff\1\55\1\u00ff\3\uffff";
public static final String DFA18_acceptS =
"\1\uffff\1\1\5\uffff\1\10\2\uffff\1\13\21\uffff\1\62\1\uffff\1\65"+
"\2\uffff\1\73\1\74\1\uffff\1\76\1\77\1\100\1\101\1\102\1\103\1\73"+
"\1\105\7\uffff\1\6\1\5\1\uffff\1\10\25\uffff\1\35\1\37\1\54\1\36"+
- "\1\40\1\42\1\41\1\44\1\43\1\45\1\uffff\1\52\1\uffff\1\63\1\64\1"+
- "\uffff\1\75\1\104\33\uffff\1\21\5\uffff\1\34\24\uffff\1\53\3\uffff"+
- "\1\72\4\uffff\1\56\6\uffff\1\61\3\uffff\1\30\2\uffff\1\26\3\uffff"+
- "\1\71\1\66\1\uffff\1\22\12\uffff\1\57\1\uffff\1\51\1\67\4\uffff"+
- "\1\70\5\uffff\1\11\21\uffff\1\3\1\uffff\1\60\1\7\2\uffff\1\31\2"+
- "\uffff\1\24\1\15\1\16\2\uffff\1\55\2\uffff\1\32\3\uffff\1\2\6\uffff"+
- "\1\17\2\uffff\1\33\1\uffff\1\47\1\4\1\12\3\uffff\1\25\1\50\1\20"+
- "\1\46\3\uffff\1\27\1\23\1\14";
+ "\1\40\1\41\1\43\1\42\1\45\1\44\1\46\2\uffff\1\63\1\64\1\uffff\1"+
+ "\75\1\104\33\uffff\1\21\5\uffff\1\34\24\uffff\1\53\3\uffff\1\72"+
+ "\4\uffff\1\56\6\uffff\1\61\3\uffff\1\30\2\uffff\1\26\3\uffff\1\71"+
+ "\1\66\1\uffff\1\22\12\uffff\1\57\1\uffff\1\52\1\67\4\uffff\1\70"+
+ "\5\uffff\1\11\21\uffff\1\3\1\uffff\1\60\1\7\2\uffff\1\31\2\uffff"+
+ "\1\24\1\15\1\16\2\uffff\1\55\2\uffff\1\32\3\uffff\1\2\6\uffff\1"+
+ "\17\2\uffff\1\33\1\uffff\1\50\1\4\1\12\3\uffff\1\25\1\51\1\20\1"+
+ "\47\3\uffff\1\27\1\23\1\14";
public static final String DFA18_specialS =
"\u010e\uffff}>";
public static final String[] DFA18_transition = {
- "\2\34\1\uffff\2\34\22\uffff\1\34\1\30\1\36\1\42\1\41\1\53\1\24\1"+
- "\37\1\44\1\45\2\53\1\7\1\32\1\5\1\43\12\35\1\12\1\1\1\27\1\25\1"+
- "\26\2\53\32\52\1\46\1\53\1\47\1\53\1\41\1\uffff\1\13\1\52\1\21\1"+
- "\14\1\15\1\4\1\6\1\52\1\3\3\52\1\31\1\17\1\22\1\2\1\10\1\20\1\16"+
+ "\2\34\1\uffff\2\34\22\uffff\1\34\1\31\1\36\1\42\1\41\1\53\1\24\1"+
+ "\37\1\44\1\45\2\53\1\7\1\25\1\5\1\43\12\35\1\12\1\1\1\30\1\26\1"+
+ "\27\2\53\32\52\1\46\1\53\1\47\1\53\1\41\1\uffff\1\13\1\52\1\21\1"+
+ "\14\1\15\1\4\1\6\1\52\1\3\3\52\1\32\1\17\1\22\1\2\1\10\1\20\1\16"+
"\1\11\1\33\1\52\1\40\3\52\1\50\1\23\1\51\102\uffff\100\52",
"",
"\1\54",
@@ -3707,12 +3707,12 @@
"\1\113",
"\1\114",
"\1\116",
- "\1\120",
+ "\12\35\4\uffff\1\120",
"\1\121",
- "\1\123",
- "\1\125",
+ "\1\122",
+ "\1\124",
"\1\126",
- "\12\35\4\uffff\1\127",
+ "\1\127",
"\1\130",
"",
"\1\132\1\uffff\12\35",
@@ -3772,8 +3772,8 @@
"",
"",
"",
+ "",
"\1\u0080",
- "",
"\1\u0081",
"",
"",
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-23 12:01:04
+// $ANTLR 3.0b5 D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-01-23 16:40:48
package org.drools.lang;
import java.util.List;
@@ -19,7 +19,7 @@
import java.util.HashMap;
public class DRLParser extends Parser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "ID", "RULE", "WHEN", "STRING", "BOOL", "INT", "LEFT_PAREN", "RIGHT_PAREN", "FLOAT", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "END", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'package'", "'import'", "'function'", "'.'", "'.*'", "'global'", "','", "'query'", "'template'", "':'", "'attributes'", "'date-effective'", "'date-expires'", "'enabled'", "'salience'", "'no-loop'", "'auto-focus'", "'activation-group'", "'agenda-group'", "'duration'", "'from'", "'accumulate'", "'init'", "'action'", "'result'", "'collect'", "'or'", "'||'", "'&'", "'|'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='", "'contains'", "'matches'", "'excludes'", "'null'", "'->'", "'and'", "'&&'", "'exists'", "'not'", "'eval'", "'forall'", "'use'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "ID", "RULE", "WHEN", "STRING", "BOOL", "INT", "LEFT_PAREN", "RIGHT_PAREN", "FLOAT", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "END", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'package'", "'import'", "'function'", "'.'", "'.*'", "'global'", "','", "'query'", "'template'", "':'", "'attributes'", "'date-effective'", "'date-expires'", "'enabled'", "'salience'", "'no-loop'", "'auto-focus'", "'activation-group'", "'agenda-group'", "'duration'", "'from'", "'accumulate'", "'init'", "'action'", "'result'", "'collect'", "'or'", "'||'", "'&'", "'|'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='", "'contains'", "'matches'", "'excludes'", "'null'", "'and'", "'&&'", "'exists'", "'not'", "'eval'", "'forall'", "'use'"
};
public static final int LEFT_PAREN=10;
public static final int RIGHT_CURLY=14;
@@ -50,7 +50,7 @@
public DRLParser(TokenStream input) {
super(input);
- ruleMemo = new HashMap[148+1];
+ ruleMemo = new HashMap[149+1];
}
@@ -2972,7 +2972,7 @@
// $ANTLR start fact
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:907:1: fact returns [BaseDescr d] : id= dotted_name loc= LEFT_PAREN ( ( constraints )=>c= constraints )? endLoc= RIGHT_PAREN ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:907:1: fact returns [BaseDescr d] : id= dotted_name loc= LEFT_PAREN ( ( constraints[(ColumnDescr) d] )=> constraints[(ColumnDescr) d] )? endLoc= RIGHT_PAREN ;
public BaseDescr fact() throws RecognitionException {
BaseDescr d = null;
@@ -2980,15 +2980,13 @@
Token endLoc=null;
String id = null;
- List c = null;
-
d=null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:911:5: (id= dotted_name loc= LEFT_PAREN ( ( constraints )=>c= constraints )? endLoc= RIGHT_PAREN )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:911:5: id= dotted_name loc= LEFT_PAREN ( ( constraints )=>c= constraints )? endLoc= RIGHT_PAREN
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:911:5: (id= dotted_name loc= LEFT_PAREN ( ( constraints[(ColumnDescr) d] )=> constraints[(ColumnDescr) d] )? endLoc= RIGHT_PAREN )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:911:5: id= dotted_name loc= LEFT_PAREN ( ( constraints[(ColumnDescr) d] )=> constraints[(ColumnDescr) d] )? endLoc= RIGHT_PAREN
{
pushFollow(FOLLOW_dotted_name_in_fact2083);
id=dotted_name();
@@ -3007,27 +3005,20 @@
d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:919:4: ( ( constraints )=>c= constraints )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:919:4: ( ( constraints[(ColumnDescr) d] )=> constraints[(ColumnDescr) d] )?
int alt30=2;
int LA30_0 = input.LA(1);
- if ( (LA30_0==ID) ) {
+ if ( (LA30_0==ID||LA30_0==LEFT_PAREN) ) {
alt30=1;
}
switch (alt30) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:919:6: ( constraints )=>c= constraints
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:919:6: ( constraints[(ColumnDescr) d] )=> constraints[(ColumnDescr) d]
{
- pushFollow(FOLLOW_constraints_in_fact2108);
- c=constraints();
+ pushFollow(FOLLOW_constraints_in_fact2106);
+ constraints((ColumnDescr) d);
_fsp--;
if (failed) return d;
- if ( backtracking==0 ) {
-
- for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
- ((ColumnDescr)d).addDescr( (BaseDescr) cIter.next() );
- }
-
- }
}
break;
@@ -3035,7 +3026,7 @@
}
endLoc=(Token)input.LT(1);
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact2129); if (failed) return d;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact2119); if (failed) return d;
if ( backtracking==0 ) {
if( endLoc.getType() == RIGHT_PAREN ) {
@@ -3060,91 +3051,53 @@
// $ANTLR start constraints
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:936:1: constraints returns [List constraints] : ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) ( ( ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )=> ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )* ;
- public List constraints() throws RecognitionException {
- List constraints = null;
-
-
- constraints = new ArrayList();
-
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:930:1: constraints[ColumnDescr column] : ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )* ;
+ public void constraints(ColumnDescr column) throws RecognitionException {
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:4: ( ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) ( ( ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )=> ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) ( ( ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )=> ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:931:4: ( ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:931:4: ( ( constraint[column] )=> constraint[column] | predicate[column] ) ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )*
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:931:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )
int alt31=2;
int LA31_0 = input.LA(1);
if ( (LA31_0==ID) ) {
- int LA31_1 = input.LA(2);
- if ( (LA31_1==39) ) {
- int LA31_2 = input.LA(3);
- if ( (LA31_2==ID) ) {
- int LA31_4 = input.LA(4);
- if ( (LA31_4==70) ) {
- alt31=2;
- }
- else if ( (LA31_4==EOF||LA31_4==RIGHT_PAREN||LA31_4==36||(LA31_4>=60 && LA31_4<=68)) ) {
- alt31=1;
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 31, 4, input);
-
- throw nvae;
- }
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 31, 2, input);
-
- throw nvae;
- }
- }
- else if ( (LA31_1==EOF||LA31_1==RIGHT_PAREN||LA31_1==36||(LA31_1>=60 && LA31_1<=68)) ) {
- alt31=1;
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 31, 1, input);
-
- throw nvae;
- }
+ alt31=1;
}
+ else if ( (LA31_0==LEFT_PAREN) ) {
+ alt31=2;
+ }
else {
- if (backtracking>0) {failed=true; return constraints;}
+ if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("940:4: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 31, 0, input);
+ new NoViableAltException("931:4: ( ( constraint[column] )=> constraint[column] | predicate[column] )", 31, 0, input);
throw nvae;
}
switch (alt31) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:5: ( constraint[constraints] )=> constraint[constraints]
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:931:5: ( constraint[column] )=> constraint[column]
{
- pushFollow(FOLLOW_constraint_in_constraints2159);
- constraint(constraints);
+ pushFollow(FOLLOW_constraint_in_constraints2140);
+ constraint(column);
_fsp--;
- if (failed) return constraints;
+ if (failed) return ;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:29: predicate[constraints]
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:931:24: predicate[column]
{
- pushFollow(FOLLOW_predicate_in_constraints2162);
- predicate(constraints);
+ pushFollow(FOLLOW_predicate_in_constraints2143);
+ predicate(column);
_fsp--;
- if (failed) return constraints;
+ if (failed) return ;
}
break;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:3: ( ( ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )=> ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:932:3: ( ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )*
loop33:
do {
int alt33=2;
@@ -3156,76 +3109,43 @@
switch (alt33) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:5: ( ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] ) )=> ',' ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:932:5: ( ',' ( ( constraint[column] )=> constraint[column] | predicate[column] ) )=> ',' ( ( constraint[column] )=> constraint[column] | predicate[column] )
{
- match(input,36,FOLLOW_36_in_constraints2170); if (failed) return constraints;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:9: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )
+ match(input,36,FOLLOW_36_in_constraints2151); if (failed) return ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:932:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )
int alt32=2;
int LA32_0 = input.LA(1);
if ( (LA32_0==ID) ) {
- int LA32_1 = input.LA(2);
- if ( (LA32_1==39) ) {
- int LA32_2 = input.LA(3);
- if ( (LA32_2==ID) ) {
- int LA32_4 = input.LA(4);
- if ( (LA32_4==70) ) {
- alt32=2;
- }
- else if ( (LA32_4==EOF||LA32_4==RIGHT_PAREN||LA32_4==36||(LA32_4>=60 && LA32_4<=68)) ) {
- alt32=1;
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("941:9: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 32, 4, input);
-
- throw nvae;
- }
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("941:9: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 32, 2, input);
-
- throw nvae;
- }
- }
- else if ( (LA32_1==EOF||LA32_1==RIGHT_PAREN||LA32_1==36||(LA32_1>=60 && LA32_1<=68)) ) {
- alt32=1;
- }
- else {
- if (backtracking>0) {failed=true; return constraints;}
- NoViableAltException nvae =
- new NoViableAltException("941:9: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 32, 1, input);
-
- throw nvae;
- }
+ alt32=1;
}
+ else if ( (LA32_0==LEFT_PAREN) ) {
+ alt32=2;
+ }
else {
- if (backtracking>0) {failed=true; return constraints;}
+ if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("941:9: ( ( constraint[constraints] )=> constraint[constraints] | predicate[constraints] )", 32, 0, input);
+ new NoViableAltException("932:9: ( ( constraint[column] )=> constraint[column] | predicate[column] )", 32, 0, input);
throw nvae;
}
switch (alt32) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:10: ( constraint[constraints] )=> constraint[constraints]
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:932:10: ( constraint[column] )=> constraint[column]
{
- pushFollow(FOLLOW_constraint_in_constraints2173);
- constraint(constraints);
+ pushFollow(FOLLOW_constraint_in_constraints2154);
+ constraint(column);
_fsp--;
- if (failed) return constraints;
+ if (failed) return ;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:34: predicate[constraints]
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:932:29: predicate[column]
{
- pushFollow(FOLLOW_predicate_in_constraints2176);
- predicate(constraints);
+ pushFollow(FOLLOW_predicate_in_constraints2157);
+ predicate(column);
_fsp--;
- if (failed) return constraints;
+ if (failed) return ;
}
break;
@@ -3251,14 +3171,14 @@
}
finally {
}
- return constraints;
+ return ;
}
// $ANTLR end constraints
// $ANTLR start constraint
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:944:1: constraint[List constraints] : ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* )=>rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )? ;
- public void constraint(List constraints) throws RecognitionException {
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:935:1: constraint[ColumnDescr column] : ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )? ;
+ public void constraint(ColumnDescr column) throws RecognitionException {
Token fb=null;
Token f=null;
Token con=null;
@@ -3270,10 +3190,10 @@
FieldConstraintDescr fc = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:950:3: ( ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* )=>rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )? )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:950:3: ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* )=>rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:3: ( ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )? )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:3: ( ( ID ':' )=>fb= ID ':' )? f= ID ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )?
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:950:3: ( ( ID ':' )=>fb= ID ':' )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:3: ( ( ID ':' )=>fb= ID ':' )?
int alt34=2;
int LA34_0 = input.LA(1);
if ( (LA34_0==ID) ) {
@@ -3284,18 +3204,18 @@
}
switch (alt34) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:950:5: ( ID ':' )=>fb= ID ':'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:941:5: ( ID ':' )=>fb= ID ':'
{
fb=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint2205); if (failed) return ;
- match(input,39,FOLLOW_39_in_constraint2207); if (failed) return ;
+ match(input,ID,FOLLOW_ID_in_constraint2186); if (failed) return ;
+ match(input,39,FOLLOW_39_in_constraint2188); if (failed) return ;
if ( backtracking==0 ) {
fbd = new FieldBindingDescr();
fbd.setIdentifier( fb.getText() );
fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
- constraints.add( fbd );
+ column.addDescr( fbd );
}
@@ -3306,7 +3226,7 @@
}
f=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint2228); if (failed) return ;
+ match(input,ID,FOLLOW_ID_in_constraint2209); if (failed) return ;
if ( backtracking==0 ) {
if ( fb != null ) {
@@ -3317,27 +3237,33 @@
fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:969:3: ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* )=>rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )?
- int alt36=2;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:960:3: ( ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* ) | ( '->' predicate[column] )=> '->' predicate[column] )?
+ int alt36=3;
int LA36_0 = input.LA(1);
- if ( ((LA36_0>=60 && LA36_0<=68)) ) {
+ if ( ((LA36_0>=61 && LA36_0<=69)) ) {
alt36=1;
}
+ else if ( (LA36_0==60) ) {
+ alt36=2;
+ }
switch (alt36) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:970:4: ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* )=>rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:961:4: ( ( constraint_expression ( ( ('&'|'|') constraint_expression )=> ('&'|'|') constraint_expression )* ) )=> (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
{
- pushFollow(FOLLOW_constraint_expression_in_constraint2244);
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:961:4: (rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:961:6: rd= constraint_expression ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
+ {
+ pushFollow(FOLLOW_constraint_expression_in_constraint2227);
rd=constraint_expression();
_fsp--;
if (failed) return ;
if ( backtracking==0 ) {
- fc.addRestriction(rd);
- constraints.add(fc);
-
+ fc.addRestriction(rd);
+ column.addDescr(fc);
+
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:975:4: ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:966:5: ( ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression )*
loop35:
do {
int alt35=2;
@@ -3349,7 +3275,7 @@
switch (alt35) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:976:5: ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:967:6: ( ('&'|'|') constraint_expression )=>con= ('&'|'|')rd= constraint_expression
{
con=(Token)input.LT(1);
if ( (input.LA(1)>=58 && input.LA(1)<=59) ) {
@@ -3360,26 +3286,26 @@
if (backtracking>0) {failed=true; return ;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint2263); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint2249); throw mse;
}
if ( backtracking==0 ) {
- if (con.getText().equals("&") ) {
- fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));
- } else {
- fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));
- }
-
+ if (con.getText().equals("&") ) {
+ fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));
+ } else {
+ fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));
+ }
+
}
- pushFollow(FOLLOW_constraint_expression_in_constraint2280);
+ pushFollow(FOLLOW_constraint_expression_in_constraint2268);
rd=constraint_expression();
_fsp--;
if (failed) return ;
if ( backtracking==0 ) {
- fc.addRestriction(rd);
-
+ fc.addRestriction(rd);
+
}
}
@@ -3392,8 +3318,22 @@
}
+
+
+ }
break;
+ case 2 :
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:982:4: ( '->' predicate[column] )=> '->' predicate[column]
+ {
+ match(input,60,FOLLOW_60_in_constraint2296); if (failed) return ;
+ pushFollow(FOLLOW_predicate_in_constraint2298);
+ predicate(column);
+ _fsp--;
+ if (failed) return ;
+ }
+ break;
+
}
@@ -3412,7 +3352,7 @@
// $ANTLR start constraint_expression
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:992:1: constraint_expression returns [RestrictionDescr rd] : op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:986:1: constraint_expression returns [RestrictionDescr rd] : op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) ;
public RestrictionDescr constraint_expression() throws RecognitionException {
RestrictionDescr rd = null;
@@ -3424,11 +3364,11 @@
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:994:3: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:994:3: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:988:3: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:988:3: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
{
op=(Token)input.LT(1);
- if ( (input.LA(1)>=60 && input.LA(1)<=68) ) {
+ if ( (input.LA(1)>=61 && input.LA(1)<=69) ) {
input.consume();
errorRecovery=false;failed=false;
}
@@ -3436,10 +3376,10 @@
if (backtracking>0) {failed=true; return rd;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint_expression2332); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint_expression2335); throw mse;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:998:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )
int alt37=4;
switch ( input.LA(1) ) {
case ID:
@@ -3453,7 +3393,7 @@
else {
if (backtracking>0) {failed=true; return rd;}
NoViableAltException nvae =
- new NoViableAltException("1004:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 1, input);
+ new NoViableAltException("998:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 1, input);
throw nvae;
}
@@ -3462,7 +3402,7 @@
case BOOL:
case INT:
case FLOAT:
- case 69:
+ case 70:
alt37=3;
break;
case LEFT_PAREN:
@@ -3471,17 +3411,17 @@
default:
if (backtracking>0) {failed=true; return rd;}
NoViableAltException nvae =
- new NoViableAltException("1004:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 0, input);
+ new NoViableAltException("998:3: ( ( ID )=>bvc= ID | ( enum_constraint )=>lc= enum_constraint | ( literal_constraint )=>lc= literal_constraint | rvc= retval_constraint )", 37, 0, input);
throw nvae;
}
switch (alt37) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1004:5: ( ID )=>bvc= ID
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:998:5: ( ID )=>bvc= ID
{
bvc=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint_expression2399); if (failed) return rd;
+ match(input,ID,FOLLOW_ID_in_constraint_expression2402); if (failed) return rd;
if ( backtracking==0 ) {
rd = new VariableRestrictionDescr(op.getText(), bvc.getText());
@@ -3491,9 +3431,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1009:4: ( enum_constraint )=>lc= enum_constraint
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1003:4: ( enum_constraint )=>lc= enum_constraint
{
- pushFollow(FOLLOW_enum_constraint_in_constraint_expression2415);
+ pushFollow(FOLLOW_enum_constraint_in_constraint_expression2418);
lc=enum_constraint();
_fsp--;
if (failed) return rd;
@@ -3506,9 +3446,9 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1014:4: ( literal_constraint )=>lc= literal_constraint
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1008:4: ( literal_constraint )=>lc= literal_constraint
{
- pushFollow(FOLLOW_literal_constraint_in_constraint_expression2438);
+ pushFollow(FOLLOW_literal_constraint_in_constraint_expression2441);
lc=literal_constraint();
_fsp--;
if (failed) return rd;
@@ -3521,9 +3461,9 @@
}
break;
case 4 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1018:5: rvc= retval_constraint
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1012:5: rvc= retval_constraint
{
- pushFollow(FOLLOW_retval_constraint_in_constraint_expression2452);
+ pushFollow(FOLLOW_retval_constraint_in_constraint_expression2455);
rvc=retval_constraint();
_fsp--;
if (failed) return rd;
@@ -3554,7 +3494,7 @@
// $ANTLR start literal_constraint
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1025:1: literal_constraint returns [String text] : ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' ) ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1019:1: literal_constraint returns [String text] : ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' ) ;
public String literal_constraint() throws RecognitionException {
String text = null;
@@ -3564,10 +3504,10 @@
text = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1029:4: ( ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1029:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1023:4: ( ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1023:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1029:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1023:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )
int alt38=5;
switch ( input.LA(1) ) {
case STRING:
@@ -3582,23 +3522,23 @@
case BOOL:
alt38=4;
break;
- case 69:
+ case 70:
alt38=5;
break;
default:
if (backtracking>0) {failed=true; return text;}
NoViableAltException nvae =
- new NoViableAltException("1029:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )", 38, 0, input);
+ new NoViableAltException("1023:4: ( ( STRING )=>t= STRING | ( INT )=>t= INT | ( FLOAT )=>t= FLOAT | ( BOOL )=>t= BOOL | t= 'null' )", 38, 0, input);
throw nvae;
}
switch (alt38) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1029:6: ( STRING )=>t= STRING
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1023:6: ( STRING )=>t= STRING
{
t=(Token)input.LT(1);
- match(input,STRING,FOLLOW_STRING_in_literal_constraint2491); if (failed) return text;
+ match(input,STRING,FOLLOW_STRING_in_literal_constraint2494); if (failed) return text;
if ( backtracking==0 ) {
text = getString( t );
}
@@ -3606,10 +3546,10 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1030:5: ( INT )=>t= INT
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1024:5: ( INT )=>t= INT
{
t=(Token)input.LT(1);
- match(input,INT,FOLLOW_INT_in_literal_constraint2502); if (failed) return text;
+ match(input,INT,FOLLOW_INT_in_literal_constraint2505); if (failed) return text;
if ( backtracking==0 ) {
text = t.getText();
}
@@ -3617,10 +3557,10 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1031:5: ( FLOAT )=>t= FLOAT
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1025:5: ( FLOAT )=>t= FLOAT
{
t=(Token)input.LT(1);
- match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2515); if (failed) return text;
+ match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2518); if (failed) return text;
if ( backtracking==0 ) {
text = t.getText();
}
@@ -3628,10 +3568,10 @@
}
break;
case 4 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1032:5: ( BOOL )=>t= BOOL
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1026:5: ( BOOL )=>t= BOOL
{
t=(Token)input.LT(1);
- match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2526); if (failed) return text;
+ match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2529); if (failed) return text;
if ( backtracking==0 ) {
text = t.getText();
}
@@ -3639,10 +3579,10 @@
}
break;
case 5 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1033:5: t= 'null'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1027:5: t= 'null'
{
t=(Token)input.LT(1);
- match(input,69,FOLLOW_69_in_literal_constraint2538); if (failed) return text;
+ match(input,70,FOLLOW_70_in_literal_constraint2541); if (failed) return text;
if ( backtracking==0 ) {
text = null;
}
@@ -3668,7 +3608,7 @@
// $ANTLR start enum_constraint
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1037:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1031:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
public String enum_constraint() throws RecognitionException {
String text = null;
@@ -3679,17 +3619,17 @@
text = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:4: ( (cls= ID '.' en= ID ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:4: (cls= ID '.' en= ID )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:4: ( (cls= ID '.' en= ID ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:4: (cls= ID '.' en= ID )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:4: (cls= ID '.' en= ID )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:5: cls= ID '.' en= ID
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:4: (cls= ID '.' en= ID )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:5: cls= ID '.' en= ID
{
cls=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2569); if (failed) return text;
- match(input,33,FOLLOW_33_in_enum_constraint2571); if (failed) return text;
+ match(input,ID,FOLLOW_ID_in_enum_constraint2572); if (failed) return text;
+ match(input,33,FOLLOW_33_in_enum_constraint2574); if (failed) return text;
en=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2575); if (failed) return text;
+ match(input,ID,FOLLOW_ID_in_enum_constraint2578); if (failed) return text;
}
@@ -3712,32 +3652,24 @@
// $ANTLR start predicate
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1045:1: predicate[List constraints] : decl= ID ':' field= ID '->' text= paren_chunk ;
- public void predicate(List constraints) throws RecognitionException {
- Token decl=null;
- Token field=null;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1039:1: predicate[ColumnDescr column] : text= paren_chunk ;
+ public void predicate(ColumnDescr column) throws RecognitionException {
String text = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1047:3: (decl= ID ':' field= ID '->' text= paren_chunk )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1047:3: decl= ID ':' field= ID '->' text= paren_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:3: (text= paren_chunk )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1041:3: text= paren_chunk
{
- decl=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2597); if (failed) return ;
- match(input,39,FOLLOW_39_in_predicate2599); if (failed) return ;
- field=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2603); if (failed) return ;
- match(input,70,FOLLOW_70_in_predicate2605); if (failed) return ;
- pushFollow(FOLLOW_paren_chunk_in_predicate2609);
+ pushFollow(FOLLOW_paren_chunk_in_predicate2600);
text=paren_chunk();
_fsp--;
if (failed) return ;
if ( backtracking==0 ) {
String body = text.substring(1, text.length()-1);
- PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), body );
- constraints.add( d );
+ PredicateDescr d = new PredicateDescr( body );
+ column.addDescr( d );
}
@@ -3756,7 +3688,7 @@
// $ANTLR start paren_chunk
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:1: paren_chunk returns [String text] : loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1049:1: paren_chunk returns [String text] : loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN ;
public String paren_chunk() throws RecognitionException {
String text = null;
@@ -3769,8 +3701,8 @@
Integer channel = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1061:10: (loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1061:10: loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:10: (loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:10: loc= LEFT_PAREN ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )* loc= RIGHT_PAREN
{
if ( backtracking==0 ) {
@@ -3780,14 +3712,14 @@
}
loc=(Token)input.LT(1);
- match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk2656); if (failed) return text;
+ match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk2647); if (failed) return text;
if ( backtracking==0 ) {
buf.append( loc.getText());
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1071:3: ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1065:3: ( (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN) | ( paren_chunk )=>chunk= paren_chunk )*
loop39:
do {
int alt39=3;
@@ -3802,7 +3734,7 @@
switch (alt39) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1072:4: (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN)
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1066:4: (~ (LEFT_PAREN|RIGHT_PAREN))=>~ (LEFT_PAREN|RIGHT_PAREN)
{
if ( (input.LA(1)>=ID && input.LA(1)<=INT)||(input.LA(1)>=FLOAT && input.LA(1)<=77) ) {
input.consume();
@@ -3812,7 +3744,7 @@
if (backtracking>0) {failed=true; return text;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk2672); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk2663); throw mse;
}
if ( backtracking==0 ) {
@@ -3824,9 +3756,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1077:4: ( paren_chunk )=>chunk= paren_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1071:4: ( paren_chunk )=>chunk= paren_chunk
{
- pushFollow(FOLLOW_paren_chunk_in_paren_chunk2696);
+ pushFollow(FOLLOW_paren_chunk_in_paren_chunk2687);
chunk=paren_chunk();
_fsp--;
if (failed) return text;
@@ -3854,7 +3786,7 @@
}
loc=(Token)input.LT(1);
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk2732); if (failed) return text;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk2723); if (failed) return text;
if ( backtracking==0 ) {
buf.append( loc.getText() );
@@ -3877,7 +3809,7 @@
// $ANTLR start curly_chunk
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1096:1: curly_chunk returns [String text] : loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1090:1: curly_chunk returns [String text] : loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY ;
public String curly_chunk() throws RecognitionException {
String text = null;
@@ -3890,11 +3822,11 @@
Integer channel = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1102:3: (loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1102:3: loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1096:3: (loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1096:3: loc= LEFT_CURLY ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )* loc= RIGHT_CURLY
{
loc=(Token)input.LT(1);
- match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk2782); if (failed) return text;
+ match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk2773); if (failed) return text;
if ( backtracking==0 ) {
channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS );
@@ -3904,7 +3836,7 @@
buf.append( loc.getText() );
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1110:3: ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1104:3: ( (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY) | ( curly_chunk )=>chunk= curly_chunk )*
loop40:
do {
int alt40=3;
@@ -3919,7 +3851,7 @@
switch (alt40) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1111:4: (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY)
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1105:4: (~ (LEFT_CURLY|RIGHT_CURLY))=>~ (LEFT_CURLY|RIGHT_CURLY)
{
if ( (input.LA(1)>=ID && input.LA(1)<=FLOAT)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=77) ) {
input.consume();
@@ -3929,7 +3861,7 @@
if (backtracking>0) {failed=true; return text;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk2798); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk2789); throw mse;
}
if ( backtracking==0 ) {
@@ -3941,9 +3873,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1116:4: ( curly_chunk )=>chunk= curly_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1110:4: ( curly_chunk )=>chunk= curly_chunk
{
- pushFollow(FOLLOW_curly_chunk_in_curly_chunk2822);
+ pushFollow(FOLLOW_curly_chunk_in_curly_chunk2813);
chunk=curly_chunk();
_fsp--;
if (failed) return text;
@@ -3971,7 +3903,7 @@
}
loc=(Token)input.LT(1);
- match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk2858); if (failed) return text;
+ match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk2849); if (failed) return text;
if ( backtracking==0 ) {
buf.append( loc.getText() );
@@ -3994,7 +3926,7 @@
// $ANTLR start square_chunk
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1135:1: square_chunk returns [String text] : loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1129:1: square_chunk returns [String text] : loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE ;
public String square_chunk() throws RecognitionException {
String text = null;
@@ -4007,8 +3939,8 @@
Integer channel = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1141:10: (loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1141:10: loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1135:10: (loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1135:10: loc= LEFT_SQUARE ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )* loc= RIGHT_SQUARE
{
if ( backtracking==0 ) {
@@ -4018,14 +3950,14 @@
}
loc=(Token)input.LT(1);
- match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk2919); if (failed) return text;
+ match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk2910); if (failed) return text;
if ( backtracking==0 ) {
buf.append( loc.getText());
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1151:3: ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1145:3: ( (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE) | ( square_chunk )=>chunk= square_chunk )*
loop41:
do {
int alt41=3;
@@ -4040,7 +3972,7 @@
switch (alt41) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1152:4: (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE)
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1146:4: (~ (LEFT_SQUARE|RIGHT_SQUARE))=>~ (LEFT_SQUARE|RIGHT_SQUARE)
{
if ( (input.LA(1)>=ID && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=END && input.LA(1)<=77) ) {
input.consume();
@@ -4050,7 +3982,7 @@
if (backtracking>0) {failed=true; return text;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk2935); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk2926); throw mse;
}
if ( backtracking==0 ) {
@@ -4062,9 +3994,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1157:4: ( square_chunk )=>chunk= square_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1151:4: ( square_chunk )=>chunk= square_chunk
{
- pushFollow(FOLLOW_square_chunk_in_square_chunk2959);
+ pushFollow(FOLLOW_square_chunk_in_square_chunk2950);
chunk=square_chunk();
_fsp--;
if (failed) return text;
@@ -4092,7 +4024,7 @@
}
loc=(Token)input.LT(1);
- match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk2995); if (failed) return text;
+ match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk2986); if (failed) return text;
if ( backtracking==0 ) {
buf.append( loc.getText() );
@@ -4115,7 +4047,7 @@
// $ANTLR start retval_constraint
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1176:1: retval_constraint returns [String text] : c= paren_chunk ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1170:1: retval_constraint returns [String text] : c= paren_chunk ;
public String retval_constraint() throws RecognitionException {
String text = null;
@@ -4126,10 +4058,10 @@
text = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1181:3: (c= paren_chunk )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1181:3: c= paren_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1175:3: (c= paren_chunk )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1175:3: c= paren_chunk
{
- pushFollow(FOLLOW_paren_chunk_in_retval_constraint3040);
+ pushFollow(FOLLOW_paren_chunk_in_retval_constraint3031);
c=paren_chunk();
_fsp--;
if (failed) return text;
@@ -4152,7 +4084,7 @@
// $ANTLR start lhs_or
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1189:1: lhs_or returns [BaseDescr d] : left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )* ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1183:1: lhs_or returns [BaseDescr d] : left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )* ;
public BaseDescr lhs_or() throws RecognitionException {
BaseDescr d = null;
@@ -4166,17 +4098,17 @@
OrDescr or = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1195:3: (left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1195:3: left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1189:3: (left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1189:3: left= lhs_and ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )*
{
- pushFollow(FOLLOW_lhs_and_in_lhs_or3073);
+ pushFollow(FOLLOW_lhs_and_in_lhs_or3064);
left=lhs_and();
_fsp--;
if (failed) return d;
if ( backtracking==0 ) {
d = left;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1196:3: ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1190:3: ( ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and )*
loop42:
do {
int alt42=2;
@@ -4188,7 +4120,7 @@
switch (alt42) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1196:5: ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1190:5: ( ('or'|'||') lhs_and )=> ('or'|'||')right= lhs_and
{
if ( (input.LA(1)>=56 && input.LA(1)<=57) ) {
input.consume();
@@ -4198,10 +4130,10 @@
if (backtracking>0) {failed=true; return d;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3082); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3073); throw mse;
}
- pushFollow(FOLLOW_lhs_and_in_lhs_or3092);
+ pushFollow(FOLLOW_lhs_and_in_lhs_or3083);
right=lhs_and();
_fsp--;
if (failed) return d;
@@ -4241,7 +4173,7 @@
// $ANTLR start lhs_and
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1210:1: lhs_and returns [BaseDescr d] : left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )* ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1204:1: lhs_and returns [BaseDescr d] : left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )* ;
public BaseDescr lhs_and() throws RecognitionException {
BaseDescr d = null;
@@ -4255,17 +4187,17 @@
AndDescr and = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1216:3: (left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1216:3: left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1210:3: (left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1210:3: left= lhs_unary ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )*
{
- pushFollow(FOLLOW_lhs_unary_in_lhs_and3128);
+ pushFollow(FOLLOW_lhs_unary_in_lhs_and3119);
left=lhs_unary();
_fsp--;
if (failed) return d;
if ( backtracking==0 ) {
d = left;
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1217:3: ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1211:3: ( ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary )*
loop43:
do {
int alt43=2;
@@ -4277,7 +4209,7 @@
switch (alt43) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1217:5: ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1211:5: ( ('and'|'&&') lhs_unary )=> ('and'|'&&')right= lhs_unary
{
if ( (input.LA(1)>=71 && input.LA(1)<=72) ) {
input.consume();
@@ -4287,10 +4219,10 @@
if (backtracking>0) {failed=true; return d;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3137); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3128); throw mse;
}
- pushFollow(FOLLOW_lhs_unary_in_lhs_and3147);
+ pushFollow(FOLLOW_lhs_unary_in_lhs_and3138);
right=lhs_unary();
_fsp--;
if (failed) return d;
@@ -4330,7 +4262,7 @@
// $ANTLR start lhs_unary
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1231:1: lhs_unary returns [BaseDescr d] : ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1225:1: lhs_unary returns [BaseDescr d] : ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon ;
public BaseDescr lhs_unary() throws RecognitionException {
BaseDescr d = null;
@@ -4347,10 +4279,10 @@
d = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:4: ( ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:4: ( ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' ) opt_semicolon
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' )
int alt45=6;
switch ( input.LA(1) ) {
case 73:
@@ -4374,16 +4306,16 @@
default:
if (backtracking>0) {failed=true; return d;}
NoViableAltException nvae =
- new NoViableAltException("1235:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' )", 45, 0, input);
+ new NoViableAltException("1229:4: ( ( lhs_exist )=>u= lhs_exist | ( lhs_not )=>u= lhs_not | ( lhs_eval )=>u= lhs_eval | ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )? | ( lhs_forall )=>u= lhs_forall | '(' u= lhs ')' )", 45, 0, input);
throw nvae;
}
switch (alt45) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:6: ( lhs_exist )=>u= lhs_exist
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1229:6: ( lhs_exist )=>u= lhs_exist
{
- pushFollow(FOLLOW_lhs_exist_in_lhs_unary3184);
+ pushFollow(FOLLOW_lhs_exist_in_lhs_unary3175);
u=lhs_exist();
_fsp--;
if (failed) return d;
@@ -4391,9 +4323,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1236:5: ( lhs_not )=>u= lhs_not
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1230:5: ( lhs_not )=>u= lhs_not
{
- pushFollow(FOLLOW_lhs_not_in_lhs_unary3192);
+ pushFollow(FOLLOW_lhs_not_in_lhs_unary3183);
u=lhs_not();
_fsp--;
if (failed) return d;
@@ -4401,9 +4333,9 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1237:5: ( lhs_eval )=>u= lhs_eval
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1231:5: ( lhs_eval )=>u= lhs_eval
{
- pushFollow(FOLLOW_lhs_eval_in_lhs_unary3200);
+ pushFollow(FOLLOW_lhs_eval_in_lhs_unary3191);
u=lhs_eval();
_fsp--;
if (failed) return d;
@@ -4411,13 +4343,13 @@
}
break;
case 4 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1238:5: ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1232:5: ( lhs_column ( ( ( from_statement ) )=> ( from_statement ) | ( ( accumulate_statement ) )=> ( accumulate_statement ) | ( ( collect_statement ) )=> ( collect_statement ) )? )=>u= lhs_column ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )?
{
- pushFollow(FOLLOW_lhs_column_in_lhs_unary3208);
+ pushFollow(FOLLOW_lhs_column_in_lhs_unary3199);
u=lhs_column();
_fsp--;
if (failed) return d;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1238:18: ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1232:18: ( ( ( from_statement ) )=> (fm= from_statement ) | ( ( accumulate_statement ) )=> (ac= accumulate_statement ) | ( ( collect_statement ) )=> (cs= collect_statement ) )?
int alt44=4;
int LA44_0 = input.LA(1);
if ( (LA44_0==50) ) {
@@ -4436,12 +4368,12 @@
}
switch (alt44) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1239:14: ( ( from_statement ) )=> (fm= from_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1233:14: ( ( from_statement ) )=> (fm= from_statement )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1239:14: (fm= from_statement )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1239:15: fm= from_statement
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1233:14: (fm= from_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1233:15: fm= from_statement
{
- pushFollow(FOLLOW_from_statement_in_lhs_unary3228);
+ pushFollow(FOLLOW_from_statement_in_lhs_unary3219);
fm=from_statement();
_fsp--;
if (failed) return d;
@@ -4455,12 +4387,12 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1240:14: ( ( accumulate_statement ) )=> (ac= accumulate_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1234:14: ( ( accumulate_statement ) )=> (ac= accumulate_statement )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1240:14: (ac= accumulate_statement )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1240:15: ac= accumulate_statement
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1234:14: (ac= accumulate_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1234:15: ac= accumulate_statement
{
- pushFollow(FOLLOW_accumulate_statement_in_lhs_unary3250);
+ pushFollow(FOLLOW_accumulate_statement_in_lhs_unary3241);
ac=accumulate_statement();
_fsp--;
if (failed) return d;
@@ -4474,12 +4406,12 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1241:14: ( ( collect_statement ) )=> (cs= collect_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:14: ( ( collect_statement ) )=> (cs= collect_statement )
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1241:14: (cs= collect_statement )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1241:15: cs= collect_statement
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:14: (cs= collect_statement )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:15: cs= collect_statement
{
- pushFollow(FOLLOW_collect_statement_in_lhs_unary3271);
+ pushFollow(FOLLOW_collect_statement_in_lhs_unary3262);
cs=collect_statement();
_fsp--;
if (failed) return d;
@@ -4499,9 +4431,9 @@
}
break;
case 5 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1243:5: ( lhs_forall )=>u= lhs_forall
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1237:5: ( lhs_forall )=>u= lhs_forall
{
- pushFollow(FOLLOW_lhs_forall_in_lhs_unary3296);
+ pushFollow(FOLLOW_lhs_forall_in_lhs_unary3287);
u=lhs_forall();
_fsp--;
if (failed) return d;
@@ -4509,14 +4441,14 @@
}
break;
case 6 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1244:5: '(' u= lhs ')'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1238:5: '(' u= lhs ')'
{
- match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary3304); if (failed) return d;
- pushFollow(FOLLOW_lhs_in_lhs_unary3308);
+ match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary3295); if (failed) return d;
+ pushFollow(FOLLOW_lhs_in_lhs_unary3299);
u=lhs();
_fsp--;
if (failed) return d;
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary3310); if (failed) return d;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary3301); if (failed) return d;
}
break;
@@ -4526,7 +4458,7 @@
if ( backtracking==0 ) {
d = u;
}
- pushFollow(FOLLOW_opt_semicolon_in_lhs_unary3320);
+ pushFollow(FOLLOW_opt_semicolon_in_lhs_unary3311);
opt_semicolon();
_fsp--;
if (failed) return d;
@@ -4546,7 +4478,7 @@
// $ANTLR start lhs_exist
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1249:1: lhs_exist returns [BaseDescr d] : loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1243:1: lhs_exist returns [BaseDescr d] : loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) ;
public BaseDescr lhs_exist() throws RecognitionException {
BaseDescr d = null;
@@ -4558,12 +4490,12 @@
d = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1253:4: (loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1253:4: loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1247:4: (loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1247:4: loc= 'exists' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
{
loc=(Token)input.LT(1);
- match(input,73,FOLLOW_73_in_lhs_exist3344); if (failed) return d;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1253:17: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
+ match(input,73,FOLLOW_73_in_lhs_exist3335); if (failed) return d;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1247:17: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
int alt46=2;
int LA46_0 = input.LA(1);
if ( (LA46_0==LEFT_PAREN) ) {
@@ -4575,27 +4507,27 @@
else {
if (backtracking>0) {failed=true; return d;}
NoViableAltException nvae =
- new NoViableAltException("1253:17: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )", 46, 0, input);
+ new NoViableAltException("1247:17: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )", 46, 0, input);
throw nvae;
}
switch (alt46) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1253:18: ( '(' lhs_or ')' )=> '(' column= lhs_or ')'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1247:18: ( '(' lhs_or ')' )=> '(' column= lhs_or ')'
{
- match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist3347); if (failed) return d;
- pushFollow(FOLLOW_lhs_or_in_lhs_exist3351);
+ match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist3338); if (failed) return d;
+ pushFollow(FOLLOW_lhs_or_in_lhs_exist3342);
column=lhs_or();
_fsp--;
if (failed) return d;
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist3353); if (failed) return d;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist3344); if (failed) return d;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1253:42: column= lhs_column
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1247:42: column= lhs_column
{
- pushFollow(FOLLOW_lhs_column_in_lhs_exist3359);
+ pushFollow(FOLLOW_lhs_column_in_lhs_exist3350);
column=lhs_column();
_fsp--;
if (failed) return d;
@@ -4627,7 +4559,7 @@
// $ANTLR start lhs_not
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1260:1: lhs_not returns [NotDescr d] : loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1254:1: lhs_not returns [NotDescr d] : loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) ;
public NotDescr lhs_not() throws RecognitionException {
NotDescr d = null;
@@ -4639,12 +4571,12 @@
d = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:4: (loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:4: loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:4: (loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column ) )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:4: loc= 'not' ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
{
loc=(Token)input.LT(1);
- match(input,74,FOLLOW_74_in_lhs_not3389); if (failed) return d;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:14: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
+ match(input,74,FOLLOW_74_in_lhs_not3380); if (failed) return d;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:14: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )
int alt47=2;
int LA47_0 = input.LA(1);
if ( (LA47_0==LEFT_PAREN) ) {
@@ -4656,27 +4588,27 @@
else {
if (backtracking>0) {failed=true; return d;}
NoViableAltException nvae =
- new NoViableAltException("1264:14: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )", 47, 0, input);
+ new NoViableAltException("1258:14: ( ( '(' lhs_or ')' )=> '(' column= lhs_or ')' | column= lhs_column )", 47, 0, input);
throw nvae;
}
switch (alt47) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:15: ( '(' lhs_or ')' )=> '(' column= lhs_or ')'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:15: ( '(' lhs_or ')' )=> '(' column= lhs_or ')'
{
- match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not3392); if (failed) return d;
- pushFollow(FOLLOW_lhs_or_in_lhs_not3396);
+ match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not3383); if (failed) return d;
+ pushFollow(FOLLOW_lhs_or_in_lhs_not3387);
column=lhs_or();
_fsp--;
if (failed) return d;
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not3399); if (failed) return d;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not3390); if (failed) return d;
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1264:40: column= lhs_column
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:40: column= lhs_column
{
- pushFollow(FOLLOW_lhs_column_in_lhs_not3405);
+ pushFollow(FOLLOW_lhs_column_in_lhs_not3396);
column=lhs_column();
_fsp--;
if (failed) return d;
@@ -4708,7 +4640,7 @@
// $ANTLR start lhs_eval
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1271:1: lhs_eval returns [BaseDescr d] : loc= 'eval' c= paren_chunk ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1265:1: lhs_eval returns [BaseDescr d] : loc= 'eval' c= paren_chunk ;
public BaseDescr lhs_eval() throws RecognitionException {
BaseDescr d = null;
@@ -4720,12 +4652,12 @@
d = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1275:4: (loc= 'eval' c= paren_chunk )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1275:4: loc= 'eval' c= paren_chunk
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1269:4: (loc= 'eval' c= paren_chunk )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1269:4: loc= 'eval' c= paren_chunk
{
loc=(Token)input.LT(1);
- match(input,75,FOLLOW_75_in_lhs_eval3433); if (failed) return d;
- pushFollow(FOLLOW_paren_chunk_in_lhs_eval3437);
+ match(input,75,FOLLOW_75_in_lhs_eval3424); if (failed) return d;
+ pushFollow(FOLLOW_paren_chunk_in_lhs_eval3428);
c=paren_chunk();
_fsp--;
if (failed) return d;
@@ -4752,7 +4684,7 @@
// $ANTLR start lhs_forall
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1283:1: lhs_forall returns [ForallDescr d] : loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')' ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1277:1: lhs_forall returns [ForallDescr d] : loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')' ;
public ForallDescr lhs_forall() throws RecognitionException {
ForallDescr d = null;
@@ -4766,13 +4698,13 @@
d = factory.createForall();
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:4: (loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')' )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:4: loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1281:4: (loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')' )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1281:4: loc= 'forall' '(' base= lhs_column ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+ ')'
{
loc=(Token)input.LT(1);
- match(input,76,FOLLOW_76_in_lhs_forall3465); if (failed) return d;
- match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall3467); if (failed) return d;
- pushFollow(FOLLOW_lhs_column_in_lhs_forall3471);
+ match(input,76,FOLLOW_76_in_lhs_forall3456); if (failed) return d;
+ match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall3458); if (failed) return d;
+ pushFollow(FOLLOW_lhs_column_in_lhs_forall3462);
base=lhs_column();
_fsp--;
if (failed) return d;
@@ -4783,7 +4715,7 @@
d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1293:3: ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:3: ( ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column )+
int cnt49=0;
loop49:
do {
@@ -4796,9 +4728,9 @@
switch (alt49) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1293:5: ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:5: ( ( ( ',' )=> ',' )? lhs_column )=> ( ( ',' )=> ',' )? column= lhs_column
{
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1293:5: ( ( ',' )=> ',' )?
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:5: ( ( ',' )=> ',' )?
int alt48=2;
int LA48_0 = input.LA(1);
if ( (LA48_0==36) ) {
@@ -4806,16 +4738,16 @@
}
switch (alt48) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1293:6: ( ',' )=> ','
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1287:6: ( ',' )=> ','
{
- match(input,36,FOLLOW_36_in_lhs_forall3485); if (failed) return d;
+ match(input,36,FOLLOW_36_in_lhs_forall3476); if (failed) return d;
}
break;
}
- pushFollow(FOLLOW_lhs_column_in_lhs_forall3491);
+ pushFollow(FOLLOW_lhs_column_in_lhs_forall3482);
column=lhs_column();
_fsp--;
if (failed) return d;
@@ -4839,7 +4771,7 @@
cnt49++;
} while (true);
- match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall3504); if (failed) return d;
+ match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall3495); if (failed) return d;
}
@@ -4856,7 +4788,7 @@
// $ANTLR start dotted_name
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1302:1: dotted_name returns [String name] : id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )* ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1296:1: dotted_name returns [String name] : id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )* ;
public String dotted_name() throws RecognitionException {
String name = null;
@@ -4866,15 +4798,15 @@
name = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:3: (id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:3: id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:3: (id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:3: id= ID ( ( '.' ID )=> '.' id= ID )* ( ( '[' ']' )=> '[' ']' )*
{
id=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_dotted_name3530); if (failed) return name;
+ match(input,ID,FOLLOW_ID_in_dotted_name3521); if (failed) return name;
if ( backtracking==0 ) {
name=id.getText();
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:32: ( ( '.' ID )=> '.' id= ID )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:32: ( ( '.' ID )=> '.' id= ID )*
loop50:
do {
int alt50=2;
@@ -4886,11 +4818,11 @@
switch (alt50) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:34: ( '.' ID )=> '.' id= ID
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:34: ( '.' ID )=> '.' id= ID
{
- match(input,33,FOLLOW_33_in_dotted_name3536); if (failed) return name;
+ match(input,33,FOLLOW_33_in_dotted_name3527); if (failed) return name;
id=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_dotted_name3540); if (failed) return name;
+ match(input,ID,FOLLOW_ID_in_dotted_name3531); if (failed) return name;
if ( backtracking==0 ) {
name = name + "." + id.getText();
}
@@ -4903,7 +4835,7 @@
}
} while (true);
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:85: ( ( '[' ']' )=> '[' ']' )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:85: ( ( '[' ']' )=> '[' ']' )*
loop51:
do {
int alt51=2;
@@ -4915,10 +4847,10 @@
switch (alt51) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1307:87: ( '[' ']' )=> '[' ']'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1301:87: ( '[' ']' )=> '[' ']'
{
- match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name3549); if (failed) return name;
- match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name3551); if (failed) return name;
+ match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name3540); if (failed) return name;
+ match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name3542); if (failed) return name;
if ( backtracking==0 ) {
name = name + "[]";
}
@@ -4947,7 +4879,7 @@
// $ANTLR start argument
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1310:1: argument returns [String name] : id= ID ( ( '[' ']' )=> '[' ']' )* ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1304:1: argument returns [String name] : id= ID ( ( '[' ']' )=> '[' ']' )* ;
public String argument() throws RecognitionException {
String name = null;
@@ -4957,15 +4889,15 @@
name = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1315:3: (id= ID ( ( '[' ']' )=> '[' ']' )* )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1315:3: id= ID ( ( '[' ']' )=> '[' ']' )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1309:3: (id= ID ( ( '[' ']' )=> '[' ']' )* )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1309:3: id= ID ( ( '[' ']' )=> '[' ']' )*
{
id=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_argument3581); if (failed) return name;
+ match(input,ID,FOLLOW_ID_in_argument3572); if (failed) return name;
if ( backtracking==0 ) {
name=id.getText();
}
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1315:32: ( ( '[' ']' )=> '[' ']' )*
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1309:32: ( ( '[' ']' )=> '[' ']' )*
loop52:
do {
int alt52=2;
@@ -4977,10 +4909,10 @@
switch (alt52) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1315:34: ( '[' ']' )=> '[' ']'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1309:34: ( '[' ']' )=> '[' ']'
{
- match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument3587); if (failed) return name;
- match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument3589); if (failed) return name;
+ match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument3578); if (failed) return name;
+ match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument3580); if (failed) return name;
if ( backtracking==0 ) {
name = name + "[]";
}
@@ -5009,7 +4941,7 @@
// $ANTLR start rhs_chunk
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1318:1: rhs_chunk[RuleDescr rule] : start= 'then' ( (~ END )=>~ END )* loc= END ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1312:1: rhs_chunk[RuleDescr rule] : start= 'then' ( (~ END )=>~ END )* loc= END ;
public void rhs_chunk(RuleDescr rule) throws RecognitionException {
Token start=null;
Token loc=null;
@@ -5019,8 +4951,8 @@
Integer channel = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1324:10: (start= 'then' ( (~ END )=>~ END )* loc= END )
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1324:10: start= 'then' ( (~ END )=>~ END )* loc= END
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1318:10: (start= 'then' ( (~ END )=>~ END )* loc= END )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1318:10: start= 'then' ( (~ END )=>~ END )* loc= END
{
if ( backtracking==0 ) {
@@ -5030,8 +4962,8 @@
}
start=(Token)input.LT(1);
- match(input,THEN,FOLLOW_THEN_in_rhs_chunk3633); if (failed) return ;
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1330:3: ( (~ END )=>~ END )*
+ match(input,THEN,FOLLOW_THEN_in_rhs_chunk3624); if (failed) return ;
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1324:3: ( (~ END )=>~ END )*
loop53:
do {
int alt53=2;
@@ -5043,7 +4975,7 @@
switch (alt53) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1331:6: (~ END )=>~ END
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1325:6: (~ END )=>~ END
{
if ( (input.LA(1)>=ID && input.LA(1)<=RIGHT_SQUARE)||(input.LA(1)>=THEN && input.LA(1)<=77) ) {
input.consume();
@@ -5053,7 +4985,7 @@
if (backtracking>0) {failed=true; return ;}
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk3645); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk3636); throw mse;
}
if ( backtracking==0 ) {
@@ -5080,7 +5012,7 @@
}
loc=(Token)input.LT(1);
- match(input,END,FOLLOW_END_in_rhs_chunk3682); if (failed) return ;
+ match(input,END,FOLLOW_END_in_rhs_chunk3673); if (failed) return ;
if ( backtracking==0 ) {
// ignoring first line in the consequence
@@ -5114,7 +5046,7 @@
// $ANTLR start word
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1362:1: word returns [String word] : ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING );
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1356:1: word returns [String word] : ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING );
public String word() throws RecognitionException {
String word = null;
@@ -5125,7 +5057,7 @@
word = null;
try {
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1366:4: ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING )
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1360:4: ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING )
int alt54=11;
switch ( input.LA(1) ) {
case ID:
@@ -5164,17 +5096,17 @@
default:
if (backtracking>0) {failed=true; return word;}
NoViableAltException nvae =
- new NoViableAltException("1362:1: word returns [String word] : ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING );", 54, 0, input);
+ new NoViableAltException("1356:1: word returns [String word] : ( ( ID )=>id= ID | ( 'import' )=> 'import' | ( 'use' )=> 'use' | ( RULE )=> RULE | ( 'query' )=> 'query' | ( 'salience' )=> 'salience' | ( 'no-loop' )=> 'no-loop' | ( WHEN )=> WHEN | ( THEN )=> THEN | ( END )=> END | str= STRING );", 54, 0, input);
throw nvae;
}
switch (alt54) {
case 1 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1366:4: ( ID )=>id= ID
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1360:4: ( ID )=>id= ID
{
id=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_word3724); if (failed) return word;
+ match(input,ID,FOLLOW_ID_in_word3715); if (failed) return word;
if ( backtracking==0 ) {
word=id.getText();
}
@@ -5182,9 +5114,9 @@
}
break;
case 2 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1367:4: ( 'import' )=> 'import'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1361:4: ( 'import' )=> 'import'
{
- match(input,31,FOLLOW_31_in_word3736); if (failed) return word;
+ match(input,31,FOLLOW_31_in_word3727); if (failed) return word;
if ( backtracking==0 ) {
word="import";
}
@@ -5192,9 +5124,9 @@
}
break;
case 3 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1368:4: ( 'use' )=> 'use'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1362:4: ( 'use' )=> 'use'
{
- match(input,77,FOLLOW_77_in_word3745); if (failed) return word;
+ match(input,77,FOLLOW_77_in_word3736); if (failed) return word;
if ( backtracking==0 ) {
word="use";
}
@@ -5202,9 +5134,9 @@
}
break;
case 4 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1369:4: ( RULE )=> RULE
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1363:4: ( RULE )=> RULE
{
- match(input,RULE,FOLLOW_RULE_in_word3757); if (failed) return word;
+ match(input,RULE,FOLLOW_RULE_in_word3748); if (failed) return word;
if ( backtracking==0 ) {
word="rule";
}
@@ -5212,9 +5144,9 @@
}
break;
case 5 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1370:4: ( 'query' )=> 'query'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1364:4: ( 'query' )=> 'query'
{
- match(input,37,FOLLOW_37_in_word3770); if (failed) return word;
+ match(input,37,FOLLOW_37_in_word3761); if (failed) return word;
if ( backtracking==0 ) {
word="query";
}
@@ -5222,9 +5154,9 @@
}
break;
case 6 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1371:4: ( 'salience' )=> 'salience'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1365:4: ( 'salience' )=> 'salience'
{
- match(input,44,FOLLOW_44_in_word3780); if (failed) return word;
+ match(input,44,FOLLOW_44_in_word3771); if (failed) return word;
if ( backtracking==0 ) {
word="salience";
}
@@ -5232,9 +5164,9 @@
}
break;
case 7 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1372:5: ( 'no-loop' )=> 'no-loop'
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1366:5: ( 'no-loop' )=> 'no-loop'
{
- match(input,45,FOLLOW_45_in_word3788); if (failed) return word;
+ match(input,45,FOLLOW_45_in_word3779); if (failed) return word;
if ( backtracking==0 ) {
word="no-loop";
}
@@ -5242,9 +5174,9 @@
}
break;
case 8 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1373:4: ( WHEN )=> WHEN
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1367:4: ( WHEN )=> WHEN
{
- match(input,WHEN,FOLLOW_WHEN_in_word3796); if (failed) return word;
+ match(input,WHEN,FOLLOW_WHEN_in_word3787); if (failed) return word;
if ( backtracking==0 ) {
word="when";
}
@@ -5252,9 +5184,9 @@
}
break;
case 9 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1374:4: ( THEN )=> THEN
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1368:4: ( THEN )=> THEN
{
- match(input,THEN,FOLLOW_THEN_in_word3809); if (failed) return word;
+ match(input,THEN,FOLLOW_THEN_in_word3800); if (failed) return word;
if ( backtracking==0 ) {
word="then";
}
@@ -5262,9 +5194,9 @@
}
break;
case 10 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1375:4: ( END )=> END
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1369:4: ( END )=> END
{
- match(input,END,FOLLOW_END_in_word3822); if (failed) return word;
+ match(input,END,FOLLOW_END_in_word3813); if (failed) return word;
if ( backtracking==0 ) {
word="end";
}
@@ -5272,10 +5204,10 @@
}
break;
case 11 :
- // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1376:4: str= STRING
+ // D:\\workspace\\jboss\\jbossrules\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1370:4: str= STRING
{
str=(Token)input.LT(1);
- match(input,STRING,FOLLOW_STRING_in_word3838); if (failed) return word;
+ match(input,STRING,FOLLOW_STRING_in_word3829); if (failed) return word;
if ( backtracking==0 ) {
word=getString(str);
}
@@ -5364,20 +5296,20 @@
public static final String DFA8_eofS =
"\6\uffff";
public static final String DFA8_minS =
- "\2\4\1\20\2\uffff\1\4";
+ "\2\4\1\uffff\1\20\1\uffff\1\4";
public static final String DFA8_maxS =
- "\1\4\1\44\1\20\2\uffff\1\44";
+ "\1\4\1\44\1\uffff\1\20\1\uffff\1\44";
public static final String DFA8_acceptS =
- "\3\uffff\1\2\1\1\1\uffff";
+ "\2\uffff\1\1\1\uffff\1\2\1\uffff";
public static final String DFA8_specialS =
"\6\uffff}>";
public static final String[] DFA8_transition = {
"\1\1",
- "\1\4\6\uffff\1\3\3\uffff\1\2\21\uffff\1\4\2\uffff\1\3",
+ "\1\2\6\uffff\1\4\3\uffff\1\3\21\uffff\1\2\2\uffff\1\4",
+ "",
"\1\5",
"",
- "",
- "\1\4\6\uffff\1\3\3\uffff\1\2\24\uffff\1\3"
+ "\1\2\6\uffff\1\4\3\uffff\1\3\24\uffff\1\4"
};
class DFA8 extends DFA {
@@ -5592,109 +5524,107 @@
public static final BitSet FOLLOW_set_in_fact_expression_in_paren2027 = new BitSet(new long[]{0x0000000000000010L});
public static final BitSet FOLLOW_fact_in_fact_expression_in_paren2044 = new BitSet(new long[]{0x0300000000000002L});
public static final BitSet FOLLOW_dotted_name_in_fact2083 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_fact2096 = new BitSet(new long[]{0x0000000000000810L});
- public static final BitSet FOLLOW_constraints_in_fact2108 = new BitSet(new long[]{0x0000000000000800L});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2129 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_constraint_in_constraints2159 = new BitSet(new long[]{0x0000001000000002L});
- public static final BitSet FOLLOW_predicate_in_constraints2162 = new BitSet(new long[]{0x0000001000000002L});
- public static final BitSet FOLLOW_36_in_constraints2170 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_constraint_in_constraints2173 = new BitSet(new long[]{0x0000001000000002L});
- public static final BitSet FOLLOW_predicate_in_constraints2176 = new BitSet(new long[]{0x0000001000000002L});
- public static final BitSet FOLLOW_ID_in_constraint2205 = new BitSet(new long[]{0x0000008000000000L});
- public static final BitSet FOLLOW_39_in_constraint2207 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ID_in_constraint2228 = new BitSet(new long[]{0xF000000000000002L,0x000000000000001FL});
- public static final BitSet FOLLOW_constraint_expression_in_constraint2244 = new BitSet(new long[]{0x0C00000000000002L});
- public static final BitSet FOLLOW_set_in_constraint2263 = new BitSet(new long[]{0xF000000000000000L,0x000000000000001FL});
- public static final BitSet FOLLOW_constraint_expression_in_constraint2280 = new BitSet(new long[]{0x0C00000000000002L});
- public static final BitSet FOLLOW_set_in_constraint_expression2332 = new BitSet(new long[]{0x0000000000001790L,0x0000000000000020L});
- public static final BitSet FOLLOW_ID_in_constraint_expression2399 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_enum_constraint_in_constraint_expression2415 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_literal_constraint_in_constraint_expression2438 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_retval_constraint_in_constraint_expression2452 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_STRING_in_literal_constraint2491 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_INT_in_literal_constraint2502 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_FLOAT_in_literal_constraint2515 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_BOOL_in_literal_constraint2526 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_69_in_literal_constraint2538 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ID_in_enum_constraint2569 = new BitSet(new long[]{0x0000000200000000L});
- public static final BitSet FOLLOW_33_in_enum_constraint2571 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ID_in_enum_constraint2575 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ID_in_predicate2597 = new BitSet(new long[]{0x0000008000000000L});
- public static final BitSet FOLLOW_39_in_predicate2599 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ID_in_predicate2603 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
- public static final BitSet FOLLOW_70_in_predicate2605 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_paren_chunk_in_predicate2609 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk2656 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_set_in_paren_chunk2672 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_paren_chunk_in_paren_chunk2696 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk2732 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk2782 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_set_in_curly_chunk2798 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_curly_chunk_in_curly_chunk2822 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk2858 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk2919 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_set_in_square_chunk2935 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_square_chunk_in_square_chunk2959 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk2995 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3040 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_lhs_and_in_lhs_or3073 = new BitSet(new long[]{0x0300000000000002L});
- public static final BitSet FOLLOW_set_in_lhs_or3082 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
- public static final BitSet FOLLOW_lhs_and_in_lhs_or3092 = new BitSet(new long[]{0x0300000000000002L});
- public static final BitSet FOLLOW_lhs_unary_in_lhs_and3128 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
- public static final BitSet FOLLOW_set_in_lhs_and3137 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
- public static final BitSet FOLLOW_lhs_unary_in_lhs_and3147 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
- public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3184 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_lhs_not_in_lhs_unary3192 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3200 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_lhs_column_in_lhs_unary3208 = new BitSet(new long[]{0x0004000020000002L});
- public static final BitSet FOLLOW_from_statement_in_lhs_unary3228 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary3250 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_collect_statement_in_lhs_unary3271 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_lhs_forall_in_lhs_unary3296 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary3304 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
- public static final BitSet FOLLOW_lhs_in_lhs_unary3308 = new BitSet(new long[]{0x0000000000000800L});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary3310 = new BitSet(new long[]{0x0000000020000002L});
- public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary3320 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_73_in_lhs_exist3344 = new BitSet(new long[]{0x0000000000000410L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist3347 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
- public static final BitSet FOLLOW_lhs_or_in_lhs_exist3351 = new BitSet(new long[]{0x0000000000000800L});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist3353 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_lhs_column_in_lhs_exist3359 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_74_in_lhs_not3389 = new BitSet(new long[]{0x0000000000000410L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not3392 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
- public static final BitSet FOLLOW_lhs_or_in_lhs_not3396 = new BitSet(new long[]{0x0000000000000800L});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not3399 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_lhs_column_in_lhs_not3405 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_75_in_lhs_eval3433 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_paren_chunk_in_lhs_eval3437 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_76_in_lhs_forall3465 = new BitSet(new long[]{0x0000000000000400L});
- public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall3467 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_lhs_column_in_lhs_forall3471 = new BitSet(new long[]{0x0000001000000010L});
- public static final BitSet FOLLOW_36_in_lhs_forall3485 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_lhs_column_in_lhs_forall3491 = new BitSet(new long[]{0x0000001000000810L});
- public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall3504 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ID_in_dotted_name3530 = new BitSet(new long[]{0x0000000200008002L});
- public static final BitSet FOLLOW_33_in_dotted_name3536 = new BitSet(new long[]{0x0000000000000010L});
- public static final BitSet FOLLOW_ID_in_dotted_name3540 = new BitSet(new long[]{0x0000000200008002L});
- public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name3549 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name3551 = new BitSet(new long[]{0x0000000000008002L});
- public static final BitSet FOLLOW_ID_in_argument3581 = new BitSet(new long[]{0x0000000000008002L});
- public static final BitSet FOLLOW_LEFT_SQUARE_in_argument3587 = new BitSet(new long[]{0x0000000000010000L});
- public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument3589 = new BitSet(new long[]{0x0000000000008002L});
- public static final BitSet FOLLOW_THEN_in_rhs_chunk3633 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_set_in_rhs_chunk3645 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
- public static final BitSet FOLLOW_END_in_rhs_chunk3682 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ID_in_word3724 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_31_in_word3736 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_77_in_word3745 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_RULE_in_word3757 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_37_in_word3770 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_44_in_word3780 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_45_in_word3788 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_WHEN_in_word3796 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_THEN_in_word3809 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_END_in_word3822 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_STRING_in_word3838 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_fact2096 = new BitSet(new long[]{0x0000000000000C10L});
+ public static final BitSet FOLLOW_constraints_in_fact2106 = new BitSet(new long[]{0x0000000000000800L});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2119 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_constraint_in_constraints2140 = new BitSet(new long[]{0x0000001000000002L});
+ public static final BitSet FOLLOW_predicate_in_constraints2143 = new BitSet(new long[]{0x0000001000000002L});
+ public static final BitSet FOLLOW_36_in_constraints2151 = new BitSet(new long[]{0x0000000000000410L});
+ public static final BitSet FOLLOW_constraint_in_constraints2154 = new BitSet(new long[]{0x0000001000000002L});
+ public static final BitSet FOLLOW_predicate_in_constraints2157 = new BitSet(new long[]{0x0000001000000002L});
+ public static final BitSet FOLLOW_ID_in_constraint2186 = new BitSet(new long[]{0x0000008000000000L});
+ public static final BitSet FOLLOW_39_in_constraint2188 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ID_in_constraint2209 = new BitSet(new long[]{0xF000000000000002L,0x000000000000003FL});
+ public static final BitSet FOLLOW_constraint_expression_in_constraint2227 = new BitSet(new long[]{0x0C00000000000002L});
+ public static final BitSet FOLLOW_set_in_constraint2249 = new BitSet(new long[]{0xE000000000000000L,0x000000000000003FL});
+ public static final BitSet FOLLOW_constraint_expression_in_constraint2268 = new BitSet(new long[]{0x0C00000000000002L});
+ public static final BitSet FOLLOW_60_in_constraint2296 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_predicate_in_constraint2298 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_set_in_constraint_expression2335 = new BitSet(new long[]{0x0000000000001790L,0x0000000000000040L});
+ public static final BitSet FOLLOW_ID_in_constraint_expression2402 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_enum_constraint_in_constraint_expression2418 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_literal_constraint_in_constraint_expression2441 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_retval_constraint_in_constraint_expression2455 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_STRING_in_literal_constraint2494 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_INT_in_literal_constraint2505 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_FLOAT_in_literal_constraint2518 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_BOOL_in_literal_constraint2529 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_70_in_literal_constraint2541 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ID_in_enum_constraint2572 = new BitSet(new long[]{0x0000000200000000L});
+ public static final BitSet FOLLOW_33_in_enum_constraint2574 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ID_in_enum_constraint2578 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_paren_chunk_in_predicate2600 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk2647 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_set_in_paren_chunk2663 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_paren_chunk_in_paren_chunk2687 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk2723 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk2773 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_set_in_curly_chunk2789 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_curly_chunk_in_curly_chunk2813 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk2849 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk2910 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_set_in_square_chunk2926 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_square_chunk_in_square_chunk2950 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk2986 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3031 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_lhs_and_in_lhs_or3064 = new BitSet(new long[]{0x0300000000000002L});
+ public static final BitSet FOLLOW_set_in_lhs_or3073 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
+ public static final BitSet FOLLOW_lhs_and_in_lhs_or3083 = new BitSet(new long[]{0x0300000000000002L});
+ public static final BitSet FOLLOW_lhs_unary_in_lhs_and3119 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
+ public static final BitSet FOLLOW_set_in_lhs_and3128 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
+ public static final BitSet FOLLOW_lhs_unary_in_lhs_and3138 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
+ public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3175 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_lhs_not_in_lhs_unary3183 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3191 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_lhs_column_in_lhs_unary3199 = new BitSet(new long[]{0x0004000020000002L});
+ public static final BitSet FOLLOW_from_statement_in_lhs_unary3219 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary3241 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_collect_statement_in_lhs_unary3262 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_lhs_forall_in_lhs_unary3287 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary3295 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
+ public static final BitSet FOLLOW_lhs_in_lhs_unary3299 = new BitSet(new long[]{0x0000000000000800L});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary3301 = new BitSet(new long[]{0x0000000020000002L});
+ public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary3311 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_73_in_lhs_exist3335 = new BitSet(new long[]{0x0000000000000410L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist3338 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
+ public static final BitSet FOLLOW_lhs_or_in_lhs_exist3342 = new BitSet(new long[]{0x0000000000000800L});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist3344 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_lhs_column_in_lhs_exist3350 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_74_in_lhs_not3380 = new BitSet(new long[]{0x0000000000000410L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not3383 = new BitSet(new long[]{0x0000000000000410L,0x0000000000001E00L});
+ public static final BitSet FOLLOW_lhs_or_in_lhs_not3387 = new BitSet(new long[]{0x0000000000000800L});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not3390 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_lhs_column_in_lhs_not3396 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_75_in_lhs_eval3424 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_paren_chunk_in_lhs_eval3428 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_76_in_lhs_forall3456 = new BitSet(new long[]{0x0000000000000400L});
+ public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall3458 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_lhs_column_in_lhs_forall3462 = new BitSet(new long[]{0x0000001000000010L});
+ public static final BitSet FOLLOW_36_in_lhs_forall3476 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_lhs_column_in_lhs_forall3482 = new BitSet(new long[]{0x0000001000000810L});
+ public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall3495 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ID_in_dotted_name3521 = new BitSet(new long[]{0x0000000200008002L});
+ public static final BitSet FOLLOW_33_in_dotted_name3527 = new BitSet(new long[]{0x0000000000000010L});
+ public static final BitSet FOLLOW_ID_in_dotted_name3531 = new BitSet(new long[]{0x0000000200008002L});
+ public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name3540 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name3542 = new BitSet(new long[]{0x0000000000008002L});
+ public static final BitSet FOLLOW_ID_in_argument3572 = new BitSet(new long[]{0x0000000000008002L});
+ public static final BitSet FOLLOW_LEFT_SQUARE_in_argument3578 = new BitSet(new long[]{0x0000000000010000L});
+ public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument3580 = new BitSet(new long[]{0x0000000000008002L});
+ public static final BitSet FOLLOW_THEN_in_rhs_chunk3624 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_set_in_rhs_chunk3636 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000003FFFL});
+ public static final BitSet FOLLOW_END_in_rhs_chunk3673 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ID_in_word3715 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_31_in_word3727 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_77_in_word3736 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_RULE_in_word3748 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_37_in_word3761 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_44_in_word3771 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_45_in_word3779 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_WHEN_in_word3787 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_THEN_in_word3800 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_END_in_word3813 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_STRING_in_word3829 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ID_in_synpred351529 = new BitSet(new long[]{0x0000000000000400L});
public static final BitSet FOLLOW_paren_chunk_in_synpred351533 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_LEFT_PAREN_in_synpred381674 = new BitSet(new long[]{0x0000000000000002L});
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -127,7 +127,7 @@
public void visitFieldBindingDescr(final FieldBindingDescr descr) {
this.template = new String();
- this.template = descr.getIdentifier() + " : ";
+ this.template = descr.getIdentifier() + " : " + descr.getFieldName();
}
public void visitFunctionDescr(final FunctionDescr functionDescr) {
@@ -202,7 +202,7 @@
public void visitPredicateDescr(final PredicateDescr descr) {
this.template = new String();
- this.template = descr.getDeclaration() + ":" + descr.getFieldName() + " -> ( " + descr.getText() + " )";
+ this.template = "( " + descr.getText() + " )";
}
@@ -271,10 +271,7 @@
final Object temp = iterator.next();
visit( temp );
descrString += this.template;
- if ( !(temp instanceof FieldBindingDescr) ) {
- descrString += " , ";
- }
-
+ descrString += " , ";
}
return descrString.substring( 0,
descrString.length() - 2 );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -21,32 +21,38 @@
*
*/
private static final long serialVersionUID = 320;
- private final String fieldName;
+ //private final String fieldName;
private String text;
- private final String declaration;
+ //private final String declaration;
private String[] declarations;
private String classMethodName;
- public PredicateDescr(final String fieldName,
- final String declaration) {
- this.fieldName = fieldName;
- this.declaration = declaration;
- }
-
- public PredicateDescr(final String fieldName,
- final String declaration,
- final String text) {
- this.fieldName = fieldName;
- this.declaration = declaration;
+// public PredicateDescr(final String fieldName,
+// final String declaration) {
+// this.fieldName = fieldName;
+// this.declaration = declaration;
+// }
+//
+// public PredicateDescr(final String fieldName,
+// final String declaration,
+// final String text) {
+// this.fieldName = fieldName;
+// this.declaration = declaration;
+// this.text = text;
+// }
+ public PredicateDescr( final String text ) {
this.text = text;
}
- public String getFieldName() {
- return this.fieldName;
+ public PredicateDescr( ) {
}
+// public String getFieldName() {
+// return this.fieldName;
+// }
+
public String getClassMethodName() {
return this.classMethodName;
}
@@ -63,9 +69,9 @@
this.text = text;
}
- public String getDeclaration() {
- return this.declaration;
- }
+// public String getDeclaration() {
+// return this.declaration;
+// }
public void setDeclarations(final String[] declarations) {
this.declarations = declarations;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -223,7 +223,7 @@
} else if ( name.equals( "agenda-group" ) ) {
rule.setAgendaGroup( attributeDescr.getValue() );
} else if ( name.equals( "activation-group" ) ) {
- rule.setXorGroup( attributeDescr.getValue() );
+ rule.setActivationGroup( attributeDescr.getValue() );
} else if ( name.equals( "duration" ) ) {
rule.setDuration( Long.parseLong( attributeDescr.getValue() ) );
rule.setAgendaGroup( "" );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/ColumnBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/ColumnBuilder.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/builder/ColumnBuilder.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -351,23 +351,9 @@
final String className = "predicate" + context.getNextId();
predicateDescr.setClassMethodName( className );
- final FieldExtractor extractor = getFieldExtractor( context,
- utils,
- predicateDescr,
- column.getObjectType(),
- predicateDescr.getFieldName() );
- if ( extractor == null ) {
- return;
- }
-
- final Declaration declaration = column.addDeclaration( predicateDescr.getDeclaration(),
- extractor );
-
final List[] usedIdentifiers = utils.getUsedIdentifiers( context,
predicateDescr,
predicateDescr.getText() );
- // Don't include the focus declaration, that hasn't been merged into the tuple yet.
- usedIdentifiers[0].remove( predicateDescr.getDeclaration() );
final List tupleDeclarations = new ArrayList();
final List factDeclarations = new ArrayList();
@@ -382,20 +368,12 @@
Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
Declaration[] localDeclarations = (Declaration[]) factDeclarations.toArray( new Declaration[factDeclarations.size()] );
- final PredicateConstraint predicateConstraint = new PredicateConstraint( declaration,
- previousDeclarations,
+ final PredicateConstraint predicateConstraint = new PredicateConstraint( previousDeclarations,
localDeclarations );
column.addConstraint( predicateConstraint );
StringTemplate st = utils.getRuleGroup().getInstanceOf( "predicateMethod" );
- st.setAttribute( "declaration",
- declaration );
-
- st.setAttribute( "declarationType",
- declaration.getExtractor().getExtractToClass().getName().replace( '$',
- '.' ) );
-
utils.setStringTemplateAttributes( context,
st,
previousDeclarations,
@@ -433,12 +411,6 @@
st.setAttribute( "methodName",
className );
- st.setAttribute( "declaration",
- declaration );
- st.setAttribute( "declarationType",
- declaration.getExtractor().getExtractToClass().getName().replace( '$',
- '.' ) );
-
utils.setStringTemplateAttributes( context,
st,
previousDeclarations,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PredicateHandler.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -59,21 +59,8 @@
this.xmlPackageReader.startConfiguration( localName,
attrs );
- final String identifier = attrs.getValue( "identifier" );
- if ( identifier == null || identifier.trim().equals( "" ) ) {
- throw new SAXParseException( "<predicate> requires an 'identifier' attribute",
- this.xmlPackageReader.getLocator() );
- }
+ final PredicateDescr predicateDescr = new PredicateDescr( );
- final String fieldName = attrs.getValue( "field-name" );
- if ( fieldName == null || fieldName.trim().equals( "" ) ) {
- throw new SAXParseException( "<predicate> requires a 'field-name' attribute",
- this.xmlPackageReader.getLocator() );
- }
-
- final PredicateDescr predicateDescr = new PredicateDescr( fieldName,
- identifier );
-
return predicateDescr;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -168,7 +168,7 @@
public void visitPredicateDescr(final PredicateDescr descr) {
this.template = new String();
- this.template = "<predicate field-name=\"" + descr.getFieldName() + "\" identifier=\"" + descr.getDeclaration() + "\" >" + replaceIllegalChars( descr.getText() ) + "</predicate>" + XmlDumper.eol;
+ this.template = "<predicate>" + replaceIllegalChars( descr.getText() ) + "</predicate>" + XmlDumper.eol;
}
public void visitReturnValueRestrictionDescr(final ReturnValueRestrictionDescr descr) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2007-01-24 22:04:03 UTC (rev 9011)
@@ -180,7 +180,8 @@
<xs:element name="field-constraint">
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
- <xs:element ref="drools:connective-restriction"/>
+ <!-- commenting out the bellow ref as it is printing an error -->
+ <!-- xs:element ref="drools:connective-restriction"/ -->
<xs:element ref="drools:literal-restriction"/>
<xs:element ref="drools:variable-restriction"/>
<xs:element ref="drools:return-value-restriction"/>
@@ -224,8 +225,6 @@
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
- <xs:attribute name="field-name" type="xs:string" use="required"/>
- <xs:attribute name="identifier" type="xs:string" use="required"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-01-24 22:04:03 UTC (rev 9011)
@@ -916,13 +916,7 @@
d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
}
- ( c=constraints
- {
- for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
- ((ColumnDescr)d).addDescr( (BaseDescr) cIter.next() );
- }
- }
- )?
+ ( constraints[(ColumnDescr) d] )?
endLoc=RIGHT_PAREN
{
if( endLoc.getType() == RIGHT_PAREN ) {
@@ -933,15 +927,12 @@
;
-constraints returns [List constraints]
- @init {
- constraints = new ArrayList();
- }
- : (constraint[constraints]|predicate[constraints])
- ( ',' (constraint[constraints]|predicate[constraints]))*
+constraints[ColumnDescr column]
+ : (constraint[column]|predicate[column])
+ ( ',' (constraint[column]|predicate[column]))*
;
-constraint[List constraints]
+constraint[ColumnDescr column]
@init {
FieldBindingDescr fbd = null;
FieldConstraintDescr fc = null;
@@ -953,7 +944,7 @@
fbd.setIdentifier( fb.getText() );
fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
- constraints.add( fbd );
+ column.addDescr( fbd );
}
)?
@@ -967,26 +958,29 @@
fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
}
(
- rd=constraint_expression
- {
- fc.addRestriction(rd);
- constraints.add(fc);
- }
- (
- con=('&'|'|')
+ ( rd=constraint_expression
{
- if (con.getText().equals("&") ) {
- fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));
- } else {
- fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));
- }
- }
- rd=constraint_expression
- {
fc.addRestriction(rd);
+ column.addDescr(fc);
}
- )*
- )?
+ (
+ con=('&'|'|')
+ {
+ if (con.getText().equals("&") ) {
+ fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));
+ } else {
+ fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));
+ }
+ }
+ rd=constraint_expression
+ {
+ fc.addRestriction(rd);
+ }
+ )*
+ )
+ |
+ '->' predicate[column]
+ )?
;
constraint_expression returns [RestrictionDescr rd]
@@ -1042,13 +1036,13 @@
;
-predicate[List constraints]
+predicate[ColumnDescr column]
:
- decl=ID ':' field=ID '->' text=paren_chunk
+ text=paren_chunk
{
String body = text.substring(1, text.length()-1);
- PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), body );
- constraints.add( d );
+ PredicateDescr d = new PredicateDescr( body );
+ column.addDescr( d );
}
;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg 2007-01-24 22:04:03 UTC (rev 9011)
@@ -84,7 +84,7 @@
}
>>
-predicateInvoker(package, invokerClassName, ruleClassName, methodName, declaration, declarationType,
+predicateInvoker(package, invokerClassName, ruleClassName, methodName,
declarations, declarationTypes, localDeclarations, localDeclarationTypes, globals, globalTypes, hashCode) ::= <<
package <package>;
@@ -94,19 +94,16 @@
public boolean evaluate(Object object,
org.drools.spi.Tuple tuple,
- org.drools.rule.Declaration declaration,
org.drools.rule.Declaration[] previousDeclarations,
org.drools.rule.Declaration[] localDeclarations,
org.drools.WorkingMemory workingMemory) throws Exception {
- <declarationType> <declaration.identifier> = (<declarationType>) declaration.<declaration.extractor.nativeReadMethod.name>( object );
<declarationTypes, declarations:{ type, declr| <type> <declr.identifier> = ( <type> ) previousDeclarations[<i0>].<declr.extractor.nativeReadMethod.name>( ( (org.drools.common.InternalFactHandle) tuple.get( previousDeclarations[<i0>] ) ).getObject() );<\n>}>
<localDeclarationTypes, localDeclarations:{ type, declr| <type> <declr.identifier> = ( <type> ) localDeclarations[<i0>].<declr.extractor.nativeReadMethod.name>( object );<\n>}>
<globalTypes, globals:{ type, identifier | <type> <identifier> = ( <type> ) workingMemory.getGlobal( "<identifier>" );<\n>}>
return <ruleClassName>.<methodName>(
- <declaration.identifier><if(declarations)>,<endif>
- <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(localDeclarations)>,<endif>
- <localDeclarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)>,<endif>
+ <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(localDeclarations)><if(declarations)>,<endif><endif>
+ <localDeclarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)><if(localDeclarations)>,<endif><if(!localDeclarations)><if(declarations)>,<endif><endif><endif>
<globals:{ identifier | <identifier>}; separator=",\n"> );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg 2007-01-24 22:04:03 UTC (rev 9011)
@@ -8,10 +8,10 @@
}
>>
-predicateMethod(declaration, declarationType, declarations, declarationTypes, localDeclarations, localDeclarationTypes, globals, globalTypes, methodName, text) ::= <<
-public static boolean <methodName>(<declarationType> <declaration.identifier><if(declarations)>,<endif>
- <declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(localDeclarations)>,<endif>
- <localDeclarationTypes, localDeclarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)>,<endif>
+predicateMethod(declarations, declarationTypes, localDeclarations, localDeclarationTypes, globals, globalTypes, methodName, text) ::= <<
+public static boolean <methodName>(
+ <declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(declarations)><if(localDeclarations)>,<endif><endif>
+ <localDeclarationTypes, localDeclarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)><if(localDeclarations)>,<endif><if(!localDeclarations)><if(declarations)>,<endif><endif><endif>
<globalTypes, globals:{ type, identifier | <type> <identifier>}; separator=","> ) throws Exception {
return ( <text> );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -44,6 +44,7 @@
import org.drools.common.ActivationGroupNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.LogicalDependency;
+import org.drools.common.RuleFlowGroupNode;
import org.drools.facttemplates.Fact;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.BaseDescr;
@@ -73,6 +74,7 @@
import org.drools.rule.ReturnValueConstraint;
import org.drools.rule.Rule;
import org.drools.spi.Activation;
+import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
@@ -453,12 +455,14 @@
"x" );
column.addDescr( fieldBindingDescr );
+ final FieldBindingDescr fieldBindingDescr2 = new FieldBindingDescr( "price",
+ "y" );
+ column.addDescr( fieldBindingDescr2 );
+
packageDescr.addGlobal( "map",
"java.util.Map" );
- final PredicateDescr predicate = new PredicateDescr( "price",
- "y",
- "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
+ final PredicateDescr predicate = new PredicateDescr( "( ( Integer )map.get( new Integer(x) ) ).intValue() == y" );
column.addDescr( predicate );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -1006,12 +1010,14 @@
"x" );
column.addDescr( fieldBindingDescr );
+ final FieldBindingDescr fieldBindingDescr2 = new FieldBindingDescr( "price",
+ "y" );
+ column.addDescr( fieldBindingDescr2 );
+
packageDescr.addGlobal( "map",
"java.util.Map" );
- final PredicateDescr predicate = new PredicateDescr( "price",
- "y",
- expression );
+ final PredicateDescr predicate = new PredicateDescr( expression );
column.addDescr( predicate );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -1096,9 +1102,9 @@
class MockActivation
implements
Activation {
- private Rule rule;
- private GroupElement subrule;
- private Tuple tuple;
+ private Rule rule;
+ private GroupElement subrule;
+ private Tuple tuple;
public MockActivation(final Rule rule,
final GroupElement subrule,
@@ -1153,6 +1159,21 @@
public GroupElement getSubRule() {
return this.subrule;
}
+
+ public AgendaGroup getAgendaGroup() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public RuleFlowGroupNode getRuleFlowGroupNode() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setRuleFlowGroupNode(RuleFlowGroupNode ruleFlowGroupNode) {
+ // TODO Auto-generated method stub
+
+ }
}
class MockTuple
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 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -19,7 +19,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -27,7 +26,6 @@
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
import org.antlr.runtime.Lexer;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.TokenStream;
@@ -296,7 +294,7 @@
att.getValue() );
assertEquals( "no-loop",
att.getName() );
- assertFalse( this.parser.hasErrors() );
+ assertFalse( this.parser.getErrorMessages().toString(), this.parser.hasErrors() );
}
@@ -346,7 +344,7 @@
AndDescr descrs = new AndDescr();
CharStream charStream = new ANTLRStringStream( text );
DRLLexer lexer = new DRLLexer( charStream );
- TokenStream tokenStream = new CommonTokenStream( lexer );
+ TokenStream tokenStream = new SwitchingCommonTokenStream( lexer );
DRLParser parser = new DRLParser( tokenStream );
parser.setLineOffset( descrs.getLine() );
parser.normal_lhs_block(descrs);
@@ -1926,14 +1924,15 @@
assertEquals( 1,
rule.getLhs().getDescrs().size() );
final ColumnDescr col = (ColumnDescr) rule.getLhs().getDescrs().get( 0 );
- assertEquals( 1,
+ assertEquals( 2,
col.getDescrs().size() );
- final PredicateDescr pred = (PredicateDescr) col.getDescrs().get( 0 );
+ final FieldBindingDescr field = (FieldBindingDescr) col.getDescrs().get( 0 );
+ final PredicateDescr pred = (PredicateDescr) col.getDescrs().get( 1 );
assertEquals( "age",
- pred.getFieldName() );
+ field.getFieldName() );
assertEquals( "$age2",
- pred.getDeclaration() );
+ field.getIdentifier() );
assertEqualsIgnoreWhitespace( "$age2 == $age1+2",
pred.getText() );
@@ -2381,18 +2380,32 @@
}
public void testPredicate() throws Exception {
- List constraints = new ArrayList();
- parse( "$var : attr -> ( $var.equals(\"xyz\") )" ).predicate(constraints);
+ ColumnDescr column = new ColumnDescr();
+ parse( "$var : attr -> ( $var.equals(\"xyz\") )" ).constraints( column );
- assertFalse( this.parser.hasErrors() );
+ assertFalse( this.parser.getErrorMessages().toString(), this.parser.hasErrors() );
+ List constraints = column.getDescrs();
+ assertEquals(2, constraints.size());
+
+ FieldBindingDescr field = (FieldBindingDescr) constraints.get( 0 );
+ PredicateDescr predicate = (PredicateDescr) constraints.get( 1 );
+ assertEquals("$var", field.getIdentifier());
+ assertEquals("attr", field.getFieldName());
+ assertEquals(" $var.equals(\"xyz\") ", predicate.getText());
+ }
+
+ public void testPredicate2() throws Exception {
+ ColumnDescr column = new ColumnDescr();
+ parse( "( $var.equals(\"xyz\") )" ).constraints( column );
+
+ assertFalse( this.parser.getErrorMessages().toString(), this.parser.hasErrors() );
+
+ List constraints = column.getDescrs();
assertEquals(1, constraints.size());
PredicateDescr predicate = (PredicateDescr) constraints.get( 0 );
- assertEquals("$var", predicate.getDeclaration());
- assertEquals("attr", predicate.getFieldName());
assertEquals(" $var.equals(\"xyz\") ", predicate.getText());
-
}
public void testEscapedStrings() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl 2007-01-24 22:04:03 UTC (rev 9011)
@@ -27,7 +27,7 @@
rule "test group1 1"
agenda-group "agenda group 1"
when
- Cheese( )
+ Cheese( $price : price )
then
list.add( "1 1" );
end
@@ -48,7 +48,7 @@
agenda-group "agenda group 3"
activation-group "activation group 3"
when
- Cheese( )
+ Cheese( $type : type, $price : price )
then
list.add( "3 2" );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -36,8 +36,6 @@
private PredicateExpression expression;
- private final Declaration declaration;
-
private final Declaration[] requiredDeclarations;
private final Declaration[] previousDeclarations;
@@ -46,32 +44,25 @@
private static final Declaration[] EMPTY_DECLARATIONS = new Declaration[0];
- public PredicateConstraint(final PredicateExpression evaluator,
- final Declaration declaration) {
+ public PredicateConstraint(final PredicateExpression evaluator) {
this( evaluator,
- declaration,
null,
null );
}
- public PredicateConstraint(final Declaration declaration,
- final Declaration[] previousDeclarations,
+ public PredicateConstraint(final Declaration[] previousDeclarations,
final Declaration[] localDeclarations) {
this( null,
- declaration,
previousDeclarations,
localDeclarations );
}
public PredicateConstraint(final PredicateExpression expression,
- final Declaration declaration,
final Declaration[] previousDeclarations,
final Declaration[] localDeclarations) {
this.expression = expression;
- this.declaration = declaration;
-
if ( previousDeclarations == null ) {
this.previousDeclarations = PredicateConstraint.EMPTY_DECLARATIONS;
} else {
@@ -136,14 +127,6 @@
return false;
}
- if ( this.declaration.getColumn().getOffset() != other.declaration.getColumn().getOffset() ) {
- return false;
- }
-
- if ( !this.declaration.getExtractor().equals( other.declaration.getExtractor() ) ) {
- return false;
- }
-
for ( int i = 0, length = this.previousDeclarations.length; i < length; i++ ) {
if ( this.previousDeclarations[i].getColumn().getOffset() != other.previousDeclarations[i].getColumn().getOffset() ) {
return false;
@@ -176,7 +159,6 @@
try {
return this.expression.evaluate( object,
null,
- declaration,
previousDeclarations,
localDeclarations,
workingMemory );
@@ -192,7 +174,6 @@
PredicateContextEntry ctx = (PredicateContextEntry) context;
return this.expression.evaluate( object,
ctx.leftTuple,
- declaration,
previousDeclarations,
localDeclarations,
ctx.workingMemory );
@@ -208,7 +189,6 @@
PredicateContextEntry ctx = (PredicateContextEntry) context;
return this.expression.evaluate( ctx.rightObject,
tuple,
- declaration,
previousDeclarations,
localDeclarations,
ctx.workingMemory );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -24,7 +24,6 @@
Invoker {
public boolean evaluate(Object object,
Tuple tuple,
- Declaration declaration,
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
WorkingMemory workingMemory) throws Exception;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractHashTable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractHashTable.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/AbstractHashTable.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -38,7 +38,7 @@
this.table = new Entry[capacity];
this.comparator = EqualityEquals.getInstance();
}
-
+
public Iterator iterator() {
if ( this.iterator == null ) {
this.iterator = new HashTableIterator( this );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -25,6 +25,11 @@
true );
}
+ public void clear() {
+ this.table = new Entry[Math.min( this.table.length, 16 )];
+ this.threshold = (int) ( this.table.length * this.loadFactor );
+ }
+
public Object put(final Object key,
final Object value,
final boolean checkExists) {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -186,12 +186,11 @@
public boolean evaluate(Object object,
Tuple tuple,
- Declaration declaration,
Declaration[] previousDeclarations,
Declaration[] localDeclarations,
WorkingMemory workingMemory) {
int price1 = previousDeclarations[0].getIntValue( workingMemory.getObject( tuple.get( previousDeclarations[0] ) ) );
- int price2 = declaration.getIntValue( object );
+ int price2 = localDeclarations[0].getIntValue( object );
return (price2 == (price1 * 2));
@@ -199,9 +198,8 @@
};
final PredicateConstraint constraint1 = new PredicateConstraint( evaluator,
- price2Declaration,
new Declaration[]{price1Declaration},
- new Declaration[0] );
+ new Declaration[]{price2Declaration} );
final Cheese cheddar0 = new Cheese( "cheddar",
5 );
Modified: labs/jbossrules/trunk/drools-ide-test/src/test/java/org/drools/ide/editors/completion/IncompleteParsingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-test/src/test/java/org/drools/ide/editors/completion/IncompleteParsingTest.java 2007-01-24 21:52:29 UTC (rev 9010)
+++ labs/jbossrules/trunk/drools-ide-test/src/test/java/org/drools/ide/editors/completion/IncompleteParsingTest.java 2007-01-24 22:04:03 UTC (rev 9011)
@@ -206,11 +206,10 @@
column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
assertEquals("Class", column.getObjectType());
assertEquals(-1, column.getEndCharacter());
- // TODO: this contains no subdescr, although it is already known it should be a FieldBindingDescr ??
- // assertEquals(1, column.getDescrs().size());
- // FieldBindingDescr binding = (FieldBindingDescr) column.getDescrs().get(0);
- // assertEquals("name", binding.getIdentifier());
- // assertNull(binding.getFieldName());
+ assertEquals(1, column.getDescrs().size());
+ FieldBindingDescr binding1 = (FieldBindingDescr) column.getDescrs().get(0);
+ assertEquals("name", binding1.getIdentifier());
+ assertNull(binding1.getFieldName());
input =
"rule MyRule \n" +
More information about the jboss-svn-commits
mailing list