Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4807 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang main/resources/org/drools/lang test/java/org/drools/lang test/resources/org/drools/lang
Author: mic...@jb...
Date: 2006-06-22 20:47:08 -0400 (Thu, 22 Jun 2006)
New Revision: 4807
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_EndPosition.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
records end position of ColumnDescrs
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-22 07:57:57 UTC (rev 4806)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-23 00:47:08 UTC (rev 4807)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-06-02 15:44:54
+// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-06-23 10:19:38
package org.drools.lang;
import java.util.List;
@@ -3307,10 +3307,11 @@
// $ANTLR start fact
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:666:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:666:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol ;
public PatternDescr fact() throws RecognitionException {
PatternDescr d;
Token loc=null;
+ Token endLoc=null;
String id = null;
List c = null;
@@ -3320,8 +3321,8 @@
d=null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol
{
following.push(FOLLOW_dotted_name_in_fact1614);
id=dotted_name();
@@ -3369,13 +3370,16 @@
opt_eol();
following.pop();
- match(input,25,FOLLOW_25_in_fact1660);
- following.push(FOLLOW_opt_eol_in_fact1662);
+ endLoc=(Token)input.LT(1);
+ match(input,25,FOLLOW_25_in_fact1662);
+ following.push(FOLLOW_opt_eol_in_fact1664);
opt_eol();
following.pop();
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+
+ d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );
+
+
}
}
@@ -3391,21 +3395,21 @@
// $ANTLR start constraints
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:687:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:690:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
public List constraints() throws RecognitionException {
List constraints;
constraints = new ArrayList();
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:691:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:691:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:694:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:694:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
{
- following.push(FOLLOW_opt_eol_in_constraints1687);
+ following.push(FOLLOW_opt_eol_in_constraints1696);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:17: ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:17: ( constraint[constraints] | predicate[constraints] )
int alt48=2;
int LA48_0 = input.LA(1);
if ( LA48_0==EOL||LA48_0==15 ) {
@@ -3425,7 +3429,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 8, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 8, input);
throw nvae;
}
@@ -3435,7 +3439,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 3, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 3, input);
throw nvae;
}
@@ -3445,22 +3449,22 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 2, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 2, input);
throw nvae;
}
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 0, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 0, input);
throw nvae;
}
switch (alt48) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:18: constraint[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:18: constraint[constraints]
{
- following.push(FOLLOW_constraint_in_constraints1692);
+ following.push(FOLLOW_constraint_in_constraints1701);
constraint(constraints);
following.pop();
@@ -3468,9 +3472,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:42: predicate[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:42: predicate[constraints]
{
- following.push(FOLLOW_predicate_in_constraints1695);
+ following.push(FOLLOW_predicate_in_constraints1704);
predicate(constraints);
following.pop();
@@ -3480,25 +3484,25 @@
}
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
loop50:
do {
int alt50=2;
alt50 = dfa50.predict(input);
switch (alt50) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
{
- following.push(FOLLOW_opt_eol_in_constraints1703);
+ following.push(FOLLOW_opt_eol_in_constraints1712);
opt_eol();
following.pop();
- match(input,24,FOLLOW_24_in_constraints1705);
- following.push(FOLLOW_opt_eol_in_constraints1707);
+ match(input,24,FOLLOW_24_in_constraints1714);
+ following.push(FOLLOW_opt_eol_in_constraints1716);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:39: ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:39: ( constraint[constraints] | predicate[constraints] )
int alt49=2;
int LA49_0 = input.LA(1);
if ( LA49_0==EOL||LA49_0==15 ) {
@@ -3518,7 +3522,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 8, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 8, input);
throw nvae;
}
@@ -3528,7 +3532,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 3, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 3, input);
throw nvae;
}
@@ -3538,22 +3542,22 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 2, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 2, input);
throw nvae;
}
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 0, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 0, input);
throw nvae;
}
switch (alt49) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:40: constraint[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:40: constraint[constraints]
{
- following.push(FOLLOW_constraint_in_constraints1710);
+ following.push(FOLLOW_constraint_in_constraints1719);
constraint(constraints);
following.pop();
@@ -3561,9 +3565,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:64: predicate[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:64: predicate[constraints]
{
- following.push(FOLLOW_predicate_in_constraints1713);
+ following.push(FOLLOW_predicate_in_constraints1722);
predicate(constraints);
following.pop();
@@ -3582,7 +3586,7 @@
}
} while (true);
- following.push(FOLLOW_opt_eol_in_constraints1721);
+ following.push(FOLLOW_opt_eol_in_constraints1730);
opt_eol();
following.pop();
@@ -3602,7 +3606,7 @@
// $ANTLR start constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:697:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:700:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol ;
public void constraint(List constraints) throws RecognitionException {
Token fb=null;
Token f=null;
@@ -3617,28 +3621,28 @@
PatternDescr d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:701:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:701:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:704:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:704:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol
{
- following.push(FOLLOW_opt_eol_in_constraint1740);
+ following.push(FOLLOW_opt_eol_in_constraint1749);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:702:17: (fb= ID opt_eol ':' opt_eol )?
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:705:17: (fb= ID opt_eol ':' opt_eol )?
int alt51=2;
alt51 = dfa51.predict(input);
switch (alt51) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:702:19: fb= ID opt_eol ':' opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:705:19: fb= ID opt_eol ':' opt_eol
{
fb=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1748);
- following.push(FOLLOW_opt_eol_in_constraint1750);
+ match(input,ID,FOLLOW_ID_in_constraint1757);
+ following.push(FOLLOW_opt_eol_in_constraint1759);
opt_eol();
following.pop();
- match(input,32,FOLLOW_32_in_constraint1752);
- following.push(FOLLOW_opt_eol_in_constraint1754);
+ match(input,32,FOLLOW_32_in_constraint1761);
+ following.push(FOLLOW_opt_eol_in_constraint1763);
opt_eol();
following.pop();
@@ -3649,7 +3653,7 @@
}
f=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1764);
+ match(input,ID,FOLLOW_ID_in_constraint1773);
if ( fb != null ) {
//System.err.println( "fb: " + fb.getText() );
@@ -3661,11 +3665,11 @@
constraints.add( d );
}
- following.push(FOLLOW_opt_eol_in_constraint1774);
+ following.push(FOLLOW_opt_eol_in_constraint1783);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:715:33: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:718:33: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?
int alt53=2;
int LA53_0 = input.LA(1);
if ( (LA53_0>=43 && LA53_0<=51) ) {
@@ -3676,13 +3680,13 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("715:33: (op= (\'==\'|\'>\'|\'>=\'|\'<\'|\'<=\'|\'!=\'|\'contains\'|\'matches\'|\'excludes\') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?", 53, 0, input);
+ new NoViableAltException("718:33: (op= (\'==\'|\'>\'|\'>=\'|\'<\'|\'<=\'|\'!=\'|\'contains\'|\'matches\'|\'excludes\') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?", 53, 0, input);
throw nvae;
}
switch (alt53) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:715:41: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:718:41: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
{
op=(Token)input.LT(1);
if ( (input.LA(1)>=43 && input.LA(1)<=51) ) {
@@ -3692,14 +3696,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint1782); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint1791); throw mse;
}
- following.push(FOLLOW_opt_eol_in_constraint1869);
+ following.push(FOLLOW_opt_eol_in_constraint1878);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
int alt52=4;
switch ( input.LA(1) ) {
case ID:
@@ -3712,7 +3716,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 1, input);
+ new NoViableAltException("729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 1, input);
throw nvae;
}
@@ -3729,17 +3733,17 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 0, input);
+ new NoViableAltException("729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 0, input);
throw nvae;
}
switch (alt52) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:726:49: bvc= ID
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:729:49: bvc= ID
{
bvc=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1887);
+ match(input,ID,FOLLOW_ID_in_constraint1896);
d = new BoundVariableDescr( f.getText(), op.getText(), bvc.getText() );
d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
@@ -3749,9 +3753,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:733:49: lc= enum_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:736:49: lc= enum_constraint
{
- following.push(FOLLOW_enum_constraint_in_constraint1912);
+ following.push(FOLLOW_enum_constraint_in_constraint1921);
lc=enum_constraint();
following.pop();
@@ -3764,9 +3768,9 @@
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:740:49: lc= literal_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:743:49: lc= literal_constraint
{
- following.push(FOLLOW_literal_constraint_in_constraint1944);
+ following.push(FOLLOW_literal_constraint_in_constraint1953);
lc=literal_constraint();
following.pop();
@@ -3779,9 +3783,9 @@
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:746:49: rvc= retval_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:749:49: rvc= retval_constraint
{
- following.push(FOLLOW_retval_constraint_in_constraint1964);
+ following.push(FOLLOW_retval_constraint_in_constraint1973);
rvc=retval_constraint();
following.pop();
@@ -3802,7 +3806,7 @@
}
- following.push(FOLLOW_opt_eol_in_constraint1997);
+ following.push(FOLLOW_opt_eol_in_constraint2006);
opt_eol();
following.pop();
@@ -3822,7 +3826,7 @@
// $ANTLR start literal_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:757:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:760:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
public String literal_constraint() throws RecognitionException {
String text;
Token t=null;
@@ -3831,10 +3835,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
int alt54=5;
switch ( input.LA(1) ) {
case STRING:
@@ -3854,53 +3858,53 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 54, 0, input);
+ new NoViableAltException("764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 54, 0, input);
throw nvae;
}
switch (alt54) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:25: t= STRING
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:25: t= STRING
{
t=(Token)input.LT(1);
- match(input,STRING,FOLLOW_STRING_in_literal_constraint2024);
+ match(input,STRING,FOLLOW_STRING_in_literal_constraint2033);
text = getString( t );
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:762:25: t= INT
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:765:25: t= INT
{
t=(Token)input.LT(1);
- match(input,INT,FOLLOW_INT_in_literal_constraint2035);
+ match(input,INT,FOLLOW_INT_in_literal_constraint2044);
text = t.getText();
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:763:25: t= FLOAT
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:766:25: t= FLOAT
{
t=(Token)input.LT(1);
- match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2048);
+ match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2057);
text = t.getText();
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:25: t= BOOL
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:767:25: t= BOOL
{
t=(Token)input.LT(1);
- match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2059);
+ match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2068);
text = t.getText();
}
break;
case 5 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:765:25: t= 'null'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:768:25: t= 'null'
{
t=(Token)input.LT(1);
- match(input,52,FOLLOW_52_in_literal_constraint2071);
+ match(input,52,FOLLOW_52_in_literal_constraint2080);
text = null;
}
@@ -3924,7 +3928,7 @@
// $ANTLR start enum_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:769:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:772:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
public String enum_constraint() throws RecognitionException {
String text;
Token cls=null;
@@ -3934,17 +3938,17 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: ( (cls= ID '.' en= ID ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: (cls= ID '.' en= ID )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: ( (cls= ID '.' en= ID ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: (cls= ID '.' en= ID )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: (cls= ID '.' en= ID )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:18: cls= ID '.' en= ID
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: (cls= ID '.' en= ID )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:18: cls= ID '.' en= ID
{
cls=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2102);
- match(input,18,FOLLOW_18_in_enum_constraint2104);
+ match(input,ID,FOLLOW_ID_in_enum_constraint2111);
+ match(input,18,FOLLOW_18_in_enum_constraint2113);
en=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2108);
+ match(input,ID,FOLLOW_ID_in_enum_constraint2117);
}
@@ -3965,7 +3969,7 @@
// $ANTLR start retval_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:779:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
public String retval_constraint() throws RecognitionException {
String text;
String c = null;
@@ -3975,15 +3979,15 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:781:17: ( '(' c= paren_chunk ')' )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:781:17: '(' c= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:17: ( '(' c= paren_chunk ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:17: '(' c= paren_chunk ')'
{
- match(input,23,FOLLOW_23_in_retval_constraint2137);
- following.push(FOLLOW_paren_chunk_in_retval_constraint2141);
+ match(input,23,FOLLOW_23_in_retval_constraint2146);
+ following.push(FOLLOW_paren_chunk_in_retval_constraint2150);
c=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_retval_constraint2143);
+ match(input,25,FOLLOW_25_in_retval_constraint2152);
text = c;
}
@@ -4001,7 +4005,7 @@
// $ANTLR start predicate
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:787:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
public void predicate(List constraints) throws RecognitionException {
Token decl=null;
Token field=null;
@@ -4009,21 +4013,21 @@
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:786:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:786:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:789:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:789:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
{
decl=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2161);
- match(input,32,FOLLOW_32_in_predicate2163);
+ match(input,ID,FOLLOW_ID_in_predicate2170);
+ match(input,32,FOLLOW_32_in_predicate2172);
field=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2167);
- match(input,53,FOLLOW_53_in_predicate2169);
- match(input,23,FOLLOW_23_in_predicate2171);
- following.push(FOLLOW_paren_chunk_in_predicate2175);
+ match(input,ID,FOLLOW_ID_in_predicate2176);
+ match(input,53,FOLLOW_53_in_predicate2178);
+ match(input,23,FOLLOW_23_in_predicate2180);
+ following.push(FOLLOW_paren_chunk_in_predicate2184);
text=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_predicate2177);
+ match(input,25,FOLLOW_25_in_predicate2186);
PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
constraints.add( d );
@@ -4044,7 +4048,7 @@
// $ANTLR start paren_chunk
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:793:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:796:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
public String paren_chunk() throws RecognitionException {
String text;
Token any=null;
@@ -4055,10 +4059,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
loop55:
do {
int alt55=3;
@@ -4134,14 +4138,14 @@
switch (alt55) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:800:25: '(' c= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:803:25: '(' c= paren_chunk ')'
{
- match(input,23,FOLLOW_23_in_paren_chunk2223);
- following.push(FOLLOW_paren_chunk_in_paren_chunk2227);
+ match(input,23,FOLLOW_23_in_paren_chunk2232);
+ following.push(FOLLOW_paren_chunk_in_paren_chunk2236);
c=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_paren_chunk2229);
+ match(input,25,FOLLOW_25_in_paren_chunk2238);
if ( c == null ) {
c = "";
@@ -4156,7 +4160,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:811:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:814:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4192,7 +4196,7 @@
// $ANTLR start paren_chunk2
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:823:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:826:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
public String paren_chunk2() throws RecognitionException {
String text;
Token any=null;
@@ -4203,10 +4207,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
loop56:
do {
int alt56=3;
@@ -4280,14 +4284,14 @@
switch (alt56) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:830:25: '(' c= paren_chunk2 ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:833:25: '(' c= paren_chunk2 ')'
{
- match(input,23,FOLLOW_23_in_paren_chunk22300);
- following.push(FOLLOW_paren_chunk2_in_paren_chunk22304);
+ match(input,23,FOLLOW_23_in_paren_chunk22309);
+ following.push(FOLLOW_paren_chunk2_in_paren_chunk22313);
c=paren_chunk2();
following.pop();
- match(input,25,FOLLOW_25_in_paren_chunk22306);
+ match(input,25,FOLLOW_25_in_paren_chunk22315);
if ( c == null ) {
c = "";
@@ -4302,7 +4306,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:841:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:844:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4338,7 +4342,7 @@
// $ANTLR start curly_chunk
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:852:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:855:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
public String curly_chunk() throws RecognitionException {
String text;
Token any=null;
@@ -4349,10 +4353,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
loop57:
do {
int alt57=3;
@@ -4426,14 +4430,14 @@
switch (alt57) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:859:25: '{' c= curly_chunk '}'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:862:25: '{' c= curly_chunk '}'
{
- match(input,26,FOLLOW_26_in_curly_chunk2375);
- following.push(FOLLOW_curly_chunk_in_curly_chunk2379);
+ match(input,26,FOLLOW_26_in_curly_chunk2384);
+ following.push(FOLLOW_curly_chunk_in_curly_chunk2388);
c=curly_chunk();
following.pop();
- match(input,27,FOLLOW_27_in_curly_chunk2381);
+ match(input,27,FOLLOW_27_in_curly_chunk2390);
//System.err.println( "chunk [" + c + "]" );
if ( c == null ) {
@@ -4449,7 +4453,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:871:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:874:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4486,7 +4490,7 @@
// $ANTLR start lhs_or
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:883:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:886:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
public PatternDescr lhs_or() throws RecognitionException {
PatternDescr d;
PatternDescr left = null;
@@ -4498,16 +4502,16 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:888:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:888:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:891:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:891:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
{
OrDescr or = null;
- following.push(FOLLOW_lhs_and_in_lhs_or2439);
+ following.push(FOLLOW_lhs_and_in_lhs_or2448);
left=lhs_and();
following.pop();
d = left;
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:890:17: ( ('or'|'||') opt_eol right= lhs_and )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:893:17: ( ('or'|'||') opt_eol right= lhs_and )*
loop58:
do {
int alt58=2;
@@ -4519,7 +4523,7 @@
switch (alt58) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:890:19: ('or'|'||') opt_eol right= lhs_and
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:893:19: ('or'|'||') opt_eol right= lhs_and
{
if ( (input.LA(1)>=41 && input.LA(1)<=42) ) {
input.consume();
@@ -4528,14 +4532,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2448); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2457); throw mse;
}
- following.push(FOLLOW_opt_eol_in_lhs_or2453);
+ following.push(FOLLOW_opt_eol_in_lhs_or2462);
opt_eol();
following.pop();
- following.push(FOLLOW_lhs_and_in_lhs_or2460);
+ following.push(FOLLOW_lhs_and_in_lhs_or2469);
right=lhs_and();
following.pop();
@@ -4560,17 +4564,6 @@
}
- if (d instanceof OrDescr) {
- List l = ((OrDescr) d).getDescrs();
- if (l != null && l.size() == 2) {
- PatternDescr subDescr = (PatternDescr) l.get(1);
- if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
- }
- }
- }
-
}
catch (RecognitionException re) {
reportError(re);
@@ -4584,7 +4577,7 @@
// $ANTLR start lhs_and
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:904:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:907:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
public PatternDescr lhs_and() throws RecognitionException {
PatternDescr d;
PatternDescr left = null;
@@ -4596,16 +4589,16 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:909:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:909:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:912:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:912:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
{
AndDescr and = null;
- following.push(FOLLOW_lhs_unary_in_lhs_and2500);
+ following.push(FOLLOW_lhs_unary_in_lhs_and2509);
left=lhs_unary();
following.pop();
d = left;
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:911:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:914:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
loop59:
do {
int alt59=2;
@@ -4617,7 +4610,7 @@
switch (alt59) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:911:19: ('and'|'&&') opt_eol right= lhs_unary
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:914:19: ('and'|'&&') opt_eol right= lhs_unary
{
if ( (input.LA(1)>=54 && input.LA(1)<=55) ) {
input.consume();
@@ -4626,14 +4619,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2509); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2518); throw mse;
}
- following.push(FOLLOW_opt_eol_in_lhs_and2514);
+ following.push(FOLLOW_opt_eol_in_lhs_and2523);
opt_eol();
following.pop();
- following.push(FOLLOW_lhs_unary_in_lhs_and2521);
+ following.push(FOLLOW_lhs_unary_in_lhs_and2530);
right=lhs_unary();
following.pop();
@@ -4657,18 +4650,7 @@
}
-
- if (d instanceof AndDescr) {
- List l = ((AndDescr) d).getDescrs();
- if (l != null && l.size() == 2) {
- PatternDescr subDescr = (PatternDescr) l.get(1);
- if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
- }
- }
- }
-
+
}
catch (RecognitionException re) {
reportError(re);
@@ -4682,7 +4664,7 @@
// $ANTLR start lhs_unary
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:925:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:928:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) ;
public PatternDescr lhs_unary() throws RecognitionException {
PatternDescr d;
PatternDescr u = null;
@@ -4692,10 +4674,10 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
int alt60=5;
switch ( input.LA(1) ) {
case 56:
@@ -4715,16 +4697,16 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | \'(\' u= lhs \')\' )", 60, 0, input);
+ new NoViableAltException("932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | \'(\' u= lhs \')\' )", 60, 0, input);
throw nvae;
}
switch (alt60) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:25: u= lhs_exist
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:25: u= lhs_exist
{
- following.push(FOLLOW_lhs_exist_in_lhs_unary2559);
+ following.push(FOLLOW_lhs_exist_in_lhs_unary2568);
u=lhs_exist();
following.pop();
@@ -4732,9 +4714,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:930:25: u= lhs_not
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:933:25: u= lhs_not
{
- following.push(FOLLOW_lhs_not_in_lhs_unary2567);
+ following.push(FOLLOW_lhs_not_in_lhs_unary2576);
u=lhs_not();
following.pop();
@@ -4742,9 +4724,9 @@
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:931:25: u= lhs_eval
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:934:25: u= lhs_eval
{
- following.push(FOLLOW_lhs_eval_in_lhs_unary2575);
+ following.push(FOLLOW_lhs_eval_in_lhs_unary2584);
u=lhs_eval();
following.pop();
@@ -4752,9 +4734,9 @@
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:25: u= lhs_column
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:935:25: u= lhs_column
{
- following.push(FOLLOW_lhs_column_in_lhs_unary2583);
+ following.push(FOLLOW_lhs_column_in_lhs_unary2592);
u=lhs_column();
following.pop();
@@ -4762,14 +4744,14 @@
}
break;
case 5 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:933:25: '(' u= lhs ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:936:25: '(' u= lhs ')'
{
- match(input,23,FOLLOW_23_in_lhs_unary2589);
- following.push(FOLLOW_lhs_in_lhs_unary2593);
+ match(input,23,FOLLOW_23_in_lhs_unary2598);
+ following.push(FOLLOW_lhs_in_lhs_unary2602);
u=lhs();
following.pop();
- match(input,25,FOLLOW_25_in_lhs_unary2595);
+ match(input,25,FOLLOW_25_in_lhs...
[truncated message content] |
