[jboss-svn-commits] JBL Code SVN: r12299 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang and 9 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Jun 2 21:43:30 EDT 2007


Author: mark.proctor at jboss.com
Date: 2007-06-02 21:43:29 -0400 (Sat, 02 Jun 2007)
New Revision: 12299

Added:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl
Removed:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL.tokens
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL__.g
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   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/descr/AndDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/QueryDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
Log:
JBRULES-900 allow parameterised queries
-parameterised querries now work
-added an ArrayExtractor that allows binding to elements

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -42,6 +42,7 @@
 import org.drools.lang.descr.GlobalDescr;
 import org.drools.lang.descr.ImportDescr;
 import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
@@ -378,6 +379,10 @@
 
     private void addRule(final RuleDescr ruleDescr) {
         //this.dialect.init( ruleDescr );
+        
+        if ( ruleDescr instanceof QueryDescr ) {
+            //ruleDescr.getLhs().insertDescr( 0, baseDescr );
+        }
 
         RuleBuildContext context = new RuleBuildContext( pkg,
                                                          ruleDescr,

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL.tokens
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL.tokens	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL.tokens	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1,82 +0,0 @@
-EXISTS=56
-COMMA=31
-AUTO_FOCUS=22
-END=10
-HexDigit=62
-FORALL=57
-TEMPLATE=11
-MISC=68
-FLOAT=48
-QUERY=9
-THEN=58
-RULE=12
-INIT=32
-IMPORT=6
-DATE_EFFECTIVE=14
-PACKAGE=5
-OR=38
-DOUBLE_PIPE=39
-AND=54
-FUNCTION=7
-GLOBAL=8
-EscapeSequence=61
-DIALECT=27
-INT=20
-LOCK_ON_ACTIVE=28
-DATE_EXPIRES=16
-LEFT_SQUARE=52
-CONTAINS=42
-SH_STYLE_SINGLE_LINE_COMMENT=65
-ATTRIBUTES=4
-LEFT_CURLY=50
-RESULT=34
-FROM=55
-ID=37
-ACTIVATION_GROUP=23
-LEFT_PAREN=30
-DOUBLE_AMPER=40
-RIGHT_CURLY=51
-EXCLUDES=44
-BOOL=18
-MEMBEROF=46
-WHEN=13
-RULEFLOW_GROUP=24
-WS=60
-STRING=15
-ACTION=33
-COLLECT=36
-IN=47
-NO_LOOP=21
-ACCUMULATE=29
-UnicodeEscape=63
-DURATION=26
-EVAL=41
-MATCHES=45
-EOL=59
-NULL=49
-AGENDA_GROUP=25
-OctalEscape=64
-SALIENCE=19
-MULTI_LINE_COMMENT=67
-RIGHT_PAREN=35
-NOT=43
-ENABLED=17
-RIGHT_SQUARE=53
-C_STYLE_SINGLE_LINE_COMMENT=66
-'->'=73
-'<'=77
-'>'=75
-')'=35
-'=='=74
-';'=69
-']'=53
-'!='=79
-','=31
-'('=30
-'>='=76
-':'=70
-'.'=71
-'||'=39
-'<='=78
-'['=52
-'.*'=72

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-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1,8 +1,8 @@
-// $ANTLR 3.0 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-05-25 16:51:46
+// $ANTLR 3.0 C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-06-03 02:26:07
+
+	package org.drools.lang;
 
-	package org.drools.lang;
 
-
 import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
@@ -10,97 +10,97 @@
 import java.util.Map;
 import java.util.HashMap;
 public class DRLLexer extends Lexer {
-    public static final int EXISTS=56;
-    public static final int COMMA=31;
-    public static final int T79=79;
-    public static final int AUTO_FOCUS=22;
-    public static final int END=10;
-    public static final int HexDigit=62;
-    public static final int FORALL=57;
-    public static final int TEMPLATE=11;
-    public static final int T70=70;
-    public static final int MISC=68;
-    public static final int FLOAT=48;
-    public static final int T74=74;
-    public static final int QUERY=9;
-    public static final int THEN=58;
-    public static final int RULE=12;
-    public static final int INIT=32;
-    public static final int IMPORT=6;
+    public static final int T75=75;
     public static final int PACKAGE=5;
-    public static final int DATE_EFFECTIVE=14;
-    public static final int OR=38;
-    public static final int DOUBLE_PIPE=39;
-    public static final int AND=54;
     public static final int FUNCTION=7;
-    public static final int GLOBAL=8;
-    public static final int EscapeSequence=61;
-    public static final int DIALECT=27;
-    public static final int INT=20;
-    public static final int LOCK_ON_ACTIVE=28;
-    public static final int DATE_EXPIRES=16;
-    public static final int LEFT_SQUARE=52;
-    public static final int CONTAINS=42;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=65;
+    public static final int ACCUMULATE=32;
+    public static final int T76=76;
+    public static final int RIGHT_SQUARE=53;
+    public static final int T73=73;
+    public static final int T74=74;
+    public static final int T79=79;
+    public static final int ACTIVATION_GROUP=26;
     public static final int T77=77;
     public static final int ATTRIBUTES=4;
-    public static final int LEFT_CURLY=50;
-    public static final int RESULT=34;
-    public static final int T69=69;
-    public static final int FROM=55;
-    public static final int ID=37;
-    public static final int ACTIVATION_GROUP=23;
-    public static final int LEFT_PAREN=30;
-    public static final int DOUBLE_AMPER=40;
     public static final int RIGHT_CURLY=51;
-    public static final int EXCLUDES=44;
-    public static final int BOOL=18;
-    public static final int T73=73;
-    public static final int MEMBEROF=46;
-    public static final int WHEN=13;
     public static final int T78=78;
-    public static final int RULEFLOW_GROUP=24;
-    public static final int WS=60;
-    public static final int STRING=15;
-    public static final int ACTION=33;
-    public static final int T71=71;
+    public static final int DIALECT=30;
+    public static final int CONTAINS=42;
+    public static final int NO_LOOP=24;
+    public static final int LOCK_ON_ACTIVE=31;
+    public static final int MEMBEROF=46;
+    public static final int AGENDA_GROUP=28;
+    public static final int FLOAT=48;
+    public static final int NOT=43;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=65;
+    public static final int AND=54;
+    public static final int ID=11;
+    public static final int EOF=-1;
+    public static final int HexDigit=62;
+    public static final int DATE_EFFECTIVE=17;
     public static final int T72=72;
-    public static final int COLLECT=36;
-    public static final int T76=76;
+    public static final int ACTION=35;
+    public static final int T71=71;
+    public static final int T70=70;
+    public static final int DOUBLE_PIPE=39;
+    public static final int RIGHT_PAREN=12;
+    public static final int IMPORT=6;
+    public static final int EOL=59;
+    public static final int DOUBLE_AMPER=40;
+    public static final int THEN=58;
     public static final int IN=47;
-    public static final int ACCUMULATE=29;
-    public static final int NO_LOOP=21;
-    public static final int UnicodeEscape=63;
-    public static final int T75=75;
-    public static final int DURATION=26;
-    public static final int EVAL=41;
+    public static final int T69=69;
     public static final int MATCHES=45;
-    public static final int EOF=-1;
-    public static final int AGENDA_GROUP=25;
+    public static final int COMMA=33;
+    public static final int ENABLED=20;
+    public static final int EXISTS=56;
+    public static final int RULE=15;
+    public static final int EXCLUDES=44;
+    public static final int AUTO_FOCUS=25;
     public static final int NULL=49;
-    public static final int EOL=59;
+    public static final int BOOL=21;
+    public static final int FORALL=57;
+    public static final int SALIENCE=22;
+    public static final int RULEFLOW_GROUP=27;
+    public static final int RESULT=36;
+    public static final int INT=23;
     public static final int Tokens=80;
-    public static final int SALIENCE=19;
-    public static final int OctalEscape=64;
     public static final int MULTI_LINE_COMMENT=67;
-    public static final int NOT=43;
-    public static final int RIGHT_PAREN=35;
-    public static final int ENABLED=17;
-    public static final int RIGHT_SQUARE=53;
+    public static final int DURATION=29;
+    public static final int WS=60;
+    public static final int EVAL=41;
+    public static final int TEMPLATE=14;
+    public static final int WHEN=16;
+    public static final int UnicodeEscape=63;
+    public static final int LEFT_CURLY=50;
+    public static final int OR=38;
+    public static final int LEFT_PAREN=10;
+    public static final int QUERY=9;
+    public static final int GLOBAL=8;
+    public static final int END=13;
+    public static final int FROM=55;
+    public static final int MISC=68;
+    public static final int COLLECT=37;
+    public static final int INIT=34;
+    public static final int LEFT_SQUARE=52;
+    public static final int EscapeSequence=61;
+    public static final int OctalEscape=64;
     public static final int C_STYLE_SINGLE_LINE_COMMENT=66;
+    public static final int STRING=18;
+    public static final int DATE_EXPIRES=19;
     public DRLLexer() {;} 
     public DRLLexer(CharStream input) {
         super(input);
         ruleMemo = new HashMap[78+1];
      }
-    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
+    public String getGrammarFileName() { return "C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g"; }
 
     // $ANTLR start T69
     public final void mT69() throws RecognitionException {
         try {
             int _type = T69;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:7: ( ';' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:7: ';'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:6:7: ( ';' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:6:7: ';'
             {
             match(';'); if (failed) return ;
 
@@ -117,8 +117,8 @@
     public final void mT70() throws RecognitionException {
         try {
             int _type = T70;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:7: ( ':' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:7: ':'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:7:7: ( ':' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:7:7: ':'
             {
             match(':'); if (failed) return ;
 
@@ -135,8 +135,8 @@
     public final void mT71() throws RecognitionException {
         try {
             int _type = T71;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: ( '.' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: '.'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:8:7: ( '.' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:8:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -153,8 +153,8 @@
     public final void mT72() throws RecognitionException {
         try {
             int _type = T72;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: ( '.*' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: '.*'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:9:7: ( '.*' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:9:7: '.*'
             {
             match(".*"); if (failed) return ;
 
@@ -172,8 +172,8 @@
     public final void mT73() throws RecognitionException {
         try {
             int _type = T73;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: ( '->' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: '->'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:10:7: ( '->' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:10:7: '->'
             {
             match("->"); if (failed) return ;
 
@@ -191,8 +191,8 @@
     public final void mT74() throws RecognitionException {
         try {
             int _type = T74;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: ( '==' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: '=='
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:11:7: ( '==' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:11:7: '=='
             {
             match("=="); if (failed) return ;
 
@@ -210,8 +210,8 @@
     public final void mT75() throws RecognitionException {
         try {
             int _type = T75;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: ( '>' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: '>'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:12:7: ( '>' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:12:7: '>'
             {
             match('>'); if (failed) return ;
 
@@ -228,8 +228,8 @@
     public final void mT76() throws RecognitionException {
         try {
             int _type = T76;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: ( '>=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: '>='
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:13:7: ( '>=' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:13:7: '>='
             {
             match(">="); if (failed) return ;
 
@@ -247,8 +247,8 @@
     public final void mT77() throws RecognitionException {
         try {
             int _type = T77;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: ( '<' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: '<'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:14:7: ( '<' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:14:7: '<'
             {
             match('<'); if (failed) return ;
 
@@ -265,8 +265,8 @@
     public final void mT78() throws RecognitionException {
         try {
             int _type = T78;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:7: ( '<=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:7: '<='
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:15:7: ( '<=' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:15:7: '<='
             {
             match("<="); if (failed) return ;
 
@@ -284,8 +284,8 @@
     public final void mT79() throws RecognitionException {
         try {
             int _type = T79;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:16:7: ( '!=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:16:7: '!='
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:16:7: ( '!=' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:16:7: '!='
             {
             match("!="); if (failed) return ;
 
@@ -303,10 +303,10 @@
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1748:17: ( ( ' ' | '\\t' | '\\f' | EOL ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1748:17: ( ' ' | '\\t' | '\\f' | EOL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1761:17: ( ( ' ' | '\\t' | '\\f' | EOL ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1761:17: ( ' ' | '\\t' | '\\f' | EOL )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1748:17: ( ' ' | '\\t' | '\\f' | EOL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1761:17: ( ' ' | '\\t' | '\\f' | EOL )
             int alt1=4;
             switch ( input.LA(1) ) {
             case ' ':
@@ -333,35 +333,35 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1748:17: ( ' ' | '\\t' | '\\f' | EOL )", 1, 0, input);
+                    new NoViableAltException("1761:17: ( ' ' | '\\t' | '\\f' | EOL )", 1, 0, input);
 
                 throw nvae;
             }
 
             switch (alt1) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1748:19: ' '
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1761:19: ' '
                     {
                     match(' '); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:19: '\\t'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1762:19: '\\t'
                     {
                     match('\t'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:19: '\\f'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1763:19: '\\f'
                     {
                     match('\f'); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:19: EOL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1764:19: EOL
                     {
                     mEOL(); if (failed) return ;
 
@@ -386,10 +386,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -408,13 +408,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1758:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1771:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:14: ( '\\r\\n' )=> '\\r\\n'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -422,14 +422,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1759:25: '\\r'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1772:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:25: '\\n'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1773:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -451,10 +451,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:4: ( ( '-' )? ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:4: ( '-' )? ( '0' .. '9' )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:4: ( ( '-' )? ( '0' .. '9' )+ )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:4: ( '-' )? ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:4: ( '-' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -463,7 +463,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:5: '-'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -472,7 +472,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:10: ( '0' .. '9' )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -486,7 +486,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:11: '0' .. '9'
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1778:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -517,10 +517,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:4: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:4: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:4: ( '-' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -529,7 +529,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:5: '-'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -538,7 +538,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:10: ( '0' .. '9' )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -552,7 +552,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:11: '0' .. '9'
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -570,7 +570,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:26: ( '0' .. '9' )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -584,7 +584,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:27: '0' .. '9'
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1782:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -615,7 +615,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:8: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:8: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -628,19 +628,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1772:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1785:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -656,14 +656,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:15: EscapeSequence
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:32: ~ ( '\\\\' | '\"' )
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1786:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -693,13 +693,13 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -715,14 +715,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:16: EscapeSequence
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:33: ~ ( '\\\\' | '\\'' )
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1787:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -763,8 +763,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:12: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1791:12: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1791: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();
@@ -789,17 +789,12 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1782:9: ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1795:9: ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape )
             int alt11=3;
             int LA11_0 = input.LA(1);
 
             if ( (LA11_0=='\\') ) {
                 switch ( input.LA(2) ) {
-                case 'u':
-                    {
-                    alt11=2;
-                    }
-                    break;
                 case '\"':
                 case '$':
                 case '&':
@@ -846,6 +841,11 @@
                     alt11=1;
                     }
                     break;
+                case 'u':
+                    {
+                    alt11=2;
+                    }
+                    break;
                 case '0':
                 case '1':
                 case '2':
@@ -861,7 +861,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1780:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape );", 11, 1, input);
+                        new NoViableAltException("1793:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape );", 11, 1, input);
 
                     throw nvae;
                 }
@@ -870,13 +870,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1780:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape );", 11, 0, input);
+                    new NoViableAltException("1793:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape );", 11, 0, input);
 
                 throw nvae;
             }
             switch (alt11) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1782:9: '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1795:9: '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
                     {
                     match('\\'); if (failed) return ;
                     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)>='A' && input.LA(1)<='B')||(input.LA(1)>='D' && input.LA(1)<='E')||input.LA(1)=='G'||input.LA(1)=='Q'||input.LA(1)=='S'||input.LA(1)=='W'||(input.LA(1)>='Z' && input.LA(1)<='^')||(input.LA(1)>='a' && input.LA(1)<='f')||(input.LA(1)>='n' && input.LA(1)<='p')||(input.LA(1)>='r' && input.LA(1)<='t')||(input.LA(1)>='w' && input.LA(1)<='x')||(input.LA(1)>='z' && input.LA(1)<='}') ) {
@@ -894,14 +894,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1786:9: UnicodeEscape
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1799:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:9: OctalEscape
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1800:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -918,7 +918,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -929,9 +929,9 @@
                     int LA12_2 = input.LA(3);
 
                     if ( ((LA12_2>='0' && LA12_2<='7')) ) {
-                        int LA12_5 = input.LA(4);
+                        int LA12_4 = input.LA(4);
 
-                        if ( ((LA12_5>='0' && LA12_5<='7')) ) {
+                        if ( ((LA12_4>='0' && LA12_4<='7')) ) {
                             alt12=1;
                         }
                         else {
@@ -952,7 +952,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1790:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1803:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -960,31 +960,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1790:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1803:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
 
                 throw nvae;
             }
             switch (alt12) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:14: ( '0' .. '3' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:15: '0' .. '3'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:14: ( '0' .. '3' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:26: '0' .. '7'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:25: ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:36: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:37: '0' .. '7'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:36: ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1805:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -994,18 +994,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1806:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:15: '0' .. '7'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1806:14: ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1806:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:26: '0' .. '7'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1806:25: ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1806:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1015,11 +1015,11 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:9: '\\\\' ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1807:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:15: '0' .. '7'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1807:14: ( '0' .. '7' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1807:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1039,8 +1039,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1812:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1812:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -1061,10 +1061,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:4: ( ( 'true' | 'false' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:4: ( 'true' | 'false' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1816:4: ( ( 'true' | 'false' ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1816:4: ( 'true' | 'false' )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:4: ( 'true' | 'false' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1816:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1077,13 +1077,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1803:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1816:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:5: 'true'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1816:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -1091,7 +1091,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:12: 'false'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1816:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -1115,8 +1115,8 @@
     public final void mPACKAGE() throws RecognitionException {
         try {
             int _type = PACKAGE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:11: ( 'package' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:11: 'package'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1819:11: ( 'package' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1819:11: 'package'
             {
             match("package"); if (failed) return ;
 
@@ -1134,8 +1134,8 @@
     public final void mIMPORT() throws RecognitionException {
         try {
             int _type = IMPORT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:10: ( 'import' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:10: 'import'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1821:10: ( 'import' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1821:10: 'import'
             {
             match("import"); if (failed) return ;
 
@@ -1153,8 +1153,8 @@
     public final void mFUNCTION() throws RecognitionException {
         try {
             int _type = FUNCTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1810:12: ( 'function' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1810:12: 'function'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1823:12: ( 'function' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1823:12: 'function'
             {
             match("function"); if (failed) return ;
 
@@ -1172,8 +1172,8 @@
     public final void mGLOBAL() throws RecognitionException {
         try {
             int _type = GLOBAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:10: ( 'global' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:10: 'global'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1825:10: ( 'global' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1825:10: 'global'
             {
             match("global"); if (failed) return ;
 
@@ -1191,8 +1191,8 @@
     public final void mRULE() throws RecognitionException {
         try {
             int _type = RULE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:11: ( 'rule' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:11: 'rule'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1827:11: ( 'rule' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1827:11: 'rule'
             {
             match("rule"); if (failed) return ;
 
@@ -1210,8 +1210,8 @@
     public final void mQUERY() throws RecognitionException {
         try {
             int _type = QUERY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1816:9: ( 'query' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1816:9: 'query'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1829:9: ( 'query' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1829:9: 'query'
             {
             match("query"); if (failed) return ;
 
@@ -1229,8 +1229,8 @@
     public final void mTEMPLATE() throws RecognitionException {
         try {
             int _type = TEMPLATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1818:12: ( 'template' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1818:12: 'template'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1831:12: ( 'template' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1831:12: 'template'
             {
             match("template"); if (failed) return ;
 
@@ -1248,8 +1248,8 @@
     public final void mATTRIBUTES() throws RecognitionException {
         try {
             int _type = ATTRIBUTES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:14: ( 'attributes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:14: 'attributes'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1833:14: ( 'attributes' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1833:14: 'attributes'
             {
             match("attributes"); if (failed) return ;
 
@@ -1267,8 +1267,8 @@
     public final void mDATE_EFFECTIVE() throws RecognitionException {
         try {
             int _type = DATE_EFFECTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1823:4: ( 'date-effective' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1823:4: 'date-effective'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1836:4: ( 'date-effective' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1836:4: 'date-effective'
             {
             match("date-effective"); if (failed) return ;
 
@@ -1286,8 +1286,8 @@
     public final void mDATE_EXPIRES() throws RecognitionException {
         try {
             int _type = DATE_EXPIRES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:4: ( 'date-expires' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:4: 'date-expires'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1839:4: ( 'date-expires' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1839:4: 'date-expires'
             {
             match("date-expires"); if (failed) return ;
 
@@ -1305,8 +1305,8 @@
     public final void mENABLED() throws RecognitionException {
         try {
             int _type = ENABLED;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:11: ( 'enabled' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:11: 'enabled'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1841:11: ( 'enabled' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1841:11: 'enabled'
             {
             match("enabled"); if (failed) return ;
 
@@ -1324,8 +1324,8 @@
     public final void mSALIENCE() throws RecognitionException {
         try {
             int _type = SALIENCE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:4: ( 'salience' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:4: 'salience'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1844:4: ( 'salience' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1844:4: 'salience'
             {
             match("salience"); if (failed) return ;
 
@@ -1343,8 +1343,8 @@
     public final void mNO_LOOP() throws RecognitionException {
         try {
             int _type = NO_LOOP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:11: ( 'no-loop' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:11: 'no-loop'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1846:11: ( 'no-loop' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1846:11: 'no-loop'
             {
             match("no-loop"); if (failed) return ;
 
@@ -1362,8 +1362,8 @@
     public final void mAUTO_FOCUS() throws RecognitionException {
         try {
             int _type = AUTO_FOCUS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:4: ( 'auto-focus' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:4: 'auto-focus'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1849:4: ( 'auto-focus' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1849:4: 'auto-focus'
             {
             match("auto-focus"); if (failed) return ;
 
@@ -1381,8 +1381,8 @@
     public final void mACTIVATION_GROUP() throws RecognitionException {
         try {
             int _type = ACTIVATION_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:4: ( 'activation-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:4: 'activation-group'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1852:4: ( 'activation-group' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1852:4: 'activation-group'
             {
             match("activation-group"); if (failed) return ;
 
@@ -1400,8 +1400,8 @@
     public final void mAGENDA_GROUP() throws RecognitionException {
         try {
             int _type = AGENDA_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:4: ( 'agenda-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:4: 'agenda-group'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1855:4: ( 'agenda-group' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1855:4: 'agenda-group'
             {
             match("agenda-group"); if (failed) return ;
 
@@ -1419,8 +1419,8 @@
     public final void mDIALECT() throws RecognitionException {
         try {
             int _type = DIALECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:4: ( 'dialect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:4: 'dialect'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1858:4: ( 'dialect' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1858:4: 'dialect'
             {
             match("dialect"); if (failed) return ;
 
@@ -1438,8 +1438,8 @@
     public final void mRULEFLOW_GROUP() throws RecognitionException {
         try {
             int _type = RULEFLOW_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1848:4: ( 'ruleflow-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1848:4: 'ruleflow-group'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1861:4: ( 'ruleflow-group' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1861:4: 'ruleflow-group'
             {
             match("ruleflow-group"); if (failed) return ;
 
@@ -1457,8 +1457,8 @@
     public final void mDURATION() throws RecognitionException {
         try {
             int _type = DURATION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:4: ( 'duration' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:4: 'duration'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1864:4: ( 'duration' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1864:4: 'duration'
             {
             match("duration"); if (failed) return ;
 
@@ -1476,8 +1476,8 @@
     public final void mLOCK_ON_ACTIVE() throws RecognitionException {
         try {
             int _type = LOCK_ON_ACTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:4: ( 'lock-on-active' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:4: 'lock-on-active'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1867:4: ( 'lock-on-active' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1867:4: 'lock-on-active'
             {
             match("lock-on-active"); if (failed) return ;
 
@@ -1495,8 +1495,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:8: ( 'from' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:8: 'from'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1869:8: ( 'from' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1869:8: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -1514,8 +1514,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:4: ( 'accumulate' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:4: 'accumulate'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1872:4: ( 'accumulate' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1872:4: 'accumulate'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1533,8 +1533,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:8: ( 'init' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:8: 'init'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1874:8: ( 'init' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1874:8: 'init'
             {
             match("init"); if (failed) return ;
 
@@ -1552,8 +1552,8 @@
     public final void mACTION() throws RecognitionException {
         try {
             int _type = ACTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:10: ( 'action' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:10: 'action'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1876:10: ( 'action' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1876:10: 'action'
             {
             match("action"); if (failed) return ;
 
@@ -1571,8 +1571,8 @@
     public final void mRESULT() throws RecognitionException {
         try {
             int _type = RESULT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1865:10: ( 'result' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1865:10: 'result'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1878:10: ( 'result' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1878:10: 'result'
             {
             match("result"); if (failed) return ;
 
@@ -1590,8 +1590,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:11: ( 'collect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:11: 'collect'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1880:11: ( 'collect' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1880:11: 'collect'
             {
             match("collect"); if (failed) return ;
 
@@ -1609,8 +1609,8 @@
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:6: ( 'or' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:6: 'or'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1882:6: ( 'or' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1882:6: 'or'
             {
             match("or"); if (failed) return ;
 
@@ -1628,8 +1628,8 @@
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1871:7: ( 'and' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1871:7: 'and'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1884:7: ( 'and' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1884:7: 'and'
             {
             match("and"); if (failed) return ;
 
@@ -1647,8 +1647,8 @@
     public final void mCONTAINS() throws RecognitionException {
         try {
             int _type = CONTAINS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:4: ( 'contains' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:4: 'contains'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1887:4: ( 'contains' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1887:4: 'contains'
             {
             match("contains"); if (failed) return ;
 
@@ -1666,8 +1666,8 @@
     public final void mEXCLUDES() throws RecognitionException {
         try {
             int _type = EXCLUDES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:4: ( 'excludes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:4: 'excludes'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1890:4: ( 'excludes' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1890:4: 'excludes'
             {
             match("excludes"); if (failed) return ;
 
@@ -1685,8 +1685,8 @@
     public final void mMEMBEROF() throws RecognitionException {
         try {
             int _type = MEMBEROF;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:4: ( 'memberOf' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:4: 'memberOf'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1893:4: ( 'memberOf' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1893:4: 'memberOf'
             {
             match("memberOf"); if (failed) return ;
 
@@ -1704,8 +1704,8 @@
     public final void mMATCHES() throws RecognitionException {
         try {
             int _type = MATCHES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1882:11: ( 'matches' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1882:11: 'matches'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1895:11: ( 'matches' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1895:11: 'matches'
             {
             match("matches"); if (failed) return ;
 
@@ -1723,8 +1723,8 @@
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:6: ( 'in' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:6: 'in'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1897:6: ( 'in' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1897:6: 'in'
             {
             match("in"); if (failed) return ;
 
@@ -1742,8 +1742,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1886:8: ( 'null' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1886:8: 'null'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1899:8: ( 'null' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1899:8: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1761,8 +1761,8 @@
     public final void mEXISTS() throws RecognitionException {
         try {
             int _type = EXISTS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:10: ( 'exists' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:10: 'exists'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1901:10: ( 'exists' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1901:10: 'exists'
             {
             match("exists"); if (failed) return ;
 
@@ -1780,8 +1780,8 @@
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1890:7: ( 'not' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1890:7: 'not'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1903:7: ( 'not' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1903:7: 'not'
             {
             match("not"); if (failed) return ;
 
@@ -1799,8 +1799,8 @@
     public final void mEVAL() throws RecognitionException {
         try {
             int _type = EVAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:8: ( 'eval' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:8: 'eval'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1905:8: ( 'eval' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1905:8: 'eval'
             {
             match("eval"); if (failed) return ;
 
@@ -1818,8 +1818,8 @@
     public final void mFORALL() throws RecognitionException {
         try {
             int _type = FORALL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1894:10: ( 'forall' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1894:10: 'forall'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1907:10: ( 'forall' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1907:10: 'forall'
             {
             match("forall"); if (failed) return ;
 
@@ -1837,8 +1837,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1896:11: ( 'when' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1896:11: 'when'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1909:11: ( 'when' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1909:11: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -1856,8 +1856,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1898:12: ( 'then' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1898:12: 'then'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1911:12: ( 'then' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1911:12: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1875,8 +1875,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1900:11: ( 'end' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1900:11: 'end'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1913:11: ( 'end' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1913:11: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -1894,8 +1894,8 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1903:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1903:4: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1916:4: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1916: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();
@@ -1908,7 +1908,7 @@
                 recover(mse);    throw mse;
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1903:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1916:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
             loop14:
             do {
                 int alt14=2;
@@ -1921,7 +1921,7 @@
 
                 switch (alt14) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:
             	    {
             	    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();
@@ -1957,8 +1957,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1907:11: ( '(' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1907:11: '('
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1920:11: ( '(' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1920:11: '('
             {
             match('('); if (failed) return ;
 
@@ -1975,8 +1975,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:11: ( ')' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:11: ')'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1924:11: ( ')' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1924:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -1993,8 +1993,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1915:11: ( '[' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1915:11: '['
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1928:11: ( '[' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1928:11: '['
             {
             match('['); if (failed) return ;
 
@@ -2011,8 +2011,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1919:11: ( ']' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1919:11: ']'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1932:11: ( ']' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1932:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -2029,8 +2029,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1923:11: ( '{' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1923:11: '{'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1936:11: ( '{' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1936:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -2047,8 +2047,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:11: ( '}' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:11: '}'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1940:11: ( '}' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1940:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -2065,8 +2065,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1930:9: ( ',' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1930:9: ','
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1943:9: ( ',' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1943:9: ','
             {
             match(','); if (failed) return ;
 
@@ -2083,8 +2083,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1934:4: ( '&&' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1934:4: '&&'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1947:4: ( '&&' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1947:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -2102,8 +2102,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1938:4: ( '||' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1938:4: '||'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1951:4: ( '||' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1951:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -2121,11 +2121,11 @@
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1942:4: ( '#' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1942:4: '#' ( options {greedy=false; } : . )* EOL
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1955:4: ( '#' ( options {greedy=false; } : . )* EOL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1955:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1942:8: ( options {greedy=false; } : . )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1955:8: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -2144,7 +2144,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1942:35: .
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1955:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2174,12 +2174,12 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1948:4: ( '//' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1948:4: '//' ( options {greedy=false; } : . )* EOL
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1961:4: ( '//' ( options {greedy=false; } : . )* EOL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1961:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1948:9: ( options {greedy=false; } : . )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1961:9: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2198,7 +2198,7 @@
 
                 switch (alt16) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1948:36: .
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1961:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2228,12 +2228,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1953:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1953:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1966:4: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1966:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1953:9: ( options {greedy=false; } : . )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1966:9: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -2258,7 +2258,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1953:35: .
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1966:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2289,8 +2289,8 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1958:3: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1971:3: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:
             {
             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.LA(1)=='|' ) {
                 input.consume();
@@ -2314,502 +2314,502 @@
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: ( T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | RESULT | COLLECT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:10: ( T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | RESULT | COLLECT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
         int alt18=71;
         alt18 = dfa18.predict(input);
         switch (alt18) {
             case 1 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T69
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:10: T69
                 {
                 mT69(); if (failed) return ;
 
                 }
                 break;
             case 2 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T70
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:14: T70
                 {
                 mT70(); if (failed) return ;
 
                 }
                 break;
             case 3 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T71
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:18: T71
                 {
                 mT71(); if (failed) return ;
 
                 }
                 break;
             case 4 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T72
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:22: T72
                 {
                 mT72(); if (failed) return ;
 
                 }
                 break;
             case 5 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T73
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:26: T73
                 {
                 mT73(); if (failed) return ;
 
                 }
                 break;
             case 6 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T74
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:30: T74
                 {
                 mT74(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T75
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:34: T75
                 {
                 mT75(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T76
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:38: T76
                 {
                 mT76(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T77
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:42: T77
                 {
                 mT77(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T78
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:46: T78
                 {
                 mT78(); if (failed) return ;
 
                 }
                 break;
             case 11 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:50: T79
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:50: T79
                 {
                 mT79(); if (failed) return ;
 
                 }
                 break;
             case 12 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:54: WS
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:54: WS
                 {
                 mWS(); if (failed) return ;
 
                 }
                 break;
             case 13 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:57: INT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:57: INT
                 {
                 mINT(); if (failed) return ;
 
                 }
                 break;
             case 14 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:61: FLOAT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:61: FLOAT
                 {
                 mFLOAT(); if (failed) return ;
 
                 }
                 break;
             case 15 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:67: STRING
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:67: STRING
                 {
                 mSTRING(); if (failed) return ;
 
                 }
                 break;
             case 16 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:74: BOOL
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:74: BOOL
                 {
                 mBOOL(); if (failed) return ;
 
                 }
                 break;
             case 17 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:79: PACKAGE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:79: PACKAGE
                 {
                 mPACKAGE(); if (failed) return ;
 
                 }
                 break;
             case 18 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:87: IMPORT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:87: IMPORT
                 {
                 mIMPORT(); if (failed) return ;
 
                 }
                 break;
             case 19 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:94: FUNCTION
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:94: FUNCTION
                 {
                 mFUNCTION(); if (failed) return ;
 
                 }
                 break;
             case 20 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:103: GLOBAL
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:103: GLOBAL
                 {
                 mGLOBAL(); if (failed) return ;
 
                 }
                 break;
             case 21 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:110: RULE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:110: RULE
                 {
                 mRULE(); if (failed) return ;
 
                 }
                 break;
             case 22 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:115: QUERY
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:115: QUERY
                 {
                 mQUERY(); if (failed) return ;
 
                 }
                 break;
             case 23 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:121: TEMPLATE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:121: TEMPLATE
                 {
                 mTEMPLATE(); if (failed) return ;
 
                 }
                 break;
             case 24 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:130: ATTRIBUTES
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:130: ATTRIBUTES
                 {
                 mATTRIBUTES(); if (failed) return ;
 
                 }
                 break;
             case 25 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:141: DATE_EFFECTIVE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:141: DATE_EFFECTIVE
                 {
                 mDATE_EFFECTIVE(); if (failed) return ;
 
                 }
                 break;
             case 26 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:156: DATE_EXPIRES
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:156: DATE_EXPIRES
                 {
                 mDATE_EXPIRES(); if (failed) return ;
 
                 }
                 break;
             case 27 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:169: ENABLED
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:169: ENABLED
                 {
                 mENABLED(); if (failed) return ;
 
                 }
                 break;
             case 28 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:177: SALIENCE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:177: SALIENCE
                 {
                 mSALIENCE(); if (failed) return ;
 
                 }
                 break;
             case 29 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:186: NO_LOOP
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:186: NO_LOOP
                 {
                 mNO_LOOP(); if (failed) return ;
 
                 }
                 break;
             case 30 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:194: AUTO_FOCUS
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:194: AUTO_FOCUS
                 {
                 mAUTO_FOCUS(); if (failed) return ;
 
                 }
                 break;
             case 31 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:205: ACTIVATION_GROUP
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:205: ACTIVATION_GROUP
                 {
                 mACTIVATION_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 32 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:222: AGENDA_GROUP
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:222: AGENDA_GROUP
                 {
                 mAGENDA_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 33 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:235: DIALECT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:235: DIALECT
                 {
                 mDIALECT(); if (failed) return ;
 
                 }
                 break;
             case 34 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:243: RULEFLOW_GROUP
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:243: RULEFLOW_GROUP
                 {
                 mRULEFLOW_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 35 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:258: DURATION
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:258: DURATION
                 {
                 mDURATION(); if (failed) return ;
 
                 }
                 break;
             case 36 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:267: LOCK_ON_ACTIVE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:267: LOCK_ON_ACTIVE
                 {
                 mLOCK_ON_ACTIVE(); if (failed) return ;
 
                 }
                 break;
             case 37 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:282: FROM
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:282: FROM
                 {
                 mFROM(); if (failed) return ;
 
                 }
                 break;
             case 38 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:287: ACCUMULATE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:287: ACCUMULATE
                 {
                 mACCUMULATE(); if (failed) return ;
 
                 }
                 break;
             case 39 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:298: INIT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:298: INIT
                 {
                 mINIT(); if (failed) return ;
 
                 }
                 break;
             case 40 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:303: ACTION
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:303: ACTION
                 {
                 mACTION(); if (failed) return ;
 
                 }
                 break;
             case 41 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:310: RESULT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:310: RESULT
                 {
                 mRESULT(); if (failed) return ;
 
                 }
                 break;
             case 42 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:317: COLLECT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:317: COLLECT
                 {
                 mCOLLECT(); if (failed) return ;
 
                 }
                 break;
             case 43 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:325: OR
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:325: OR
                 {
                 mOR(); if (failed) return ;
 
                 }
                 break;
             case 44 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:328: AND
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:328: AND
                 {
                 mAND(); if (failed) return ;
 
                 }
                 break;
             case 45 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:332: CONTAINS
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:332: CONTAINS
                 {
                 mCONTAINS(); if (failed) return ;
 
                 }
                 break;
             case 46 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:341: EXCLUDES
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:341: EXCLUDES
                 {
                 mEXCLUDES(); if (failed) return ;
 
                 }
                 break;
             case 47 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:350: MEMBEROF
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:350: MEMBEROF
                 {
                 mMEMBEROF(); if (failed) return ;
 
                 }
                 break;
             case 48 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:359: MATCHES
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:359: MATCHES
                 {
                 mMATCHES(); if (failed) return ;
 
                 }
                 break;
             case 49 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:367: IN
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:367: IN
                 {
                 mIN(); if (failed) return ;
 
                 }
                 break;
             case 50 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:370: NULL
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:370: NULL
                 {
                 mNULL(); if (failed) return ;
 
                 }
                 break;
             case 51 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:375: EXISTS
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:375: EXISTS
                 {
                 mEXISTS(); if (failed) return ;
 
                 }
                 break;
             case 52 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:382: NOT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:382: NOT
                 {
                 mNOT(); if (failed) return ;
 
                 }
                 break;
             case 53 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:386: EVAL
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:386: EVAL
                 {
                 mEVAL(); if (failed) return ;
 
                 }
                 break;
             case 54 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:391: FORALL
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:391: FORALL
                 {
                 mFORALL(); if (failed) return ;
 
                 }
                 break;
             case 55 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:398: WHEN
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:398: WHEN
                 {
                 mWHEN(); if (failed) return ;
 
                 }
                 break;
             case 56 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:403: THEN
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:403: THEN
                 {
                 mTHEN(); if (failed) return ;
 
                 }
                 break;
             case 57 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:408: END
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:408: END
                 {
                 mEND(); if (failed) return ;
 
                 }
                 break;
             case 58 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:412: ID
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:412: ID
                 {
                 mID(); if (failed) return ;
 
                 }
                 break;
             case 59 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:415: LEFT_PAREN
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:415: LEFT_PAREN
                 {
                 mLEFT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 60 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:426: RIGHT_PAREN
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:426: RIGHT_PAREN
                 {
                 mRIGHT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 61 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:438: LEFT_SQUARE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:438: LEFT_SQUARE
                 {
                 mLEFT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 62 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:450: RIGHT_SQUARE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:450: RIGHT_SQUARE
                 {
                 mRIGHT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 63 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:463: LEFT_CURLY
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:463: LEFT_CURLY
                 {
                 mLEFT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 64 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:474: RIGHT_CURLY
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:474: RIGHT_CURLY
                 {
                 mRIGHT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 65 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:486: COMMA
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:486: COMMA
                 {
                 mCOMMA(); if (failed) return ;
 
                 }
                 break;
             case 66 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:492: DOUBLE_AMPER
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:492: DOUBLE_AMPER
                 {
                 mDOUBLE_AMPER(); if (failed) return ;
 
                 }
                 break;
             case 67 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:505: DOUBLE_PIPE
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:505: DOUBLE_PIPE
                 {
                 mDOUBLE_PIPE(); if (failed) return ;
 
                 }
                 break;
             case 68 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:517: SH_STYLE_SINGLE_LINE_COMMENT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:517: SH_STYLE_SINGLE_LINE_COMMENT
                 {
                 mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 69 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:546: C_STYLE_SINGLE_LINE_COMMENT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:546: C_STYLE_SINGLE_LINE_COMMENT
                 {
                 mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 70 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:574: MULTI_LINE_COMMENT
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:574: MULTI_LINE_COMMENT
                 {
                 mMULTI_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 71 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:593: MISC
+                // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1:593: MISC
                 {
                 mMISC(); if (failed) return ;
 
@@ -2822,8 +2822,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:14: ( '\\r\\n' )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:16: '\\r\\n'
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:14: ( '\\r\\n' )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1771:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2852,81 +2852,78 @@
     static final String DFA18_eotS =
         "\3\uffff\1\55\2\53\1\61\1\63\1\53\1\uffff\1\65\1\uffff\1\53\21\52"+
         "\10\uffff\2\53\1\uffff\1\53\15\uffff\10\52\1\146\25\52\1\u0081\3"+
-        "\52\4\uffff\11\52\1\uffff\6\52\1\u0094\11\52\1\u009e\3\52\1\uffff"+
-        "\1\u00a2\4\52\1\uffff\3\52\1\u00aa\1\u00ab\4\52\1\u00b0\1\52\1\u00b2"+
-        "\2\52\1\u00b6\3\52\1\uffff\11\52\1\uffff\1\52\1\u00c5\1\52\1\uffff"+
-        "\1\u00c7\5\52\1\u00cd\2\uffff\2\52\1\u00aa\1\52\1\uffff\1\52\1\uffff"+
-        "\3\52\1\uffff\1\52\1\u00d6\4\52\1\uffff\2\52\1\uffff\4\52\1\uffff"+
-        "\1\52\2\uffff\4\52\1\uffff\1\52\1\u00e8\2\52\1\u00eb\1\u00ec\1\52"+
-        "\1\u00ee\1\uffff\1\52\1\u00f0\4\52\1\uffff\1\52\1\u00f8\10\52\1"+
-        "\uffff\1\52\1\u0102\2\uffff\1\52\1\uffff\1\52\1\uffff\2\52\1\uffff"+
-        "\1\u0107\2\uffff\1\52\1\uffff\1\52\1\u010a\2\52\1\u010d\1\u010e"+
-        "\1\52\1\u0110\1\u0111\1\uffff\4\52\1\uffff\1\u0116\1\u0117\1\uffff"+
-        "\1\u0118\1\u0119\2\uffff\1\u011a\3\uffff\3\52\5\uffff\1\u011e\1"+
-        "\52\1\u0120\3\uffff";
+        "\52\4\uffff\11\52\1\uffff\5\52\1\u0093\12\52\1\u009e\4\52\1\u00a3"+
+        "\1\uffff\3\52\1\uffff\3\52\1\u00aa\1\u00ab\4\52\1\u00b0\1\52\1\u00b2"+
+        "\3\52\1\u00b7\1\52\1\uffff\12\52\1\uffff\1\52\1\u00c5\1\52\1\u00c7"+
+        "\1\uffff\5\52\1\u00cd\2\uffff\3\52\1\u00ab\1\uffff\1\52\1\uffff"+
+        "\4\52\1\uffff\1\u00d6\3\52\1\uffff\2\52\1\uffff\5\52\1\uffff\1\52"+
+        "\2\uffff\4\52\1\uffff\2\52\1\u00e9\1\52\1\u00eb\1\u00ec\1\u00ed"+
+        "\1\52\1\uffff\1\52\1\u00f0\3\52\1\uffff\3\52\1\u00f9\10\52\1\uffff"+
+        "\1\u0102\3\uffff\2\52\1\uffff\2\52\3\uffff\1\52\1\u0108\1\52\1\uffff"+
+        "\1\u010a\1\52\1\u010c\2\52\1\u010f\1\u0110\1\u0111\1\uffff\4\52"+
+        "\1\u0116\1\uffff\1\u0117\1\uffff\1\u0118\1\uffff\1\u0119\1\u011a"+
+        "\4\uffff\3\52\5\uffff\1\52\1\u011f\1\u0120\3\uffff";
     static final String DFA18_eofS =
         "\u0121\uffff";
     static final String DFA18_minS =
         "\1\11\2\uffff\1\52\1\60\4\75\1\uffff\1\56\1\uffff\1\0\1\145\2\141"+
         "\1\155\1\154\1\145\1\165\1\143\1\141\1\156\1\141\3\157\1\162\1\141"+
-        "\1\150\10\uffff\1\46\1\174\1\uffff\1\52\15\uffff\1\165\1\145\1\155"+
-        "\1\162\1\154\1\156\1\157\1\143\1\60\1\160\1\157\1\154\1\163\1\145"+
-        "\1\164\1\144\1\143\1\164\1\145\1\141\1\164\1\162\1\143\2\141\1\154"+
-        "\1\55\1\154\1\143\1\154\1\60\1\164\1\155\1\145\4\uffff\1\145\1\156"+
-        "\1\160\1\141\1\163\1\143\1\155\1\153\1\164\1\uffff\1\157\1\142\1"+
-        "\145\1\165\2\162\1\60\1\151\1\165\1\157\1\156\1\154\1\145\1\141"+
-        "\1\163\1\154\1\60\1\142\1\154\1\151\1\uffff\1\60\1\154\1\153\1\164"+
-        "\1\154\1\uffff\1\143\1\142\1\156\2\60\2\154\1\145\1\164\1\60\1\141"+
-        "\1\60\1\162\1\141\1\60\1\154\1\171\1\151\1\uffff\1\157\1\155\1\55"+
-        "\1\144\1\145\1\55\2\164\1\165\1\uffff\1\154\1\60\1\145\1\uffff\1"+
-        "\60\1\55\1\141\1\145\1\150\1\145\1\60\2\uffff\1\141\1\154\1\60\1"+
-        "\151\1\uffff\1\147\1\uffff\1\164\2\154\1\uffff\1\164\1\60\1\142"+
-        "\1\156\1\141\1\165\1\uffff\1\141\1\143\1\145\1\151\1\163\1\144\1"+
-        "\145\1\uffff\1\156\2\uffff\1\151\1\143\1\145\1\162\1\uffff\1\164"+
-        "\1\60\1\157\1\145\2\60\1\157\1\60\1\uffff\1\165\1\60\1\164\1\154"+
-        "\1\55\1\164\1\146\1\157\1\60\1\145\1\144\1\143\1\156\1\164\1\163"+
-        "\1\117\1\145\1\uffff\1\156\1\60\2\uffff\1\167\1\uffff\1\164\1\uffff"+
-        "\1\151\1\141\1\uffff\1\60\2\uffff\1\156\1\uffff\1\163\1\60\1\145"+
-        "\1\163\2\60\1\146\2\60\1\uffff\1\55\1\145\1\157\1\164\1\uffff\2"+
-        "\60\1\uffff\2\60\2\uffff\1\60\3\uffff\1\163\1\156\1\145\5\uffff"+
-        "\1\60\1\55\1\60\3\uffff";
+        "\1\150\10\uffff\1\46\1\174\1\uffff\1\52\15\uffff\1\145\1\165\1\155"+
+        "\1\156\1\162\1\154\1\157\1\143\1\60\1\160\1\157\1\163\1\154\1\145"+
+        "\1\144\1\143\2\164\1\145\1\164\1\162\1\141\1\143\2\141\2\154\1\55"+
+        "\1\143\1\154\1\60\1\155\1\164\1\145\4\uffff\1\156\1\145\1\160\1"+
+        "\143\1\141\1\163\1\155\1\153\1\164\1\uffff\1\157\1\142\1\165\1\145"+
+        "\1\162\1\60\1\151\1\165\1\157\1\162\1\156\1\145\1\141\2\154\1\163"+
+        "\1\60\1\142\1\154\1\151\1\154\1\60\1\uffff\1\153\1\154\1\164\1\uffff"+
+        "\1\142\1\143\1\156\2\60\1\154\1\164\1\154\1\145\1\60\1\141\1\60"+
+        "\1\162\1\141\1\154\1\60\1\171\1\uffff\1\157\1\155\1\55\1\151\1\144"+
+        "\1\55\1\164\1\145\1\165\1\164\1\uffff\1\154\1\60\1\145\1\60\1\uffff"+
+        "\1\55\1\145\1\141\1\145\1\150\1\60\2\uffff\1\141\1\151\1\154\1\60"+
+        "\1\uffff\1\147\1\uffff\1\164\1\154\1\164\1\154\1\uffff\1\60\1\141"+
+        "\1\156\1\165\1\uffff\1\142\1\141\1\145\1\151\1\143\1\144\1\163\1"+
+        "\145\1\uffff\1\156\2\uffff\1\143\1\151\1\162\1\145\1\uffff\1\164"+
+        "\1\157\1\60\1\145\3\60\1\157\1\uffff\1\164\1\60\1\154\1\165\1\55"+
+        "\1\146\1\157\1\164\1\145\1\60\1\144\1\143\1\164\1\156\1\117\1\163"+
+        "\1\145\1\156\1\uffff\1\60\3\uffff\1\167\1\151\1\uffff\1\141\1\164"+
+        "\3\uffff\1\156\1\60\1\163\1\uffff\1\60\1\145\1\60\1\163\1\146\3"+
+        "\60\1\uffff\1\55\1\157\1\164\1\145\1\60\1\uffff\1\60\1\uffff\1\60"+
+        "\1\uffff\2\60\4\uffff\1\156\1\145\1\163\5\uffff\1\55\2\60\3\uffff";
     static final String DFA18_maxS =
         "\1\u00ff\2\uffff\1\52\1\76\4\75\1\uffff\1\71\1\uffff\1\ufffe\1\162"+
         "\1\165\1\141\1\156\1\154\4\165\1\170\1\141\1\165\2\157\1\162\1\145"+
-        "\1\150\10\uffff\1\46\1\174\1\uffff\1\57\15\uffff\1\165\1\145\1\155"+
-        "\1\162\1\154\1\156\1\157\1\143\1\u00ff\1\160\1\157\1\154\1\163\1"+
-        "\145\1\164\1\144\2\164\1\145\1\141\1\164\1\162\1\151\1\144\1\141"+
-        "\1\154\1\164\1\154\1\143\1\156\1\u00ff\1\164\1\155\1\145\4\uffff"+
-        "\1\145\1\156\1\160\1\141\1\163\1\143\1\155\1\153\1\164\1\uffff\1"+
-        "\157\1\142\1\145\1\165\2\162\1\u00ff\1\151\1\165\1\157\1\156\1\154"+
-        "\1\145\1\141\1\163\1\154\1\u00ff\1\142\1\154\1\151\1\uffff\1\u00ff"+
-        "\1\154\1\153\1\164\1\154\1\uffff\1\143\1\142\1\156\2\u00ff\2\154"+
-        "\1\145\1\164\1\u00ff\1\141\1\u00ff\1\162\1\141\1\u00ff\1\154\1\171"+
-        "\1\151\1\uffff\1\166\1\155\1\55\1\144\1\145\1\55\2\164\1\165\1\uffff"+
-        "\1\154\1\u00ff\1\145\1\uffff\1\u00ff\1\55\1\141\1\145\1\150\1\145"+
-        "\1\u00ff\2\uffff\1\141\1\154\1\u00ff\1\151\1\uffff\1\147\1\uffff"+
-        "\1\164\2\154\1\uffff\1\164\1\u00ff\1\142\1\156\1\141\1\165\1\uffff"+
-        "\1\141\1\143\1\145\1\151\1\163\1\144\1\145\1\uffff\1\156\2\uffff"+
-        "\1\151\1\143\1\145\1\162\1\uffff\1\164\1\u00ff\1\157\1\145\2\u00ff"+
-        "\1\157\1\u00ff\1\uffff\1\165\1\u00ff\1\164\1\154\1\55\1\164\1\170"+
-        "\1\157\1\u00ff\1\145\1\144\1\143\1\156\1\164\1\163\1\117\1\145\1"+
-        "\uffff\1\156\1\u00ff\2\uffff\1\167\1\uffff\1\164\1\uffff\1\151\1"+
-        "\141\1\uffff\1\u00ff\2\uffff\1\156\1\uffff\1\163\1\u00ff\1\145\1"+
-        "\163\2\u00ff\1\146\2\u00ff\1\uffff\1\55\1\145\1\157\1\164\1\uffff"+
-        "\2\u00ff\1\uffff\2\u00ff\2\uffff\1\u00ff\3\uffff\1\163\1\156\1\145"+
-        "\5\uffff\1\u00ff\1\55\1\u00ff\3\uffff";
+        "\1\150\10\uffff\1\46\1\174\1\uffff\1\57\15\uffff\1\145\1\165\1\155"+
+        "\1\156\1\162\1\154\1\157\1\143\1\u00ff\1\160\1\157\1\163\1\154\1"+
+        "\145\1\144\3\164\1\145\1\164\1\162\1\141\1\151\1\144\1\141\2\154"+
+        "\1\164\1\143\1\156\1\u00ff\1\155\1\164\1\145\4\uffff\1\156\1\145"+
+        "\1\160\1\143\1\141\1\163\1\155\1\153\1\164\1\uffff\1\157\1\142\1"+
+        "\165\1\145\1\162\1\u00ff\1\151\1\165\1\157\1\162\1\156\1\145\1\141"+
+        "\2\154\1\163\1\u00ff\1\142\1\154\1\151\1\154\1\u00ff\1\uffff\1\153"+
+        "\1\154\1\164\1\uffff\1\142\1\143\1\156\2\u00ff\1\154\1\164\1\154"+
+        "\1\145\1\u00ff\1\141\1\u00ff\1\162\1\141\1\154\1\u00ff\1\171\1\uffff"+
+        "\1\166\1\155\1\55\1\151\1\144\1\55\1\164\1\145\1\165\1\164\1\uffff"+
+        "\1\154\1\u00ff\1\145\1\u00ff\1\uffff\1\55\1\145\1\141\1\145\1\150"+
+        "\1\u00ff\2\uffff\1\141\1\151\1\154\1\u00ff\1\uffff\1\147\1\uffff"+
+        "\1\164\1\154\1\164\1\154\1\uffff\1\u00ff\1\141\1\156\1\165\1\uffff"+
+        "\1\142\1\141\1\145\1\151\1\143\1\144\1\163\1\145\1\uffff\1\156\2"+
+        "\uffff\1\143\1\151\1\162\1\145\1\uffff\1\164\1\157\1\u00ff\1\145"+
+        "\3\u00ff\1\157\1\uffff\1\164\1\u00ff\1\154\1\165\1\55\1\170\1\157"+
+        "\1\164\1\145\1\u00ff\1\144\1\143\1\164\1\156\1\117\1\163\1\145\1"+
+        "\156\1\uffff\1\u00ff\3\uffff\1\167\1\151\1\uffff\1\141\1\164\3\uffff"+
+        "\1\156\1\u00ff\1\163\1\uffff\1\u00ff\1\145\1\u00ff\1\163\1\146\3"+
+        "\u00ff\1\uffff\1\55\1\157\1\164\1\145\1\u00ff\1\uffff\1\u00ff\1"+
+        "\uffff\1\u00ff\1\uffff\2\u00ff\4\uffff\1\156\1\145\1\163\5\uffff"+
+        "\1\55\2\u00ff\3\uffff";
     static final String DFA18_acceptS =
         "\1\uffff\1\1\1\2\6\uffff\1\14\1\uffff\1\17\22\uffff\1\72\1\73\1"+
         "\74\1\75\1\76\1\77\1\100\1\101\2\uffff\1\104\1\uffff\1\72\1\107"+
         "\1\4\1\3\1\5\1\6\1\10\1\7\1\12\1\11\1\13\1\15\1\16\42\uffff\1\102"+
-        "\1\103\1\106\1\105\11\uffff\1\61\24\uffff\1\35\5\uffff\1\53\22\uffff"+
-        "\1\54\11\uffff\1\71\3\uffff\1\64\7\uffff\1\20\1\70\4\uffff\1\45"+
-        "\1\uffff\1\47\3\uffff\1\25\6\uffff\1\36\7\uffff\1\65\1\uffff\1\62"+
-        "\1\44\4\uffff\1\67\10\uffff\1\26\21\uffff\1\66\2\uffff\1\22\1\24"+
-        "\1\uffff\1\51\1\uffff\1\50\2\uffff\1\40\1\uffff\1\32\1\31\1\uffff"+
-        "\1\63\11\uffff\1\21\4\uffff\1\41\2\uffff\1\33\2\uffff\1\52\1\60"+
-        "\1\uffff\1\27\1\23\1\42\3\uffff\1\43\1\56\1\34\1\55\1\57\3\uffff"+
-        "\1\30\1\37\1\46";
+        "\1\103\1\106\1\105\11\uffff\1\61\26\uffff\1\35\3\uffff\1\53\21\uffff"+
+        "\1\54\12\uffff\1\71\4\uffff\1\64\6\uffff\1\70\1\20\4\uffff\1\45"+
+        "\1\uffff\1\47\4\uffff\1\25\4\uffff\1\36\10\uffff\1\65\1\uffff\1"+
+        "\62\1\44\4\uffff\1\67\10\uffff\1\26\22\uffff\1\66\1\uffff\1\22\1"+
+        "\24\1\51\2\uffff\1\50\2\uffff\1\40\1\32\1\31\3\uffff\1\63\10\uffff"+
+        "\1\21\5\uffff\1\41\1\uffff\1\33\1\uffff\1\52\2\uffff\1\60\1\27\1"+
+        "\23\1\42\3\uffff\1\43\1\56\1\34\1\55\1\57\3\uffff\1\37\1\46\1\30";
     static final String DFA18_specialS =
         "\u0121\uffff}>";
     static final String[] DFA18_transitionS = {
@@ -2948,22 +2945,22 @@
             "\1\66\1\uffff\12\12",
             "",
             "\uffff\13",
-            "\1\71\2\uffff\1\70\11\uffff\1\67",
-            "\1\73\15\uffff\1\72\2\uffff\1\75\2\uffff\1\74",
+            "\1\71\2\uffff\1\67\11\uffff\1\70",
+            "\1\74\15\uffff\1\73\2\uffff\1\75\2\uffff\1\72",
             "\1\76",
             "\1\100\1\77",
             "\1\101",
-            "\1\103\17\uffff\1\102",
+            "\1\102\17\uffff\1\103",
             "\1\104",
-            "\1\107\3\uffff\1\111\6\uffff\1\106\5\uffff\1\105\1\110",
-            "\1\113\7\uffff\1\112\13\uffff\1\114",
+            "\1\106\3\uffff\1\111\6\uffff\1\105\5\uffff\1\110\1\107",
+            "\1\112\7\uffff\1\114\13\uffff\1\113",
             "\1\116\7\uffff\1\117\1\uffff\1\115",
             "\1\120",
-            "\1\121\5\uffff\1\122",
+            "\1\122\5\uffff\1\121",
             "\1\123",
             "\1\124",
             "\1\125",
-            "\1\126\3\uffff\1\127",
+            "\1\127\3\uffff\1\126",
             "\1\130",
             "",
             "",
@@ -3006,21 +3003,21 @@
             "\1\152",
             "\1\153",
             "\1\154",
-            "\1\155",
-            "\1\157\20\uffff\1\156",
+            "\1\156\20\uffff\1\155",
+            "\1\157",
             "\1\160",
             "\1\161",
             "\1\162",
             "\1\163",
             "\1\164",
-            "\1\166\5\uffff\1\165",
+            "\1\165\5\uffff\1\166",
             "\1\170\2\uffff\1\167",
             "\1\171",
             "\1\172",
-            "\1\173\106\uffff\1\174",
-            "\1\175",
+            "\1\173",
+            "\1\175\106\uffff\1\174",
             "\1\176",
-            "\1\u0080\1\uffff\1\177",
+            "\1\177\1\uffff\1\u0080",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\1\u0082",
@@ -3045,9 +3042,9 @@
             "\1\u0090",
             "\1\u0091",
             "\1\u0092",
-            "\1\u0093",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "\1\u0094",
             "\1\u0095",
             "\1\u0096",
             "\1\u0097",
@@ -3062,10 +3059,10 @@
             "\1\u009f",
             "\1\u00a0",
             "\1\u00a1",
-            "",
+            "\1\u00a2",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u00a3",
+            "",
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
@@ -3088,13 +3085,13 @@
             "\52",
             "\1\u00b3",
             "\1\u00b4",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\5\52\1\u00b5\24\52"+
+            "\1\u00b5",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\5\52\1\u00b6\24\52"+
             "\105\uffff\100\52",
-            "\1\u00b7",
             "\1\u00b8",
-            "\1\u00b9",
             "",
-            "\1\u00ba\6\uffff\1\u00bb",
+            "\1\u00ba\6\uffff\1\u00b9",
+            "\1\u00bb",
             "\1\u00bc",
             "\1\u00bd",
             "\1\u00be",
@@ -3108,9 +3105,9 @@
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\1\u00c6",
-            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "",
             "\1\u00c8",
             "\1\u00c9",
             "\1\u00ca",
@@ -3122,24 +3119,24 @@
             "",
             "\1\u00ce",
             "\1\u00cf",
+            "\1\u00d0",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u00d0",
             "",
             "\1\u00d1",
             "",
             "\1\u00d2",
             "\1\u00d3",
             "\1\u00d4",
-            "",
             "\1\u00d5",
+            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\1\u00d7",
             "\1\u00d8",
             "\1\u00d9",
-            "\1\u00da",
             "",
+            "\1\u00da",
             "\1\u00db",
             "\1\u00dc",
             "\1\u00dd",
@@ -3157,17 +3154,17 @@
             "\1\u00e6",
             "",
             "\1\u00e7",
+            "\1\u00e8",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u00e9",
             "\1\u00ea",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u00ed",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "\1\u00ee",
             "",
             "\1\u00ef",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
@@ -3175,12 +3172,12 @@
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
-            "\1\u00f4",
-            "\1\u00f6\21\uffff\1\u00f5",
+            "\1\u00f5\21\uffff\1\u00f4",
+            "\1\u00f6",
             "\1\u00f7",
+            "\1\u00f8",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u00f9",
             "\1\u00fa",
             "\1\u00fb",
             "\1\u00fc",
@@ -3188,35 +3185,35 @@
             "\1\u00fe",
             "\1\u00ff",
             "\1\u0100",
-            "",
             "\1\u0101",
+            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "",
             "",
-            "\1\u0103",
             "",
+            "\1\u0103",
             "\1\u0104",
             "",
             "\1\u0105",
             "\1\u0106",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
             "",
             "",
-            "\1\u0108",
-            "",
+            "\1\u0107",
+            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
+            "\52",
             "\1\u0109",
+            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\1\u010b",
-            "\1\u010c",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "\1\u010d",
+            "\1\u010e",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u010f",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
@@ -3226,23 +3223,23 @@
             "\1\u0113",
             "\1\u0114",
             "\1\u0115",
-            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
+            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "",
-            "",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "",
             "",
             "",
+            "",
             "\1\u011b",
             "\1\u011c",
             "\1\u011d",
@@ -3251,9 +3248,9 @@
             "",
             "",
             "",
+            "\1\u011e",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
-            "\1\u011f",
             "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
             "\52",
             "",

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-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1,15 +1,15 @@
-// $ANTLR 3.0 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-05-25 16:51:44
+// $ANTLR 3.0 C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g 2007-06-03 02:26:07
+
+	package org.drools.lang;
+	import java.util.List;
+	import java.util.ArrayList;
+	import java.util.Iterator;
+	import java.util.HashMap;	
+	import java.util.StringTokenizer;
+	import org.drools.lang.descr.*;
+	import org.drools.compiler.SwitchingCommonTokenStream;
 
-	package org.drools.lang;
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-	import org.drools.compiler.SwitchingCommonTokenStream;
 
-
 import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
@@ -18,251 +18,251 @@
 import java.util.HashMap;
 public class DRLParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "ATTRIBUTES", "PACKAGE", "IMPORT", "FUNCTION", "GLOBAL", "QUERY", "END", "TEMPLATE", "RULE", "WHEN", "DATE_EFFECTIVE", "STRING", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "DIALECT", "LOCK_ON_ACTIVE", "ACCUMULATE", "LEFT_PAREN", "COMMA", "INIT", "ACTION", "RESULT", "RIGHT_PAREN", "COLLECT", "ID", "OR", "DOUBLE_PIPE", "DOUBLE_AMPER", "EVAL", "CONTAINS", "NOT", "EXCLUDES", "MATCHES", "MEMBEROF", "IN", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "AND", "FROM", "EXISTS", "FORALL", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "':'", "'.'", "'.*'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "ATTRIBUTES", "PACKAGE", "IMPORT", "FUNCTION", "GLOBAL", "QUERY", "LEFT_PAREN", "ID", "RIGHT_PAREN", "END", "TEMPLATE", "RULE", "WHEN", "DATE_EFFECTIVE", "STRING", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "DIALECT", "LOCK_ON_ACTIVE", "ACCUMULATE", "COMMA", "INIT", "ACTION", "RESULT", "COLLECT", "OR", "DOUBLE_PIPE", "DOUBLE_AMPER", "EVAL", "CONTAINS", "NOT", "EXCLUDES", "MATCHES", "MEMBEROF", "IN", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "AND", "FROM", "EXISTS", "FORALL", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "':'", "'.'", "'.*'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='"
     };
-    public static final int EXISTS=56;
-    public static final int COMMA=31;
-    public static final int AUTO_FOCUS=22;
-    public static final int END=10;
-    public static final int HexDigit=62;
-    public static final int FORALL=57;
-    public static final int TEMPLATE=11;
-    public static final int MISC=68;
-    public static final int FLOAT=48;
-    public static final int QUERY=9;
-    public static final int THEN=58;
-    public static final int RULE=12;
-    public static final int INIT=32;
-    public static final int IMPORT=6;
-    public static final int DATE_EFFECTIVE=14;
     public static final int PACKAGE=5;
-    public static final int OR=38;
-    public static final int DOUBLE_PIPE=39;
-    public static final int AND=54;
     public static final int FUNCTION=7;
-    public static final int GLOBAL=8;
-    public static final int EscapeSequence=61;
-    public static final int DIALECT=27;
-    public static final int INT=20;
-    public static final int LOCK_ON_ACTIVE=28;
-    public static final int DATE_EXPIRES=16;
-    public static final int LEFT_SQUARE=52;
+    public static final int ACCUMULATE=32;
+    public static final int RIGHT_SQUARE=53;
+    public static final int ACTIVATION_GROUP=26;
+    public static final int RIGHT_CURLY=51;
+    public static final int ATTRIBUTES=4;
+    public static final int DIALECT=30;
     public static final int CONTAINS=42;
+    public static final int NO_LOOP=24;
+    public static final int MEMBEROF=46;
+    public static final int LOCK_ON_ACTIVE=31;
+    public static final int AGENDA_GROUP=28;
+    public static final int FLOAT=48;
     public static final int SH_STYLE_SINGLE_LINE_COMMENT=65;
-    public static final int ATTRIBUTES=4;
-    public static final int LEFT_CURLY=50;
-    public static final int RESULT=34;
-    public static final int FROM=55;
-    public static final int ID=37;
-    public static final int ACTIVATION_GROUP=23;
-    public static final int LEFT_PAREN=30;
+    public static final int NOT=43;
+    public static final int AND=54;
+    public static final int ID=11;
+    public static final int EOF=-1;
+    public static final int HexDigit=62;
+    public static final int DATE_EFFECTIVE=17;
+    public static final int ACTION=35;
+    public static final int DOUBLE_PIPE=39;
+    public static final int RIGHT_PAREN=12;
+    public static final int IMPORT=6;
+    public static final int EOL=59;
     public static final int DOUBLE_AMPER=40;
-    public static final int RIGHT_CURLY=51;
+    public static final int THEN=58;
+    public static final int IN=47;
+    public static final int MATCHES=45;
+    public static final int COMMA=33;
+    public static final int ENABLED=20;
+    public static final int EXISTS=56;
+    public static final int RULE=15;
     public static final int EXCLUDES=44;
-    public static final int BOOL=18;
-    public static final int MEMBEROF=46;
-    public static final int WHEN=13;
-    public static final int RULEFLOW_GROUP=24;
+    public static final int AUTO_FOCUS=25;
+    public static final int NULL=49;
+    public static final int BOOL=21;
+    public static final int FORALL=57;
+    public static final int SALIENCE=22;
+    public static final int RULEFLOW_GROUP=27;
+    public static final int RESULT=36;
+    public static final int INT=23;
+    public static final int MULTI_LINE_COMMENT=67;
+    public static final int DURATION=29;
     public static final int WS=60;
-    public static final int STRING=15;
-    public static final int ACTION=33;
-    public static final int COLLECT=36;
-    public static final int IN=47;
-    public static final int NO_LOOP=21;
-    public static final int ACCUMULATE=29;
+    public static final int TEMPLATE=14;
+    public static final int EVAL=41;
+    public static final int WHEN=16;
     public static final int UnicodeEscape=63;
-    public static final int DURATION=26;
-    public static final int EVAL=41;
-    public static final int MATCHES=45;
-    public static final int EOF=-1;
-    public static final int EOL=59;
-    public static final int NULL=49;
-    public static final int AGENDA_GROUP=25;
+    public static final int LEFT_CURLY=50;
+    public static final int OR=38;
+    public static final int LEFT_PAREN=10;
+    public static final int QUERY=9;
+    public static final int MISC=68;
+    public static final int FROM=55;
+    public static final int END=13;
+    public static final int GLOBAL=8;
+    public static final int COLLECT=37;
+    public static final int LEFT_SQUARE=52;
+    public static final int INIT=34;
     public static final int OctalEscape=64;
-    public static final int SALIENCE=19;
-    public static final int MULTI_LINE_COMMENT=67;
-    public static final int RIGHT_PAREN=35;
-    public static final int NOT=43;
-    public static final int ENABLED=17;
-    public static final int RIGHT_SQUARE=53;
+    public static final int EscapeSequence=61;
     public static final int C_STYLE_SINGLE_LINE_COMMENT=66;
+    public static final int DATE_EXPIRES=19;
+    public static final int STRING=18;
 
         public DRLParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[222+1];
+            ruleMemo = new HashMap[225+1];
          }
         
 
     public String[] getTokenNames() { return tokenNames; }
-    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
+    public String getGrammarFileName() { return "C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g"; }
 
+    
+    	private PackageDescr packageDescr;
+    	private List errors = new ArrayList();
+    	private String source = "unknown";
+    	private int lineOffset = 0;
+    	private DescrFactory factory = new DescrFactory();
+    	private boolean parserDebug = false;
+    	private Location location = new Location( Location.LOCATION_UNKNOWN );
+    	
+    	// THE FOLLOWING LINES ARE DUMMY ATTRIBUTES TO WORK AROUND AN ANTLR BUG
+    	private BaseDescr from = null;
+    	private FieldConstraintDescr fc = null;
+    	private RestrictionConnectiveDescr and = null;
+    	private RestrictionConnectiveDescr or = null;
+    	private ConditionalElementDescr base = null;
+    	
+    	public void setParserDebug(boolean parserDebug) {
+    		this.parserDebug = parserDebug;
+    	}
+    	
+    	public void debug(String message) {
+    		if ( parserDebug ) 
+    			System.err.println( "drl parser: " + message );
+    	}
+    	
+    	public void setSource(String source) {
+    		this.source = source;
+    	}
+    	public DescrFactory getFactory() {
+    		return factory;
+    	}	
+    
+    	public String getSource() {
+    		return this.source;
+    	}
+    	
+    	public PackageDescr getPackageDescr() {
+    		return packageDescr;
+    	}
+    	
+    	private int offset(int line) {
+    		return line + lineOffset;
+    	}
+    	
+    	/**
+    	 * This will set the offset to record when reparsing. Normally is zero of course 
+    	 */
+    	public void setLineOffset(int i) {
+    	 	this.lineOffset = i;
+    	}
+    	
+    	private String getString(Token token) {
+    		String orig = token.getText();
+    		return orig.substring( 1, orig.length() -1 );
+    	}
+    	
+    	public void reportError(RecognitionException ex) {
+    	        // if we've already reported an error and have not matched a token
+                    // yet successfully, don't report any errors.
+                    if ( errorRecovery ) {
+                            return;
+                    }
+                    errorRecovery = true;
+    
+    		ex.line = offset(ex.line); //add the offset if there is one
+    		errors.add( ex ); 
+    	}
+         	
+         	/** return the raw RecognitionException errors */
+         	public List getErrors() {
+         		return errors;
+         	}
+         	
+         	/** Return a list of pretty strings summarising the errors */
+         	public List getErrorMessages() {
+         		List messages = new ArrayList();
+     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
+         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+         	     	}
+         	     	return messages;
+         	}
+         	
+         	/** return true if any parser errors were accumulated */
+         	public boolean hasErrors() {
+      		return ! errors.isEmpty();
+         	}
+         	
+         	/** This will take a RecognitionException, and create a sensible error message out of it */
+         	public String createErrorMessage(RecognitionException e)
+            {
+    		StringBuffer message = new StringBuffer();		
+                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
+                    if ( e instanceof MismatchedTokenException ) {
+                            MismatchedTokenException mte = (MismatchedTokenException)e;
+                            message.append("mismatched token: "+
+                                                               e.token+
+                                                               "; expecting type "+
+                                                               tokenNames[mte.expecting]);
+                    }
+                    else if ( e instanceof MismatchedTreeNodeException ) {
+                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+                            message.append("mismatched tree node: "+
+                                                               mtne.toString() +
+                                                               "; expecting type "+
+                                                               tokenNames[mtne.expecting]);
+                    }
+                    else if ( e instanceof NoViableAltException ) {
+                            NoViableAltException nvae = (NoViableAltException)e;
+    			message.append( "Unexpected token '" + e.token.getText() + "'" );
+                            /*
+                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+                                                               " state "+nvae.stateNumber+
+                                                               " (decision="+nvae.decisionNumber+
+                                                               ") no viable alt; token="+
+                                                               e.token);
+                                                               */
+                    }
+                    else if ( e instanceof EarlyExitException ) {
+                            EarlyExitException eee = (EarlyExitException)e;
+                            message.append("required (...)+ loop (decision="+
+                                                               eee.decisionNumber+
+                                                               ") did not match anything; token="+
+                                                               e.token);
+                    }
+                    else if ( e instanceof MismatchedSetException ) {
+                            MismatchedSetException mse = (MismatchedSetException)e;
+                            message.append("mismatched token '"+
+                                                               e.token+
+                                                               "' expecting set "+mse.expecting);
+                    }
+                    else if ( e instanceof MismatchedNotSetException ) {
+                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
+                            message.append("mismatched token '"+
+                                                               e.token+
+                                                               "' expecting set "+mse.expecting);
+                    }
+                    else if ( e instanceof FailedPredicateException ) {
+                            FailedPredicateException fpe = (FailedPredicateException)e;
+                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
+                                                               fpe.predicateText+"}?");
+                    } else if (e instanceof GeneralParseException) {
+    			message.append(" " + e.getMessage());
+    		}
+                   	return message.toString();
+            }   
+            
+            void checkTrailingSemicolon(String text, int line) {
+            	if (text.trim().endsWith( ";" ) ) {
+            		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
+            	}
+            }
+            
+            public Location getLocation() {
+                    return this.location;
+            }
+          
 
-    	private PackageDescr packageDescr;
-    	private List errors = new ArrayList();
-    	private String source = "unknown";
-    	private int lineOffset = 0;
-    	private DescrFactory factory = new DescrFactory();
-    	private boolean parserDebug = false;
-    	private Location location = new Location( Location.LOCATION_UNKNOWN );
-    	
-    	// THE FOLLOWING LINES ARE DUMMY ATTRIBUTES TO WORK AROUND AN ANTLR BUG
-    	private BaseDescr from = null;
-    	private FieldConstraintDescr fc = null;
-    	private RestrictionConnectiveDescr and = null;
-    	private RestrictionConnectiveDescr or = null;
-    	private ConditionalElementDescr base = null;
-    	
-    	public void setParserDebug(boolean parserDebug) {
-    		this.parserDebug = parserDebug;
-    	}
-    	
-    	public void debug(String message) {
-    		if ( parserDebug ) 
-    			System.err.println( "drl parser: " + message );
-    	}
-    	
-    	public void setSource(String source) {
-    		this.source = source;
-    	}
-    	public DescrFactory getFactory() {
-    		return factory;
-    	}	
 
-    	public String getSource() {
-    		return this.source;
-    	}
-    	
-    	public PackageDescr getPackageDescr() {
-    		return packageDescr;
-    	}
-    	
-    	private int offset(int line) {
-    		return line + lineOffset;
-    	}
-    	
-    	/**
-    	 * This will set the offset to record when reparsing. Normally is zero of course 
-    	 */
-    	public void setLineOffset(int i) {
-    	 	this.lineOffset = i;
-    	}
-    	
-    	private String getString(Token token) {
-    		String orig = token.getText();
-    		return orig.substring( 1, orig.length() -1 );
-    	}
-    	
-    	public void reportError(RecognitionException ex) {
-    	        // if we've already reported an error and have not matched a token
-                    // yet successfully, don't report any errors.
-                    if ( errorRecovery ) {
-                            return;
-                    }
-                    errorRecovery = true;
 
-    		ex.line = offset(ex.line); //add the offset if there is one
-    		errors.add( ex ); 
-    	}
-         	
-         	/** return the raw RecognitionException errors */
-         	public List getErrors() {
-         		return errors;
-         	}
-         	
-         	/** Return a list of pretty strings summarising the errors */
-         	public List getErrorMessages() {
-         		List messages = new ArrayList();
-     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-         	     	}
-         	     	return messages;
-         	}
-         	
-         	/** return true if any parser errors were accumulated */
-         	public boolean hasErrors() {
-      		return ! errors.isEmpty();
-         	}
-         	
-         	/** This will take a RecognitionException, and create a sensible error message out of it */
-         	public String createErrorMessage(RecognitionException e)
-            {
-    		StringBuffer message = new StringBuffer();		
-                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                    if ( e instanceof MismatchedTokenException ) {
-                            MismatchedTokenException mte = (MismatchedTokenException)e;
-                            message.append("mismatched token: "+
-                                                               e.token+
-                                                               "; expecting type "+
-                                                               tokenNames[mte.expecting]);
-                    }
-                    else if ( e instanceof MismatchedTreeNodeException ) {
-                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                            message.append("mismatched tree node: "+
-                                                               mtne.toString() +
-                                                               "; expecting type "+
-                                                               tokenNames[mtne.expecting]);
-                    }
-                    else if ( e instanceof NoViableAltException ) {
-                            NoViableAltException nvae = (NoViableAltException)e;
-    			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                            /*
-                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                               " state "+nvae.stateNumber+
-                                                               " (decision="+nvae.decisionNumber+
-                                                               ") no viable alt; token="+
-                                                               e.token);
-                                                               */
-                    }
-                    else if ( e instanceof EarlyExitException ) {
-                            EarlyExitException eee = (EarlyExitException)e;
-                            message.append("required (...)+ loop (decision="+
-                                                               eee.decisionNumber+
-                                                               ") did not match anything; token="+
-                                                               e.token);
-                    }
-                    else if ( e instanceof MismatchedSetException ) {
-                            MismatchedSetException mse = (MismatchedSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof MismatchedNotSetException ) {
-                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof FailedPredicateException ) {
-                            FailedPredicateException fpe = (FailedPredicateException)e;
-                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                               fpe.predicateText+"}?");
-                    } else if (e instanceof GeneralParseException) {
-    			message.append(" " + e.getMessage());
-    		}
-                   	return message.toString();
-            }   
-            
-            void checkTrailingSemicolon(String text, int line) {
-            	if (text.trim().endsWith( ";" ) ) {
-            		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
-            	}
-            }
-            
-            public Location getLocation() {
-                    return this.location;
-            }
-          
-
-
-
     // $ANTLR start opt_semicolon
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:177:1: opt_semicolon : ( ';' )? ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:177:1: opt_semicolon : ( ';' )? ;
     public final void opt_semicolon() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:178:4: ( ( ';' )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:178:4: ( ';' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:178:4: ( ( ';' )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:178:4: ( ';' )?
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:178:4: ( ';' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:178:4: ( ';' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -271,7 +271,7 @@
             }
             switch (alt1) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: ';'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ';'
                     {
                     match(input,69,FOLLOW_69_in_opt_semicolon46); if (failed) return ;
 
@@ -296,21 +296,21 @@
 
 
     // $ANTLR start compilation_unit
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:181:1: compilation_unit : prolog ( statement )+ ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:181:1: compilation_unit : prolog ( statement )+ ;
     public final void compilation_unit() throws RecognitionException {
-
-        		// reset Location information
-        		this.location = new Location( Location.LOCATION_UNKNOWN );
+        
+        		// reset Location information
+        		this.location = new Location( Location.LOCATION_UNKNOWN );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:186:4: ( prolog ( statement )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:186:4: prolog ( statement )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:186:4: ( prolog ( statement )+ )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:186:4: prolog ( statement )+
             {
             pushFollow(FOLLOW_prolog_in_compilation_unit64);
             prolog();
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:187:3: ( statement )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:187:3: ( statement )+
             int cnt2=0;
             loop2:
             do {
@@ -324,7 +324,7 @@
 
                 switch (alt2) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:187:5: statement
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:187:5: statement
             	    {
             	    pushFollow(FOLLOW_statement_in_compilation_unit71);
             	    statement();
@@ -360,21 +360,21 @@
 
 
     // $ANTLR start prolog
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:190:1: prolog : (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:190:1: prolog : (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* ;
     public final void prolog() throws RecognitionException {
         String n = null;
 
         AttributeDescr a = null;
 
 
-
-        		String packageName = "";
+        
+        		String packageName = "";
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:194:4: ( (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:194:4: (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:4: ( (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:4: (n= package_statement )? ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )*
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:194:4: (n= package_statement )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:4: (n= package_statement )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -383,7 +383,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:194:6: n= package_statement
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:194:6: n= package_statement
                     {
                     pushFollow(FOLLOW_package_statement_in_prolog96);
                     n=package_statement();
@@ -399,11 +399,11 @@
             }
 
             if ( backtracking==0 ) {
-               
-              			this.packageDescr = factory.createPackage( packageName ); 
+               
+              			this.packageDescr = factory.createPackage( packageName ); 
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:198:4: ( ATTRIBUTES ':' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:198:4: ( ATTRIBUTES ':' )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -412,7 +412,7 @@
             }
             switch (alt4) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:198:5: ATTRIBUTES ':'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:198:5: ATTRIBUTES ':'
                     {
                     match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_prolog111); if (failed) return ;
                     match(input,70,FOLLOW_70_in_prolog113); if (failed) return ;
@@ -422,7 +422,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:199:4: ( ( ',' )? a= rule_attribute )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:199:4: ( ( ',' )? a= rule_attribute )*
             loop6:
             do {
                 int alt6=2;
@@ -435,9 +435,9 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:199:6: ( ',' )? a= rule_attribute
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:199:6: ( ',' )? a= rule_attribute
             	    {
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:199:6: ( ',' )?
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:199:6: ( ',' )?
             	    int alt5=2;
             	    int LA5_0 = input.LA(1);
 
@@ -446,7 +446,7 @@
             	    }
             	    switch (alt5) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: ','
+            	            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ','
             	            {
             	            match(input,COMMA,FOLLOW_COMMA_in_prolog122); if (failed) return ;
 
@@ -460,8 +460,8 @@
             	    _fsp--;
             	    if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      					this.packageDescr.addAttribute( a );
+            	      
+            	      					this.packageDescr.addAttribute( a );
             	      				
             	    }
 
@@ -489,7 +489,7 @@
 
 
     // $ANTLR start statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:206:1: statement : ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:206:1: statement : ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query ) ;
     public final void statement() throws RecognitionException {
         FactTemplateDescr t = null;
 
@@ -499,10 +499,10 @@
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:2: ( ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:2: ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:2: ( ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:2: ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:2: ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:2: ( function_import_statement | import_statement | global | function | t= template | r= rule | q= query )
             int alt7=7;
             switch ( input.LA(1) ) {
             case IMPORT:
@@ -559,7 +559,7 @@
 
             switch (alt7) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:4: function_import_statement
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:4: function_import_statement
                     {
                     pushFollow(FOLLOW_function_import_statement_in_statement156);
                     function_import_statement();
@@ -569,7 +569,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:209:4: import_statement
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:209:4: import_statement
                     {
                     pushFollow(FOLLOW_import_statement_in_statement162);
                     import_statement();
@@ -579,7 +579,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:210:4: global
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:210:4: global
                     {
                     pushFollow(FOLLOW_global_in_statement168);
                     global();
@@ -589,7 +589,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:211:4: function
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:211:4: function
                     {
                     pushFollow(FOLLOW_function_in_statement174);
                     function();
@@ -599,7 +599,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:212:10: t= template
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:212:10: t= template
                     {
                     pushFollow(FOLLOW_template_in_statement188);
                     t=template();
@@ -612,7 +612,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:213:4: r= rule
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:213:4: r= rule
                     {
                     pushFollow(FOLLOW_rule_in_statement197);
                     r=rule();
@@ -625,7 +625,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:214:4: q= query
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:214:4: q= query
                     {
                     pushFollow(FOLLOW_query_in_statement209);
                     q=query();
@@ -656,19 +656,19 @@
 
 
     // $ANTLR start package_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:218:1: package_statement returns [String packageName] : PACKAGE n= dotted_name[null] opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:218:1: package_statement returns [String packageName] : PACKAGE n= dotted_name[null] opt_semicolon ;
     public final String package_statement() throws RecognitionException {
         String packageName = null;
 
         String n = null;
 
 
-
-        		packageName = null;
+        
+        		packageName = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:223:3: ( PACKAGE n= dotted_name[null] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:223:3: PACKAGE n= dotted_name[null] opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:223:3: ( PACKAGE n= dotted_name[null] opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:223:3: PACKAGE n= dotted_name[null] opt_semicolon
             {
             match(input,PACKAGE,FOLLOW_PACKAGE_in_package_statement238); if (failed) return packageName;
             pushFollow(FOLLOW_dotted_name_in_package_statement242);
@@ -680,8 +680,8 @@
             _fsp--;
             if (failed) return packageName;
             if ( backtracking==0 ) {
-
-              			packageName = n;
+              
+              			packageName = n;
               		
             }
 
@@ -700,26 +700,26 @@
 
 
     // $ANTLR start import_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:230:1: import_statement : imp= IMPORT import_name[importDecl] opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:230:1: import_statement : imp= IMPORT import_name[importDecl] opt_semicolon ;
     public final void import_statement() throws RecognitionException {
         Token imp=null;
 
-
-                	ImportDescr importDecl = null;
+        
+                	ImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:234:4: (imp= IMPORT import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:234:4: imp= IMPORT import_name[importDecl] opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:234:4: (imp= IMPORT import_name[importDecl] opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:234:4: imp= IMPORT import_name[importDecl] opt_semicolon
             {
             imp=(Token)input.LT(1);
             match(input,IMPORT,FOLLOW_IMPORT_in_import_statement277); if (failed) return ;
             if ( backtracking==0 ) {
-
-              	            importDecl = factory.createImport( );
-              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-              		    if (packageDescr != null) {
-              			packageDescr.addImport( importDecl );
-              		    }
+              
+              	            importDecl = factory.createImport( );
+              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
+              		    if (packageDescr != null) {
+              			packageDescr.addImport( importDecl );
+              		    }
               	        
             }
             pushFollow(FOLLOW_import_name_in_import_statement300);
@@ -746,27 +746,27 @@
 
 
     // $ANTLR start function_import_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:245:1: function_import_statement : imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:245:1: function_import_statement : imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
     public final void function_import_statement() throws RecognitionException {
         Token imp=null;
 
-
-                	FunctionImportDescr importDecl = null;
+        
+                	FunctionImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:249:4: (imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:249:4: imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:249:4: (imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:249:4: imp= IMPORT FUNCTION import_name[importDecl] opt_semicolon
             {
             imp=(Token)input.LT(1);
             match(input,IMPORT,FOLLOW_IMPORT_in_function_import_statement329); if (failed) return ;
             match(input,FUNCTION,FOLLOW_FUNCTION_in_function_import_statement331); if (failed) return ;
             if ( backtracking==0 ) {
-
-              	            importDecl = factory.createFunctionImport();
-              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-              		    if (packageDescr != null) {
-              			packageDescr.addFunctionImport( importDecl );
-              		    }
+              
+              	            importDecl = factory.createFunctionImport();
+              	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
+              		    if (packageDescr != null) {
+              			packageDescr.addFunctionImport( importDecl );
+              		    }
               	        
             }
             pushFollow(FOLLOW_import_name_in_function_import_statement354);
@@ -793,7 +793,7 @@
 
 
     // $ANTLR start import_name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:261:1: import_name[ImportDescr importDecl] returns [String name] : id= identifier ( '.' id= identifier )* (star= '.*' )? ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:261:1: import_name[ImportDescr importDecl] returns [String name] : id= identifier ( '.' id= identifier )* (star= '.*' )? ;
     public final String import_name(ImportDescr importDecl) throws RecognitionException {
         String name = null;
 
@@ -801,25 +801,25 @@
         Token id = null;
 
 
-
-        		name = null;
+        
+        		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:266:3: (id= identifier ( '.' id= identifier )* (star= '.*' )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:266:3: id= identifier ( '.' id= identifier )* (star= '.*' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:266:3: (id= identifier ( '.' id= identifier )* (star= '.*' )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:266:3: id= identifier ( '.' id= identifier )* (star= '.*' )?
             {
             pushFollow(FOLLOW_identifier_in_import_name385);
             id=identifier();
             _fsp--;
             if (failed) return name;
             if ( backtracking==0 ) {
-               
-              		    name=id.getText(); 
-              		    importDecl.setTarget( name );
-              		    importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
+               
+              		    name=id.getText(); 
+              		    importDecl.setTarget( name );
+              		    importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:272:3: ( '.' id= identifier )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:272:3: ( '.' id= identifier )*
             loop8:
             do {
                 int alt8=2;
@@ -832,7 +832,7 @@
 
                 switch (alt8) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:272:5: '.' id= identifier
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:272:5: '.' id= identifier
             	    {
             	    match(input,71,FOLLOW_71_in_import_name397); if (failed) return name;
             	    pushFollow(FOLLOW_identifier_in_import_name401);
@@ -840,10 +840,10 @@
             	    _fsp--;
             	    if (failed) return name;
             	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "." + id.getText(); 
-            	      			importDecl.setTarget( name );
-            	      		        importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
+            	       
+            	      		        name = name + "." + id.getText(); 
+            	      			importDecl.setTarget( name );
+            	      		        importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
             	      		    
             	    }
 
@@ -855,7 +855,7 @@
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:279:3: (star= '.*' )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:279:3: (star= '.*' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -864,15 +864,15 @@
             }
             switch (alt9) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:279:5: star= '.*'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:279:5: star= '.*'
                     {
                     star=(Token)input.LT(1);
                     match(input,72,FOLLOW_72_in_import_name425); if (failed) return name;
                     if ( backtracking==0 ) {
-                       
-                      		        name = name + star.getText(); 
-                      			importDecl.setTarget( name );
-                      		        importDecl.setEndCharacter( ((CommonToken)star).getStopIndex() );
+                       
+                      		        name = name + star.getText(); 
+                      			importDecl.setTarget( name );
+                      		        importDecl.setEndCharacter( ((CommonToken)star).getStopIndex() );
                       		    
                     }
 
@@ -897,7 +897,7 @@
 
 
     // $ANTLR start global
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:289:1: global : loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:289:1: global : loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon ;
     public final void global() throws RecognitionException {
         Token loc=null;
         String type = null;
@@ -905,20 +905,20 @@
         Token id = null;
 
 
-
-        	    GlobalDescr global = null;
+        
+        	    GlobalDescr global = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:294:3: (loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:294:3: loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:294:3: (loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:294:3: loc= GLOBAL type= dotted_name[null] id= identifier opt_semicolon
             {
             loc=(Token)input.LT(1);
             match(input,GLOBAL,FOLLOW_GLOBAL_in_global461); if (failed) return ;
             if ( backtracking==0 ) {
-
-              		    global = factory.createGlobal();
-              	            global.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		    packageDescr.addGlobal( global );
+              
+              		    global = factory.createGlobal();
+              	            global.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              		    packageDescr.addGlobal( global );
               		
             }
             pushFollow(FOLLOW_dotted_name_in_global472);
@@ -926,8 +926,8 @@
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              		    global.setType( type );
+              
+              		    global.setType( type );
               		
             }
             pushFollow(FOLLOW_identifier_in_global484);
@@ -939,9 +939,9 @@
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              		    global.setIdentifier( id.getText() );
-              		    global.setEndCharacter( ((CommonToken)id).getStopIndex() );
+              
+              		    global.setIdentifier( id.getText() );
+              		    global.setEndCharacter( ((CommonToken)id).getStopIndex() );
               		
             }
 
@@ -960,7 +960,7 @@
 
 
     // $ANTLR start function
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:312:1: function : loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:312:1: function : loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] ;
     public final void function() throws RecognitionException {
         Token loc=null;
         String retType = null;
@@ -974,29 +974,29 @@
         String body = null;
 
 
-
-        		FunctionDescr f = null;
+        
+        		FunctionDescr f = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:317:3: (loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:317:3: loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:317:3: (loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:317:3: loc= FUNCTION (retType= dotted_name[null] )? n= identifier '(' ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )? ')' body= curly_chunk[f]
             {
             loc=(Token)input.LT(1);
             match(input,FUNCTION,FOLLOW_FUNCTION_in_function513); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:317:16: (retType= dotted_name[null] )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:317:16: (retType= dotted_name[null] )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
             if ( (LA10_0==ID) ) {
                 int LA10_1 = input.LA(2);
 
-                if ( ((LA10_1>=ATTRIBUTES && LA10_1<=WHEN)||LA10_1==ENABLED||LA10_1==SALIENCE||LA10_1==DURATION||LA10_1==ACCUMULATE||(LA10_1>=INIT && LA10_1<=RESULT)||(LA10_1>=COLLECT && LA10_1<=OR)||(LA10_1>=EVAL && LA10_1<=IN)||LA10_1==NULL||LA10_1==LEFT_SQUARE||(LA10_1>=AND && LA10_1<=THEN)||LA10_1==71) ) {
+                if ( ((LA10_1>=ATTRIBUTES && LA10_1<=QUERY)||LA10_1==ID||(LA10_1>=END && LA10_1<=WHEN)||LA10_1==ENABLED||LA10_1==SALIENCE||LA10_1==DURATION||LA10_1==ACCUMULATE||(LA10_1>=INIT && LA10_1<=OR)||(LA10_1>=EVAL && LA10_1<=IN)||LA10_1==NULL||LA10_1==LEFT_SQUARE||(LA10_1>=AND && LA10_1<=THEN)||LA10_1==71) ) {
                     alt10=1;
                 }
             }
             switch (alt10) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:317:17: retType= dotted_name[null]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:317:17: retType= dotted_name[null]
                     {
                     pushFollow(FOLLOW_dotted_name_in_function518);
                     retType=dotted_name(null);
@@ -1013,32 +1013,32 @@
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              			//System.err.println( "function :: " + n.getText() );
-              			f = factory.createFunction( n.getText(), retType );
-              			f.setLocation(offset(loc.getLine()), loc.getCharPositionInLine());
-              	        	f.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			packageDescr.addFunction( f );
+              
+              			//System.err.println( "function :: " + n.getText() );
+              			f = factory.createFunction( n.getText(), retType );
+              			f.setLocation(offset(loc.getLine()), loc.getCharPositionInLine());
+              	        	f.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			packageDescr.addFunction( f );
               		
             }
             match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_function534); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:4: ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:326:4: ( (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )* )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
-            if ( ((LA14_0>=ATTRIBUTES && LA14_0<=WHEN)||LA14_0==ENABLED||LA14_0==SALIENCE||LA14_0==DURATION||LA14_0==ACCUMULATE||(LA14_0>=INIT && LA14_0<=RESULT)||(LA14_0>=COLLECT && LA14_0<=OR)||(LA14_0>=EVAL && LA14_0<=IN)||LA14_0==NULL||(LA14_0>=AND && LA14_0<=THEN)) ) {
+            if ( ((LA14_0>=ATTRIBUTES && LA14_0<=QUERY)||LA14_0==ID||(LA14_0>=END && LA14_0<=WHEN)||LA14_0==ENABLED||LA14_0==SALIENCE||LA14_0==DURATION||LA14_0==ACCUMULATE||(LA14_0>=INIT && LA14_0<=OR)||(LA14_0>=EVAL && LA14_0<=IN)||LA14_0==NULL||(LA14_0>=AND && LA14_0<=THEN)) ) {
                 alt14=1;
             }
             switch (alt14) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:6: (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )*
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:326:6: (paramType= dotted_name[null] )? paramName= argument ( ',' (paramType= dotted_name[null] )? paramName= argument )*
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:6: (paramType= dotted_name[null] )?
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:326:6: (paramType= dotted_name[null] )?
                     int alt11=2;
                     alt11 = dfa11.predict(input);
                     switch (alt11) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:7: paramType= dotted_name[null]
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:326:7: paramType= dotted_name[null]
                             {
                             pushFollow(FOLLOW_dotted_name_in_function544);
                             paramType=dotted_name(null);
@@ -1055,11 +1055,11 @@
                     _fsp--;
                     if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      					f.addParameter( paramType, paramName );
+                      
+                      					f.addParameter( paramType, paramName );
                       				
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:330:5: ( ',' (paramType= dotted_name[null] )? paramName= argument )*
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:330:5: ( ',' (paramType= dotted_name[null] )? paramName= argument )*
                     loop13:
                     do {
                         int alt13=2;
@@ -1072,15 +1072,15 @@
 
                         switch (alt13) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:330:7: ',' (paramType= dotted_name[null] )? paramName= argument
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:330:7: ',' (paramType= dotted_name[null] )? paramName= argument
                     	    {
                     	    match(input,COMMA,FOLLOW_COMMA_in_function565); if (failed) return ;
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:330:11: (paramType= dotted_name[null] )?
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:330:11: (paramType= dotted_name[null] )?
                     	    int alt12=2;
                     	    alt12 = dfa12.predict(input);
                     	    switch (alt12) {
                     	        case 1 :
-                    	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:330:12: paramType= dotted_name[null]
+                    	            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:330:12: paramType= dotted_name[null]
                     	            {
                     	            pushFollow(FOLLOW_dotted_name_in_function570);
                     	            paramType=dotted_name(null);
@@ -1097,8 +1097,8 @@
                     	    _fsp--;
                     	    if (failed) return ;
                     	    if ( backtracking==0 ) {
-
-                    	      						f.addParameter( paramType, paramName );
+                    	      
+                    	      						f.addParameter( paramType, paramName );
                     	      					
                     	    }
 
@@ -1122,9 +1122,9 @@
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              			//strip out '{','}'
-              			f.setText( body.substring( 1, body.length()-1 ) );
+              
+              			//strip out '{','}'
+              			f.setText( body.substring( 1, body.length()-1 ) );
               		
             }
 
@@ -1143,21 +1143,23 @@
 
 
     // $ANTLR start query
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:346:1: query returns [QueryDescr query] : loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:346:1: query returns [QueryDescr query] : loc= QUERY queryName= name ( LEFT_PAREN (paramName= ID ( ',' paramName= ID )* )? RIGHT_PAREN )? ( normal_lhs_block[lhs] ) loc= END ;
     public final QueryDescr query() throws RecognitionException {
         QueryDescr query = null;
 
         Token loc=null;
+        Token paramName=null;
         String queryName = null;
 
 
-
-        		query = null;
-        		AndDescr lhs = null;
+        
+        		query = null;
+        		AndDescr lhs = null;
+        		List params = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:352:3: (loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:352:3: loc= QUERY queryName= name ( normal_lhs_block[lhs] ) loc= END
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:353:3: (loc= QUERY queryName= name ( LEFT_PAREN (paramName= ID ( ',' paramName= ID )* )? RIGHT_PAREN )? ( normal_lhs_block[lhs] ) loc= END )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:353:3: loc= QUERY queryName= name ( LEFT_PAREN (paramName= ID ( ',' paramName= ID )* )? RIGHT_PAREN )? ( normal_lhs_block[lhs] ) loc= END
             {
             loc=(Token)input.LT(1);
             match(input,QUERY,FOLLOW_QUERY_in_query639); if (failed) return query;
@@ -1166,18 +1168,106 @@
             _fsp--;
             if (failed) return query;
             if ( backtracking==0 ) {
-               
-              			query = factory.createQuery( queryName ); 
-              			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			query.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			lhs = new AndDescr(); query.setLhs( lhs ); 
-              			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+               
+              			query = factory.createQuery( queryName ); 
+              			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			query.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			lhs = new AndDescr(); query.setLhs( lhs ); 
+              			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:3: ( normal_lhs_block[lhs] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:4: normal_lhs_block[lhs]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:361:3: ( LEFT_PAREN (paramName= ID ( ',' paramName= ID )* )? RIGHT_PAREN )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
+
+            if ( (LA17_0==LEFT_PAREN) ) {
+                int LA17_1 = input.LA(2);
+
+                if ( (LA17_1==ID) ) {
+                    int LA17_3 = input.LA(3);
+
+                    if ( (LA17_3==RIGHT_PAREN||LA17_3==COMMA) ) {
+                        alt17=1;
+                    }
+                }
+                else if ( (LA17_1==RIGHT_PAREN) ) {
+                    alt17=1;
+                }
+            }
+            switch (alt17) {
+                case 1 :
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:362:4: LEFT_PAREN (paramName= ID ( ',' paramName= ID )* )? RIGHT_PAREN
+                    {
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_query656); if (failed) return query;
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:363:4: (paramName= ID ( ',' paramName= ID )* )?
+                    int alt16=2;
+                    int LA16_0 = input.LA(1);
+
+                    if ( (LA16_0==ID) ) {
+                        alt16=1;
+                    }
+                    switch (alt16) {
+                        case 1 :
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:364:5: paramName= ID ( ',' paramName= ID )*
+                            {
+                            if ( backtracking==0 ) {
+                               params = new ArrayList(); 
+                            }
+                            paramName=(Token)input.LT(1);
+                            match(input,ID,FOLLOW_ID_in_query680); if (failed) return query;
+                            if ( backtracking==0 ) {
+                               params.add( paramName.getText() ); 
+                            }
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:367:5: ( ',' paramName= ID )*
+                            loop15:
+                            do {
+                                int alt15=2;
+                                int LA15_0 = input.LA(1);
+
+                                if ( (LA15_0==COMMA) ) {
+                                    alt15=1;
+                                }
+
+
+                                switch (alt15) {
+                            	case 1 :
+                            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:367:6: ',' paramName= ID
+                            	    {
+                            	    match(input,COMMA,FOLLOW_COMMA_in_query693); if (failed) return query;
+                            	    paramName=(Token)input.LT(1);
+                            	    match(input,ID,FOLLOW_ID_in_query697); if (failed) return query;
+                            	    if ( backtracking==0 ) {
+                            	       params.add( paramName.getText() ); 
+                            	    }
+
+                            	    }
+                            	    break;
+
+                            	default :
+                            	    break loop15;
+                                }
+                            } while (true);
+
+                            if ( backtracking==0 ) {
+                               query.setParameters( (String[]) params.toArray( new String[params.size()] ) ); 
+                            }
+
+                            }
+                            break;
+
+                    }
+
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_query734); if (failed) return query;
+
+                    }
+                    break;
+
+            }
+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:373:3: ( normal_lhs_block[lhs] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:374:4: normal_lhs_block[lhs]
             {
-            pushFollow(FOLLOW_normal_lhs_block_in_query656);
+            pushFollow(FOLLOW_normal_lhs_block_in_query751);
             normal_lhs_block(lhs);
             _fsp--;
             if (failed) return query;
@@ -1185,10 +1275,10 @@
             }
 
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_query673); if (failed) return query;
+            match(input,END,FOLLOW_END_in_query768); if (failed) return query;
             if ( backtracking==0 ) {
-
-              			query.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              
+              			query.setEndCharacter( ((CommonToken)loc).getStopIndex() );
               		
             }
 
@@ -1207,7 +1297,7 @@
 
 
     // $ANTLR start template
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:371:1: template returns [FactTemplateDescr template] : loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:384:1: template returns [FactTemplateDescr template] : loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon ;
     public final FactTemplateDescr template() throws RecognitionException {
         FactTemplateDescr template = null;
 
@@ -1217,53 +1307,53 @@
         FieldTemplateDescr slot = null;
 
 
-
-        		template = null;		
+        
+        		template = null;		
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:376:3: (loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:376:3: loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:389:3: (loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:389:3: loc= TEMPLATE templateName= identifier opt_semicolon (slot= template_slot )+ loc= END opt_semicolon
             {
             loc=(Token)input.LT(1);
-            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template703); if (failed) return template;
-            pushFollow(FOLLOW_identifier_in_template707);
+            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template798); if (failed) return template;
+            pushFollow(FOLLOW_identifier_in_template802);
             templateName=identifier();
             _fsp--;
             if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template709);
+            pushFollow(FOLLOW_opt_semicolon_in_template804);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
             if ( backtracking==0 ) {
-
-              			template = new FactTemplateDescr(templateName.getText());
-              			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
-              			template.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              
+              			template = new FactTemplateDescr(templateName.getText());
+              			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
+              			template.setStartCharacter( ((CommonToken)loc).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:382:3: (slot= template_slot )+
-            int cnt15=0;
-            loop15:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:395:3: (slot= template_slot )+
+            int cnt18=0;
+            loop18:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt18=2;
+                int LA18_0 = input.LA(1);
 
-                if ( (LA15_0==ID) ) {
-                    alt15=1;
+                if ( (LA18_0==ID) ) {
+                    alt18=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt18) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:4: slot= template_slot
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:396:4: slot= template_slot
             	    {
-            	    pushFollow(FOLLOW_template_slot_in_template724);
+            	    pushFollow(FOLLOW_template_slot_in_template819);
             	    slot=template_slot();
             	    _fsp--;
             	    if (failed) return template;
             	    if ( backtracking==0 ) {
-
-            	      				template.addFieldTemplate(slot);
+            	      
+            	      				template.addFieldTemplate(slot);
             	      			
             	    }
 
@@ -1271,24 +1361,24 @@
             	    break;
 
             	default :
-            	    if ( cnt15 >= 1 ) break loop15;
+            	    if ( cnt18 >= 1 ) break loop18;
             	    if (backtracking>0) {failed=true; return template;}
                         EarlyExitException eee =
-                            new EarlyExitException(15, input);
+                            new EarlyExitException(18, input);
                         throw eee;
                 }
-                cnt15++;
+                cnt18++;
             } while (true);
 
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template741); if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template743);
+            match(input,END,FOLLOW_END_in_template836); if (failed) return template;
+            pushFollow(FOLLOW_opt_semicolon_in_template838);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
             if ( backtracking==0 ) {
-
-              			template.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              
+              			template.setEndCharacter( ((CommonToken)loc).getStopIndex() );
               		
             }
 
@@ -1307,7 +1397,7 @@
 
 
     // $ANTLR start template_slot
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:394:1: template_slot returns [FieldTemplateDescr field] : fieldType= dotted_name[field] n= identifier opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:407:1: template_slot returns [FieldTemplateDescr field] : fieldType= dotted_name[field] n= identifier opt_semicolon ;
     public final FieldTemplateDescr template_slot() throws RecognitionException {
         FieldTemplateDescr field = null;
 
@@ -1316,40 +1406,40 @@
         Token n = null;
 
 
-
-        		field = null;
+        
+        		field = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:399:11: (fieldType= dotted_name[field] n= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:399:11: fieldType= dotted_name[field] n= identifier opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:412:11: (fieldType= dotted_name[field] n= identifier opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:412:11: fieldType= dotted_name[field] n= identifier opt_semicolon
             {
             if ( backtracking==0 ) {
-
-              			field = factory.createFieldTemplate();
+              
+              			field = factory.createFieldTemplate();
               	         
             }
-            pushFollow(FOLLOW_dotted_name_in_template_slot789);
+            pushFollow(FOLLOW_dotted_name_in_template_slot884);
             fieldType=dotted_name(field);
             _fsp--;
             if (failed) return field;
             if ( backtracking==0 ) {
-
-              		        field.setClassType( fieldType );
+              
+              		        field.setClassType( fieldType );
               		 
             }
-            pushFollow(FOLLOW_identifier_in_template_slot807);
+            pushFollow(FOLLOW_identifier_in_template_slot902);
             n=identifier();
             _fsp--;
             if (failed) return field;
-            pushFollow(FOLLOW_opt_semicolon_in_template_slot809);
+            pushFollow(FOLLOW_opt_semicolon_in_template_slot904);
             opt_semicolon();
             _fsp--;
             if (failed) return field;
             if ( backtracking==0 ) {
-
-              		        field.setName( n.getText() );
-              			field.setLocation( offset(n.getLine()), n.getCharPositionInLine() );
-              			field.setEndCharacter( ((CommonToken)n).getStopIndex() );
+              
+              		        field.setName( n.getText() );
+              			field.setLocation( offset(n.getLine()), n.getCharPositionInLine() );
+              			field.setEndCharacter( ((CommonToken)n).getStopIndex() );
               		 
             }
 
@@ -1368,7 +1458,7 @@
 
 
     // $ANTLR start rule
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:415:1: rule returns [RuleDescr rule] : loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:428:1: rule returns [RuleDescr rule] : loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] ;
     public final RuleDescr rule() throws RecognitionException {
         RuleDescr rule = null;
 
@@ -1376,59 +1466,59 @@
         String ruleName = null;
 
 
-
-        		rule = null;
-        		String consequence = "";
-        		AndDescr lhs = null;
+        
+        		rule = null;
+        		String consequence = "";
+        		AndDescr lhs = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:3: (loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:3: loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:435:3: (loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:435:3: loc= RULE ruleName= name rule_attributes[rule] (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )? rhs_chunk[rule]
             {
             loc=(Token)input.LT(1);
-            match(input,RULE,FOLLOW_RULE_in_rule842); if (failed) return rule;
-            pushFollow(FOLLOW_name_in_rule846);
+            match(input,RULE,FOLLOW_RULE_in_rule937); if (failed) return rule;
+            pushFollow(FOLLOW_name_in_rule941);
             ruleName=name();
             _fsp--;
             if (failed) return rule;
             if ( backtracking==0 ) {
-               
-              			location.setType( Location.LOCATION_RULE_HEADER );
-              			debug( "start rule: " + ruleName );
-              			rule = new RuleDescr( ruleName, null ); 
-              			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			rule.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+               
+              			location.setType( Location.LOCATION_RULE_HEADER );
+              			debug( "start rule: " + ruleName );
+              			rule = new RuleDescr( ruleName, null ); 
+              			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			rule.setStartCharacter( ((CommonToken)loc).getStartIndex() );
               		
             }
-            pushFollow(FOLLOW_rule_attributes_in_rule855);
+            pushFollow(FOLLOW_rule_attributes_in_rule950);
             rule_attributes(rule);
             _fsp--;
             if (failed) return rule;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:3: (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:444:3: (loc= WHEN ( ':' )? ( normal_lhs_block[lhs] ) )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA17_0==WHEN) ) {
-                alt17=1;
+            if ( (LA20_0==WHEN) ) {
+                alt20=1;
             }
-            switch (alt17) {
+            switch (alt20) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:5: loc= WHEN ( ':' )? ( normal_lhs_block[lhs] )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:444:5: loc= WHEN ( ':' )? ( normal_lhs_block[lhs] )
                     {
                     loc=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_rule864); if (failed) return rule;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:14: ( ':' )?
-                    int alt16=2;
-                    int LA16_0 = input.LA(1);
+                    match(input,WHEN,FOLLOW_WHEN_in_rule959); if (failed) return rule;
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:444:14: ( ':' )?
+                    int alt19=2;
+                    int LA19_0 = input.LA(1);
 
-                    if ( (LA16_0==70) ) {
-                        alt16=1;
+                    if ( (LA19_0==70) ) {
+                        alt19=1;
                     }
-                    switch (alt16) {
+                    switch (alt19) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: ':'
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ':'
                             {
-                            match(input,70,FOLLOW_70_in_rule866); if (failed) return rule;
+                            match(input,70,FOLLOW_70_in_rule961); if (failed) return rule;
 
                             }
                             break;
@@ -1436,17 +1526,17 @@
                     }
 
                     if ( backtracking==0 ) {
-                       
-                      				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-                      				lhs = new AndDescr(); rule.setLhs( lhs ); 
-                      				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				lhs.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                       
+                      				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+                      				lhs = new AndDescr(); rule.setLhs( lhs ); 
+                      				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				lhs.setStartCharacter( ((CommonToken)loc).getStartIndex() );
                       			
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:438:4: ( normal_lhs_block[lhs] )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:5: normal_lhs_block[lhs]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:451:4: ( normal_lhs_block[lhs] )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:453:5: normal_lhs_block[lhs]
                     {
-                    pushFollow(FOLLOW_normal_lhs_block_in_rule884);
+                    pushFollow(FOLLOW_normal_lhs_block_in_rule979);
                     normal_lhs_block(lhs);
                     _fsp--;
                     if (failed) return rule;
@@ -1459,7 +1549,7 @@
 
             }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule905);
+            pushFollow(FOLLOW_rhs_chunk_in_rule1000);
             rhs_chunk(rule);
             _fsp--;
             if (failed) return rule;
@@ -1479,74 +1569,74 @@
 
 
     // $ANTLR start rule_attributes
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:449:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:462:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* ;
     public final void rule_attributes(RuleDescr rule) throws RecognitionException {
         AttributeDescr a = null;
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451:4: ( ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451:4: ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:4: ( ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:4: ( ATTRIBUTES ':' )? ( ( ',' )? a= rule_attribute )*
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451:4: ( ATTRIBUTES ':' )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:4: ( ATTRIBUTES ':' )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( (LA18_0==ATTRIBUTES) ) {
-                alt18=1;
+            if ( (LA21_0==ATTRIBUTES) ) {
+                alt21=1;
             }
-            switch (alt18) {
+            switch (alt21) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451:5: ATTRIBUTES ':'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:464:5: ATTRIBUTES ':'
                     {
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes926); if (failed) return ;
-                    match(input,70,FOLLOW_70_in_rule_attributes928); if (failed) return ;
+                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1021); if (failed) return ;
+                    match(input,70,FOLLOW_70_in_rule_attributes1023); if (failed) return ;
 
                     }
                     break;
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:4: ( ( ',' )? a= rule_attribute )*
-            loop20:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:465:4: ( ( ',' )? a= rule_attribute )*
+            loop23:
             do {
-                int alt20=2;
-                int LA20_0 = input.LA(1);
+                int alt23=2;
+                int LA23_0 = input.LA(1);
 
-                if ( (LA20_0==DATE_EFFECTIVE||(LA20_0>=DATE_EXPIRES && LA20_0<=ENABLED)||LA20_0==SALIENCE||(LA20_0>=NO_LOOP && LA20_0<=LOCK_ON_ACTIVE)||LA20_0==COMMA) ) {
-                    alt20=1;
+                if ( (LA23_0==DATE_EFFECTIVE||(LA23_0>=DATE_EXPIRES && LA23_0<=ENABLED)||LA23_0==SALIENCE||(LA23_0>=NO_LOOP && LA23_0<=LOCK_ON_ACTIVE)||LA23_0==COMMA) ) {
+                    alt23=1;
                 }
 
 
-                switch (alt20) {
+                switch (alt23) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:6: ( ',' )? a= rule_attribute
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:465:6: ( ',' )? a= rule_attribute
             	    {
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:6: ( ',' )?
-            	    int alt19=2;
-            	    int LA19_0 = input.LA(1);
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:465:6: ( ',' )?
+            	    int alt22=2;
+            	    int LA22_0 = input.LA(1);
 
-            	    if ( (LA19_0==COMMA) ) {
-            	        alt19=1;
+            	    if ( (LA22_0==COMMA) ) {
+            	        alt22=1;
             	    }
-            	    switch (alt19) {
+            	    switch (alt22) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: ','
+            	            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: ','
             	            {
-            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes937); if (failed) return ;
+            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1032); if (failed) return ;
 
             	            }
             	            break;
 
             	    }
 
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes942);
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1037);
             	    a=rule_attribute();
             	    _fsp--;
             	    if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      					rule.addAttribute( a );
+            	      
+            	      					rule.addAttribute( a );
             	      				
             	    }
 
@@ -1554,7 +1644,7 @@
             	    break;
 
             	default :
-            	    break loop20;
+            	    break loop23;
                 }
             } while (true);
 
@@ -1574,93 +1664,93 @@
 
 
     // $ANTLR start rule_attribute
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:461:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:474:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );
     public final AttributeDescr rule_attribute() throws RecognitionException {
         AttributeDescr d = null;
 
         AttributeDescr a = null;
 
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:466:4: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect )
-            int alt21=12;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:479:4: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect )
+            int alt24=12;
             switch ( input.LA(1) ) {
             case SALIENCE:
                 {
-                alt21=1;
+                alt24=1;
                 }
                 break;
             case NO_LOOP:
                 {
-                alt21=2;
+                alt24=2;
                 }
                 break;
             case AGENDA_GROUP:
                 {
-                alt21=3;
+                alt24=3;
                 }
                 break;
             case DURATION:
                 {
-                alt21=4;
+                alt24=4;
                 }
                 break;
             case ACTIVATION_GROUP:
                 {
-                alt21=5;
+                alt24=5;
                 }
                 break;
             case AUTO_FOCUS:
                 {
-                alt21=6;
+                alt24=6;
                 }
                 break;
             case DATE_EFFECTIVE:
                 {
-                alt21=7;
+                alt24=7;
                 }
                 break;
             case DATE_EXPIRES:
                 {
-                alt21=8;
+                alt24=8;
                 }
                 break;
             case ENABLED:
                 {
-                alt21=9;
+                alt24=9;
                 }
                 break;
             case RULEFLOW_GROUP:
                 {
-                alt21=10;
+                alt24=10;
                 }
                 break;
             case LOCK_ON_ACTIVE:
                 {
-                alt21=11;
+                alt24=11;
                 }
                 break;
             case DIALECT:
                 {
-                alt21=12;
+                alt24=12;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("461:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );", 21, 0, input);
+                    new NoViableAltException("474:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );", 24, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt21) {
+            switch (alt24) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:466:4: a= salience
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:479:4: a= salience
                     {
-                    pushFollow(FOLLOW_salience_in_rule_attribute983);
+                    pushFollow(FOLLOW_salience_in_rule_attribute1078);
                     a=salience();
                     _fsp--;
                     if (failed) return d;
@@ -1671,9 +1761,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:467:5: a= no_loop
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:480:5: a= no_loop
                     {
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute993);
+                    pushFollow(FOLLOW_no_loop_in_rule_attribute1088);
                     a=no_loop();
                     _fsp--;
                     if (failed) return d;
@@ -1684,9 +1774,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:5: a= agenda_group
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:481:5: a= agenda_group
                     {
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1004);
+                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1099);
                     a=agenda_group();
                     _fsp--;
                     if (failed) return d;
@@ -1697,9 +1787,9 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:469:5: a= duration
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:482:5: a= duration
                     {
-                    pushFollow(FOLLOW_duration_in_rule_attribute1017);
+                    pushFollow(FOLLOW_duration_in_rule_attribute1112);
                     a=duration();
                     _fsp--;
                     if (failed) return d;
@@ -1710,9 +1800,9 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:470:5: a= activation_group
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:483:5: a= activation_group
                     {
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute1031);
+                    pushFollow(FOLLOW_activation_group_in_rule_attribute1126);
                     a=activation_group();
                     _fsp--;
                     if (failed) return d;
@@ -1723,9 +1813,9 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:471:5: a= auto_focus
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:484:5: a= auto_focus
                     {
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1042);
+                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1137);
                     a=auto_focus();
                     _fsp--;
                     if (failed) return d;
@@ -1736,9 +1826,9 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:472:5: a= date_effective
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:485:5: a= date_effective
                     {
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1053);
+                    pushFollow(FOLLOW_date_effective_in_rule_attribute1148);
                     a=date_effective();
                     _fsp--;
                     if (failed) return d;
@@ -1749,9 +1839,9 @@
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:473:5: a= date_expires
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:486:5: a= date_expires
                     {
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1063);
+                    pushFollow(FOLLOW_date_expires_in_rule_attribute1158);
                     a=date_expires();
                     _fsp--;
                     if (failed) return d;
@@ -1762,9 +1852,9 @@
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:474:5: a= enabled
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:487:5: a= enabled
                     {
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1073);
+                    pushFollow(FOLLOW_enabled_in_rule_attribute1168);
                     a=enabled();
                     _fsp--;
                     if (failed) return d;
@@ -1775,9 +1865,9 @@
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:475:5: a= ruleflow_group
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:488:5: a= ruleflow_group
                     {
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1083);
+                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1178);
                     a=ruleflow_group();
                     _fsp--;
                     if (failed) return d;
@@ -1788,9 +1878,9 @@
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:476:5: a= lock_on_active
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:489:5: a= lock_on_active
                     {
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1093);
+                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1188);
                     a=lock_on_active();
                     _fsp--;
                     if (failed) return d;
@@ -1801,9 +1891,9 @@
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:477:5: a= dialect
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:490:5: a= dialect
                     {
-                    pushFollow(FOLLOW_dialect_in_rule_attribute1102);
+                    pushFollow(FOLLOW_dialect_in_rule_attribute1197);
                     a=dialect();
                     _fsp--;
                     if (failed) return d;
@@ -1828,30 +1918,30 @@
 
 
     // $ANTLR start date_effective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:481:1: date_effective returns [AttributeDescr d] : loc= DATE_EFFECTIVE val= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:494:1: date_effective returns [AttributeDescr d] : loc= DATE_EFFECTIVE val= STRING ;
     public final AttributeDescr date_effective() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token val=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:486:3: (loc= DATE_EFFECTIVE val= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:486:3: loc= DATE_EFFECTIVE val= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:499:3: (loc= DATE_EFFECTIVE val= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:499:3: loc= DATE_EFFECTIVE val= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1134); if (failed) return d;
+            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1229); if (failed) return d;
             val=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1138); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_date_effective1233); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "date-effective", getString( val ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
+              
+              			d = new AttributeDescr( "date-effective", getString( val ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
               		
             }
 
@@ -1870,30 +1960,30 @@
 
 
     // $ANTLR start date_expires
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:496:1: date_expires returns [AttributeDescr d] : loc= DATE_EXPIRES val= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:509:1: date_expires returns [AttributeDescr d] : loc= DATE_EXPIRES val= STRING ;
     public final AttributeDescr date_expires() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token val=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:3: (loc= DATE_EXPIRES val= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:3: loc= DATE_EXPIRES val= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:514:3: (loc= DATE_EXPIRES val= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:514:3: loc= DATE_EXPIRES val= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1171); if (failed) return d;
+            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1266); if (failed) return d;
             val=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1175); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_date_expires1270); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "date-expires", getString( val ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
+              
+              			d = new AttributeDescr( "date-expires", getString( val ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
               		
             }
 
@@ -1912,30 +2002,30 @@
 
 
     // $ANTLR start enabled
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:512:1: enabled returns [AttributeDescr d] : loc= ENABLED t= BOOL ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:525:1: enabled returns [AttributeDescr d] : loc= ENABLED t= BOOL ;
     public final AttributeDescr enabled() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token t=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:517:4: (loc= ENABLED t= BOOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:517:4: loc= ENABLED t= BOOL
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:530:4: (loc= ENABLED t= BOOL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:530:4: loc= ENABLED t= BOOL
             {
             loc=(Token)input.LT(1);
-            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1210); if (failed) return d;
+            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1305); if (failed) return d;
             t=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1214); if (failed) return d;
+            match(input,BOOL,FOLLOW_BOOL_in_enabled1309); if (failed) return d;
             if ( backtracking==0 ) {
-
-              				d = new AttributeDescr( "enabled", t.getText() );
-              				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+              
+              				d = new AttributeDescr( "enabled", t.getText() );
+              				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
               			
             }
 
@@ -1954,7 +2044,7 @@
 
 
     // $ANTLR start salience
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:530:1: salience returns [AttributeDescr d ] : loc= SALIENCE (i= INT | txt= paren_chunk[d] ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:543:1: salience returns [AttributeDescr d ] : loc= SALIENCE (i= INT | txt= paren_chunk[d] ) ;
     public final AttributeDescr salience() throws RecognitionException {
         AttributeDescr d = null;
 
@@ -1963,64 +2053,64 @@
         String txt = null;
 
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:3: (loc= SALIENCE (i= INT | txt= paren_chunk[d] ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:3: loc= SALIENCE (i= INT | txt= paren_chunk[d] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:548:3: (loc= SALIENCE (i= INT | txt= paren_chunk[d] ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:548:3: loc= SALIENCE (i= INT | txt= paren_chunk[d] )
             {
             loc=(Token)input.LT(1);
-            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1259); if (failed) return d;
+            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1354); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "salience" );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              
+              			d = new AttributeDescr( "salience" );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:541:3: (i= INT | txt= paren_chunk[d] )
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:554:3: (i= INT | txt= paren_chunk[d] )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA22_0==INT) ) {
-                alt22=1;
+            if ( (LA25_0==INT) ) {
+                alt25=1;
             }
-            else if ( (LA22_0==LEFT_PAREN) ) {
-                alt22=2;
+            else if ( (LA25_0==LEFT_PAREN) ) {
+                alt25=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("541:3: (i= INT | txt= paren_chunk[d] )", 22, 0, input);
+                    new NoViableAltException("554:3: (i= INT | txt= paren_chunk[d] )", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt22) {
+            switch (alt25) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:541:5: i= INT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:554:5: i= INT
                     {
                     i=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1272); if (failed) return d;
+                    match(input,INT,FOLLOW_INT_in_salience1367); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      			d.setValue( i.getText() );
-                      			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
+                      
+                      			d.setValue( i.getText() );
+                      			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
                       		
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:546:5: txt= paren_chunk[d]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:559:5: txt= paren_chunk[d]
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1287);
+                    pushFollow(FOLLOW_paren_chunk_in_salience1382);
                     txt=paren_chunk(d);
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      			d.setValue( txt );
+                      
+                      			d.setValue( txt );
                       		
                     }
 
@@ -2045,34 +2135,34 @@
 
 
     // $ANTLR start no_loop
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:553:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:566:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );
     public final AttributeDescr no_loop() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token t=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:3: ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) )
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:571:3: ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) )
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA23_0==NO_LOOP) ) {
-                int LA23_1 = input.LA(2);
+            if ( (LA26_0==NO_LOOP) ) {
+                int LA26_1 = input.LA(2);
 
-                if ( (LA23_1==BOOL) ) {
-                    alt23=2;
+                if ( (LA26_1==BOOL) ) {
+                    alt26=2;
                 }
-                else if ( (LA23_1==EOF||(LA23_1>=IMPORT && LA23_1<=QUERY)||(LA23_1>=TEMPLATE && LA23_1<=DATE_EFFECTIVE)||(LA23_1>=DATE_EXPIRES && LA23_1<=ENABLED)||LA23_1==SALIENCE||(LA23_1>=NO_LOOP && LA23_1<=LOCK_ON_ACTIVE)||LA23_1==COMMA||LA23_1==THEN) ) {
-                    alt23=1;
+                else if ( (LA26_1==EOF||(LA26_1>=IMPORT && LA26_1<=QUERY)||(LA26_1>=TEMPLATE && LA26_1<=DATE_EFFECTIVE)||(LA26_1>=DATE_EXPIRES && LA26_1<=ENABLED)||LA26_1==SALIENCE||(LA26_1>=NO_LOOP && LA26_1<=LOCK_ON_ACTIVE)||LA26_1==COMMA||LA26_1==THEN) ) {
+                    alt26=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("553:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 23, 1, input);
+                        new NoViableAltException("566:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 26, 1, input);
 
                     throw nvae;
                 }
@@ -2080,25 +2170,25 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("553:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 23, 0, input);
+                    new NoViableAltException("566:1: no_loop returns [AttributeDescr d] : ( (loc= NO_LOOP ) | (loc= NO_LOOP t= BOOL ) );", 26, 0, input);
 
                 throw nvae;
             }
-            switch (alt23) {
+            switch (alt26) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:3: (loc= NO_LOOP )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:571:3: (loc= NO_LOOP )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:3: (loc= NO_LOOP )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:559:4: loc= NO_LOOP
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:571:3: (loc= NO_LOOP )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:572:4: loc= NO_LOOP
                     {
                     loc=(Token)input.LT(1);
-                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1327); if (failed) return d;
+                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1422); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "no-loop", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "no-loop", "true" );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
                       			
                     }
 
@@ -2108,21 +2198,21 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:568:3: (loc= NO_LOOP t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:581:3: (loc= NO_LOOP t= BOOL )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:568:3: (loc= NO_LOOP t= BOOL )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:569:4: loc= NO_LOOP t= BOOL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:581:3: (loc= NO_LOOP t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:582:4: loc= NO_LOOP t= BOOL
                     {
                     loc=(Token)input.LT(1);
-                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1355); if (failed) return d;
+                    match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1450); if (failed) return d;
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1359); if (failed) return d;
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1454); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "no-loop", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "no-loop", t.getText() );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
                       			
                     }
 
@@ -2146,34 +2236,34 @@
 
 
     // $ANTLR start auto_focus
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:581:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:594:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );
     public final AttributeDescr auto_focus() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token t=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:586:3: ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) )
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:599:3: ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) )
+            int alt27=2;
+            int LA27_0 = input.LA(1);
 
-            if ( (LA24_0==AUTO_FOCUS) ) {
-                int LA24_1 = input.LA(2);
+            if ( (LA27_0==AUTO_FOCUS) ) {
+                int LA27_1 = input.LA(2);
 
-                if ( (LA24_1==BOOL) ) {
-                    alt24=2;
+                if ( (LA27_1==BOOL) ) {
+                    alt27=2;
                 }
-                else if ( (LA24_1==EOF||(LA24_1>=IMPORT && LA24_1<=QUERY)||(LA24_1>=TEMPLATE && LA24_1<=DATE_EFFECTIVE)||(LA24_1>=DATE_EXPIRES && LA24_1<=ENABLED)||LA24_1==SALIENCE||(LA24_1>=NO_LOOP && LA24_1<=LOCK_ON_ACTIVE)||LA24_1==COMMA||LA24_1==THEN) ) {
-                    alt24=1;
+                else if ( (LA27_1==EOF||(LA27_1>=IMPORT && LA27_1<=QUERY)||(LA27_1>=TEMPLATE && LA27_1<=DATE_EFFECTIVE)||(LA27_1>=DATE_EXPIRES && LA27_1<=ENABLED)||LA27_1==SALIENCE||(LA27_1>=NO_LOOP && LA27_1<=LOCK_ON_ACTIVE)||LA27_1==COMMA||LA27_1==THEN) ) {
+                    alt27=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("581:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 24, 1, input);
+                        new NoViableAltException("594:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 27, 1, input);
 
                     throw nvae;
                 }
@@ -2181,25 +2271,25 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("581:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 24, 0, input);
+                    new NoViableAltException("594:1: auto_focus returns [AttributeDescr d] : ( (loc= AUTO_FOCUS ) | (loc= AUTO_FOCUS t= BOOL ) );", 27, 0, input);
 
                 throw nvae;
             }
-            switch (alt24) {
+            switch (alt27) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:586:3: (loc= AUTO_FOCUS )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:599:3: (loc= AUTO_FOCUS )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:586:3: (loc= AUTO_FOCUS )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:587:4: loc= AUTO_FOCUS
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:599:3: (loc= AUTO_FOCUS )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:600:4: loc= AUTO_FOCUS
                     {
                     loc=(Token)input.LT(1);
-                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1408); if (failed) return d;
+                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1503); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "auto-focus", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "auto-focus", "true" );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
                       			
                     }
 
@@ -2209,21 +2299,21 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:596:3: (loc= AUTO_FOCUS t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:609:3: (loc= AUTO_FOCUS t= BOOL )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:596:3: (loc= AUTO_FOCUS t= BOOL )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:4: loc= AUTO_FOCUS t= BOOL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:609:3: (loc= AUTO_FOCUS t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:610:4: loc= AUTO_FOCUS t= BOOL
                     {
                     loc=(Token)input.LT(1);
-                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1436); if (failed) return d;
+                    match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1531); if (failed) return d;
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1440); if (failed) return d;
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1535); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "auto-focus", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "auto-focus", t.getText() );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
                       			
                     }
 
@@ -2247,30 +2337,30 @@
 
 
     // $ANTLR start activation_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:609:1: activation_group returns [AttributeDescr d] : loc= ACTIVATION_GROUP n= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:622:1: activation_group returns [AttributeDescr d] : loc= ACTIVATION_GROUP n= STRING ;
     public final AttributeDescr activation_group() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token n=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614:3: (loc= ACTIVATION_GROUP n= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614:3: loc= ACTIVATION_GROUP n= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:627:3: (loc= ACTIVATION_GROUP n= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:627:3: loc= ACTIVATION_GROUP n= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1485); if (failed) return d;
+            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1580); if (failed) return d;
             n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1489); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_activation_group1584); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "activation-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+              
+              			d = new AttributeDescr( "activation-group", getString( n ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
               		
             }
 
@@ -2289,30 +2379,30 @@
 
 
     // $ANTLR start ruleflow_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:1: ruleflow_group returns [AttributeDescr d] : loc= RULEFLOW_GROUP n= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:636:1: ruleflow_group returns [AttributeDescr d] : loc= RULEFLOW_GROUP n= STRING ;
     public final AttributeDescr ruleflow_group() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token n=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:628:3: (loc= RULEFLOW_GROUP n= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:628:3: loc= RULEFLOW_GROUP n= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:641:3: (loc= RULEFLOW_GROUP n= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:641:3: loc= RULEFLOW_GROUP n= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1521); if (failed) return d;
+            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1616); if (failed) return d;
             n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1525); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1620); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "ruleflow-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+              
+              			d = new AttributeDescr( "ruleflow-group", getString( n ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
               		
             }
 
@@ -2331,30 +2421,30 @@
 
 
     // $ANTLR start agenda_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:637:1: agenda_group returns [AttributeDescr d] : loc= AGENDA_GROUP n= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:650:1: agenda_group returns [AttributeDescr d] : loc= AGENDA_GROUP n= STRING ;
     public final AttributeDescr agenda_group() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token n=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:3: (loc= AGENDA_GROUP n= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:3: loc= AGENDA_GROUP n= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:655:3: (loc= AGENDA_GROUP n= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:655:3: loc= AGENDA_GROUP n= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1557); if (failed) return d;
+            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1652); if (failed) return d;
             n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1561); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1656); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "agenda-group", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+              
+              			d = new AttributeDescr( "agenda-group", getString( n ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
               		
             }
 
@@ -2373,30 +2463,30 @@
 
 
     // $ANTLR start duration
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:652:1: duration returns [AttributeDescr d] : loc= DURATION i= INT ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:665:1: duration returns [AttributeDescr d] : loc= DURATION i= INT ;
     public final AttributeDescr duration() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token i=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:3: (loc= DURATION i= INT )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:3: loc= DURATION i= INT
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:670:3: (loc= DURATION i= INT )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:670:3: loc= DURATION i= INT
             {
             loc=(Token)input.LT(1);
-            match(input,DURATION,FOLLOW_DURATION_in_duration1595); if (failed) return d;
+            match(input,DURATION,FOLLOW_DURATION_in_duration1690); if (failed) return d;
             i=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1599); if (failed) return d;
+            match(input,INT,FOLLOW_INT_in_duration1694); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "duration", i.getText() );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
+              
+              			d = new AttributeDescr( "duration", i.getText() );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
               		
             }
 
@@ -2415,30 +2505,30 @@
 
 
     // $ANTLR start dialect
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:666:1: dialect returns [AttributeDescr d] : loc= DIALECT n= STRING ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:679:1: dialect returns [AttributeDescr d] : loc= DIALECT n= STRING ;
     public final AttributeDescr dialect() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token n=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:671:3: (loc= DIALECT n= STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:671:3: loc= DIALECT n= STRING
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:684:3: (loc= DIALECT n= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:684:3: loc= DIALECT n= STRING
             {
             loc=(Token)input.LT(1);
-            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1631); if (failed) return d;
+            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1726); if (failed) return d;
             n=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1635); if (failed) return d;
+            match(input,STRING,FOLLOW_STRING_in_dialect1730); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new AttributeDescr( "dialect", getString( n ) );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+              
+              			d = new AttributeDescr( "dialect", getString( n ) );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
               		
             }
 
@@ -2457,34 +2547,34 @@
 
 
     // $ANTLR start lock_on_active
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:685:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:698:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );
     public final AttributeDescr lock_on_active() throws RecognitionException {
         AttributeDescr d = null;
 
         Token loc=null;
         Token t=null;
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:690:3: ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) )
-            int alt25=2;
-            int LA25_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:703:3: ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) )
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA25_0==LOCK_ON_ACTIVE) ) {
-                int LA25_1 = input.LA(2);
+            if ( (LA28_0==LOCK_ON_ACTIVE) ) {
+                int LA28_1 = input.LA(2);
 
-                if ( (LA25_1==BOOL) ) {
-                    alt25=2;
+                if ( (LA28_1==BOOL) ) {
+                    alt28=2;
                 }
-                else if ( (LA25_1==EOF||(LA25_1>=IMPORT && LA25_1<=QUERY)||(LA25_1>=TEMPLATE && LA25_1<=DATE_EFFECTIVE)||(LA25_1>=DATE_EXPIRES && LA25_1<=ENABLED)||LA25_1==SALIENCE||(LA25_1>=NO_LOOP && LA25_1<=LOCK_ON_ACTIVE)||LA25_1==COMMA||LA25_1==THEN) ) {
-                    alt25=1;
+                else if ( (LA28_1==EOF||(LA28_1>=IMPORT && LA28_1<=QUERY)||(LA28_1>=TEMPLATE && LA28_1<=DATE_EFFECTIVE)||(LA28_1>=DATE_EXPIRES && LA28_1<=ENABLED)||LA28_1==SALIENCE||(LA28_1>=NO_LOOP && LA28_1<=LOCK_ON_ACTIVE)||LA28_1==COMMA||LA28_1==THEN) ) {
+                    alt28=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("685:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 25, 1, input);
+                        new NoViableAltException("698:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 28, 1, input);
 
                     throw nvae;
                 }
@@ -2492,25 +2582,25 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("685:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 25, 0, input);
+                    new NoViableAltException("698:1: lock_on_active returns [AttributeDescr d] : ( (loc= LOCK_ON_ACTIVE ) | (loc= LOCK_ON_ACTIVE t= BOOL ) );", 28, 0, input);
 
                 throw nvae;
             }
-            switch (alt25) {
+            switch (alt28) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:690:3: (loc= LOCK_ON_ACTIVE )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:703:3: (loc= LOCK_ON_ACTIVE )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:690:3: (loc= LOCK_ON_ACTIVE )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:691:4: loc= LOCK_ON_ACTIVE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:703:3: (loc= LOCK_ON_ACTIVE )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:704:4: loc= LOCK_ON_ACTIVE
                     {
                     loc=(Token)input.LT(1);
-                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1684); if (failed) return d;
+                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1779); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "lock-on-active", "true" );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "lock-on-active", "true" );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
                       			
                     }
 
@@ -2520,21 +2610,21 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:700:3: (loc= LOCK_ON_ACTIVE t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:713:3: (loc= LOCK_ON_ACTIVE t= BOOL )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:700:3: (loc= LOCK_ON_ACTIVE t= BOOL )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:701:4: loc= LOCK_ON_ACTIVE t= BOOL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:713:3: (loc= LOCK_ON_ACTIVE t= BOOL )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:714:4: loc= LOCK_ON_ACTIVE t= BOOL
                     {
                     loc=(Token)input.LT(1);
-                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1712); if (failed) return d;
+                    match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1807); if (failed) return d;
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1716); if (failed) return d;
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1811); if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      				d = new AttributeDescr( "lock-on-active", t.getText() );
-                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+                      
+                      				d = new AttributeDescr( "lock-on-active", t.getText() );
+                      				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                      				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+                      				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
                       			
                     }
 
@@ -2558,31 +2648,31 @@
 
 
     // $ANTLR start normal_lhs_block
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:713:1: normal_lhs_block[AndDescr descr] : (d= lhs[descr] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:726:1: normal_lhs_block[AndDescr descr] : (d= lhs[descr] )* ;
     public final void normal_lhs_block(AndDescr descr) throws RecognitionException {
         BaseDescr d = null;
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:3: ( (d= lhs[descr] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:3: (d= lhs[descr] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:728:3: ( (d= lhs[descr] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:728:3: (d= lhs[descr] )*
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:3: (d= lhs[descr] )*
-            loop26:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:728:3: (d= lhs[descr] )*
+            loop29:
             do {
-                int alt26=2;
-                int LA26_0 = input.LA(1);
+                int alt29=2;
+                int LA29_0 = input.LA(1);
 
-                if ( (LA26_0==LEFT_PAREN||LA26_0==ID||LA26_0==EVAL||LA26_0==NOT||(LA26_0>=EXISTS && LA26_0<=FORALL)) ) {
-                    alt26=1;
+                if ( ((LA29_0>=LEFT_PAREN && LA29_0<=ID)||LA29_0==EVAL||LA29_0==NOT||(LA29_0>=EXISTS && LA29_0<=FORALL)) ) {
+                    alt29=1;
                 }
 
 
-                switch (alt26) {
+                switch (alt29) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:5: d= lhs[descr]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:728:5: d= lhs[descr]
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1754);
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1849);
             	    d=lhs(descr);
             	    _fsp--;
             	    if (failed) return ;
@@ -2594,7 +2684,7 @@
             	    break;
 
             	default :
-            	    break loop26;
+            	    break loop29;
                 }
             } while (true);
 
@@ -2614,21 +2704,21 @@
 
 
     // $ANTLR start lhs
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:721:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:734:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
     public final BaseDescr lhs(ConditionalElementDescr ce) throws RecognitionException {
         BaseDescr d = null;
 
         BaseDescr l = null;
 
 
-
-        		d=null;
+        
+        		d=null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:4: (l= lhs_or )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:4: l= lhs_or
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:738:4: (l= lhs_or )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:738:4: l= lhs_or
             {
-            pushFollow(FOLLOW_lhs_or_in_lhs1791);
+            pushFollow(FOLLOW_lhs_or_in_lhs1886);
             l=lhs_or();
             _fsp--;
             if (failed) return d;
@@ -2651,34 +2741,34 @@
 
 
     // $ANTLR start lhs_pattern
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:729:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:742:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );
     public final BaseDescr lhs_pattern() throws RecognitionException {
         BaseDescr d = null;
 
         BaseDescr f = null;
 
 
-
-        		d=null;
+        
+        		d=null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:733:4: (f= fact_binding | f= fact )
-            int alt27=2;
-            int LA27_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:746:4: (f= fact_binding | f= fact )
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA27_0==ID) ) {
-                int LA27_1 = input.LA(2);
+            if ( (LA30_0==ID) ) {
+                int LA30_1 = input.LA(2);
 
-                if ( (LA27_1==70) ) {
-                    alt27=1;
+                if ( (LA30_1==70) ) {
+                    alt30=1;
                 }
-                else if ( (LA27_1==LEFT_PAREN||LA27_1==LEFT_SQUARE||LA27_1==71) ) {
-                    alt27=2;
+                else if ( (LA30_1==LEFT_PAREN||LA30_1==LEFT_SQUARE||LA30_1==71) ) {
+                    alt30=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("729:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );", 27, 1, input);
+                        new NoViableAltException("742:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );", 30, 1, input);
 
                     throw nvae;
                 }
@@ -2686,15 +2776,15 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("729:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );", 27, 0, input);
+                    new NoViableAltException("742:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact );", 30, 0, input);
 
                 throw nvae;
             }
-            switch (alt27) {
+            switch (alt30) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:733:4: f= fact_binding
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:746:4: f= fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern1819);
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern1914);
                     f=fact_binding();
                     _fsp--;
                     if (failed) return d;
@@ -2705,9 +2795,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:734:4: f= fact
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:747:4: f= fact
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern1828);
+                    pushFollow(FOLLOW_fact_in_lhs_pattern1923);
                     f=fact();
                     _fsp--;
                     if (failed) return d;
@@ -2732,29 +2822,29 @@
 
 
     // $ANTLR start from_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:737:1: from_statement returns [FromDescr d] : ds= from_source[d] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:750:1: from_statement returns [FromDescr d] : ds= from_source[d] ;
     public final FromDescr from_statement() throws RecognitionException {
         FromDescr d = null;
 
         DeclarativeInvokerDescr ds = null;
 
 
-
-        		d=factory.createFrom();
+        
+        		d=factory.createFrom();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742:2: (ds= from_source[d] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742:2: ds= from_source[d]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:755:2: (ds= from_source[d] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:755:2: ds= from_source[d]
             {
-            pushFollow(FOLLOW_from_source_in_from_statement1855);
+            pushFollow(FOLLOW_from_source_in_from_statement1950);
             ds=from_source(d);
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d.setDataSource(ds);
+              
+              			d.setDataSource(ds);
+              		
               		
-              		
             }
 
             }
@@ -2772,7 +2862,7 @@
 
 
     // $ANTLR start from_source
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:752:1: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )? ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:765:1: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )? ;
     public final DeclarativeInvokerDescr from_source(FromDescr from) throws RecognitionException {
         DeclarativeInvokerDescr ds = null;
 
@@ -2781,59 +2871,59 @@
         String args = null;
 
 
-
-        		ds = null;
-        		AccessorDescr ad = null;
+        
+        		ds = null;
+        		AccessorDescr ad = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:3: (ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:3: ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:771:3: (ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:771:3: ident= identifier (args= paren_chunk[from] )? ( expression_chain[from, ad] )?
             {
-            pushFollow(FOLLOW_identifier_in_from_source1897);
+            pushFollow(FOLLOW_identifier_in_from_source1992);
             ident=identifier();
             _fsp--;
             if (failed) return ds;
             if ( backtracking==0 ) {
-
-              			ad = new AccessorDescr(ident.getText());	
-              			ad.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );
-              			ad.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-              			ad.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-              			ds = ad;
-              			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.getText());
+              
+              			ad = new AccessorDescr(ident.getText());	
+              			ad.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );
+              			ad.setStartCharacter( ((CommonToken)ident).getStartIndex() );
+              			ad.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+              			ds = ad;
+              			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.getText());
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:767:3: (args= paren_chunk[from] )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:780:3: (args= paren_chunk[from] )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA28_0==LEFT_PAREN) ) {
-                int LA28_1 = input.LA(2);
+            if ( (LA31_0==LEFT_PAREN) ) {
+                int LA31_1 = input.LA(2);
 
-                if ( (synpred43()) ) {
-                    alt28=1;
+                if ( (synpred46()) ) {
+                    alt31=1;
                 }
             }
-            switch (alt28) {
+            switch (alt31) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:767:4: args= paren_chunk[from]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:780:4: args= paren_chunk[from]
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source1908);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source2003);
                     args=paren_chunk(from);
                     _fsp--;
                     if (failed) return ds;
                     if ( backtracking==0 ) {
-
-                      			if( args != null ) {
-                      				ad.setVariableName( null );
-                      				FunctionCallDescr fc = new FunctionCallDescr(ident.getText());
-                      				fc.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );			
-                      				fc.setArguments(args);
-                      				fc.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-                      				fc.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-                      				ad.addInvoker(fc);
-                      				location.setProperty(Location.LOCATION_FROM_CONTENT, args);
-                      			}
+                      
+                      			if( args != null ) {
+                      				ad.setVariableName( null );
+                      				FunctionCallDescr fc = new FunctionCallDescr(ident.getText());
+                      				fc.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );			
+                      				fc.setArguments(args);
+                      				fc.setStartCharacter( ((CommonToken)ident).getStartIndex() );
+                      				fc.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+                      				ad.addInvoker(fc);
+                      				location.setProperty(Location.LOCATION_FROM_CONTENT, args);
+                      			}
                       		
                     }
 
@@ -2842,18 +2932,18 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:781:3: ( expression_chain[from, ad] )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:794:3: ( expression_chain[from, ad] )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA29_0==71) ) {
-                alt29=1;
+            if ( (LA32_0==71) ) {
+                alt32=1;
             }
-            switch (alt29) {
+            switch (alt32) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: expression_chain[from, ad]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: expression_chain[from, ad]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source1922);
+                    pushFollow(FOLLOW_expression_chain_in_from_source2017);
                     expression_chain(from,  ad);
                     _fsp--;
                     if (failed) return ds;
@@ -2864,10 +2954,10 @@
             }
 
             if ( backtracking==0 ) {
-
-              			if( ad != null ) {
-              				location.setProperty(Location.LOCATION_FROM_CONTENT, ad.toString() );
-              			}
+              
+              			if( ad != null ) {
+              				location.setProperty(Location.LOCATION_FROM_CONTENT, ad.toString() );
+              			}
               		
             }
 
@@ -2886,7 +2976,7 @@
 
 
     // $ANTLR start expression_chain
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:1: expression_chain[FromDescr from, AccessorDescr as] : ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:802:1: expression_chain[FromDescr from, AccessorDescr as] : ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? ) ;
     public final void expression_chain(FromDescr from, AccessorDescr as) throws RecognitionException {
         Token field = null;
 
@@ -2895,72 +2985,72 @@
         String paarg = null;
 
 
-
-          		FieldAccessDescr fa = null;
-        	    	MethodAccessDescr ma = null;	
+        
+          		FieldAccessDescr fa = null;
+        	    	MethodAccessDescr ma = null;	
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:795:2: ( ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:795:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:808:2: ( ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:808:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:795:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:795:4: '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:808:2: ( '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:808:4: '.' field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )? ( expression_chain[from, as] )?
             {
-            match(input,71,FOLLOW_71_in_expression_chain1951); if (failed) return ;
-            pushFollow(FOLLOW_identifier_in_expression_chain1955);
+            match(input,71,FOLLOW_71_in_expression_chain2046); if (failed) return ;
+            pushFollow(FOLLOW_identifier_in_expression_chain2050);
             field=identifier();
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              	        fa = new FieldAccessDescr(field.getText());	
-              		fa.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-              		fa.setStartCharacter( ((CommonToken)field).getStartIndex() );
-              		fa.setEndCharacter( ((CommonToken)field).getStopIndex() );
+              
+              	        fa = new FieldAccessDescr(field.getText());	
+              		fa.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
+              		fa.setStartCharacter( ((CommonToken)field).getStartIndex() );
+              		fa.setEndCharacter( ((CommonToken)field).getStopIndex() );
               	    
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:802:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )?
-            int alt30=3;
-            int LA30_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:815:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk[from] | ( LEFT_PAREN )=>paarg= paren_chunk[from] )?
+            int alt33=3;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA30_0==LEFT_SQUARE) && (synpred45())) {
-                alt30=1;
+            if ( (LA33_0==LEFT_SQUARE) && (synpred48())) {
+                alt33=1;
             }
-            else if ( (LA30_0==LEFT_PAREN) ) {
-                int LA30_2 = input.LA(2);
+            else if ( (LA33_0==LEFT_PAREN) ) {
+                int LA33_2 = input.LA(2);
 
-                if ( (synpred46()) ) {
-                    alt30=2;
+                if ( (synpred49()) ) {
+                    alt33=2;
                 }
             }
-            switch (alt30) {
+            switch (alt33) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:6: ( LEFT_SQUARE )=>sqarg= square_chunk[from]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:816:6: ( LEFT_SQUARE )=>sqarg= square_chunk[from]
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain1986);
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain2081);
                     sqarg=square_chunk(from);
                     _fsp--;
                     if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      	          fa.setArgument( sqarg );	
+                      
+                      	          fa.setArgument( sqarg );	
                       	      
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:808:6: ( LEFT_PAREN )=>paarg= paren_chunk[from]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:821:6: ( LEFT_PAREN )=>paarg= paren_chunk[from]
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain2020);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain2115);
                     paarg=paren_chunk(from);
                     _fsp--;
                     if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      	    	  ma = new MethodAccessDescr( field.getText(), paarg );	
-                      		  ma.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-                      		  ma.setStartCharacter( ((CommonToken)field).getStartIndex() );
+                      
+                      	    	  ma = new MethodAccessDescr( field.getText(), paarg );	
+                      		  ma.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
+                      		  ma.setStartCharacter( ((CommonToken)field).getStartIndex() );
                       		
                     }
 
@@ -2970,26 +3060,26 @@
             }
 
             if ( backtracking==0 ) {
-
-              	      if( ma != null ) {
-              	          as.addInvoker( ma );
-              	      } else {
-              	          as.addInvoker( fa );
-              	      }
+              
+              	      if( ma != null ) {
+              	          as.addInvoker( ma );
+              	      } else {
+              	          as.addInvoker( fa );
+              	      }
               	  
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:4: ( expression_chain[from, as] )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:835:4: ( expression_chain[from, as] )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA31_0==71) ) {
-                alt31=1;
+            if ( (LA34_0==71) ) {
+                alt34=1;
             }
-            switch (alt31) {
+            switch (alt34) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: expression_chain[from, as]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: expression_chain[from, as]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain2041);
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain2136);
                     expression_chain(from,  as);
                     _fsp--;
                     if (failed) return ;
@@ -3018,7 +3108,7 @@
 
 
     // $ANTLR start accumulate_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:826:1: accumulate_statement returns [AccumulateDescr d] : loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:839:1: accumulate_statement returns [AccumulateDescr d] : loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN ;
     public final AccumulateDescr accumulate_statement() throws RecognitionException {
         AccumulateDescr d = null;
 
@@ -3028,39 +3118,39 @@
         String text = null;
 
 
-
-        		d = factory.createAccumulate();
+        
+        		d = factory.createAccumulate();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:10: (loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:10: loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:844:10: (loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:844:10: loc= ACCUMULATE LEFT_PAREN pattern= lhs_pattern ( COMMA )? INIT text= paren_chunk[null] ( COMMA )? ACTION text= paren_chunk[null] ( COMMA )? RESULT text= paren_chunk[null] loc= RIGHT_PAREN
             {
             loc=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2082); if (failed) return d;
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2177); if (failed) return d;
             if ( backtracking==0 ) {
-               
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
+               
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2092); if (failed) return d;
-            pushFollow(FOLLOW_lhs_pattern_in_accumulate_statement2096);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2187); if (failed) return d;
+            pushFollow(FOLLOW_lhs_pattern_in_accumulate_statement2191);
             pattern=lhs_pattern();
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:837:34: ( COMMA )?
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:850:34: ( COMMA )?
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA32_0==COMMA) ) {
-                alt32=1;
+            if ( (LA35_0==COMMA) ) {
+                alt35=1;
             }
-            switch (alt32) {
+            switch (alt35) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: COMMA
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: COMMA
                     {
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2098); if (failed) return d;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2193); if (failed) return d;
 
                     }
                     break;
@@ -3068,32 +3158,32 @@
             }
 
             if ( backtracking==0 ) {
-
-              		        d.setSourcePattern( (PatternDescr)pattern );
+              
+              		        d.setSourcePattern( (PatternDescr)pattern );
               		
             }
-            match(input,INIT,FOLLOW_INIT_in_accumulate_statement2108); if (failed) return d;
+            match(input,INIT,FOLLOW_INIT_in_accumulate_statement2203); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
+              
+              			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
               		
             }
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2119);
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2214);
             text=paren_chunk(null);
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:845:26: ( COMMA )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:858:26: ( COMMA )?
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA33_0==COMMA) ) {
-                alt33=1;
+            if ( (LA36_0==COMMA) ) {
+                alt36=1;
             }
-            switch (alt33) {
+            switch (alt36) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: COMMA
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: COMMA
                     {
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2122); if (failed) return d;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2217); if (failed) return d;
 
                     }
                     break;
@@ -3101,31 +3191,31 @@
             }
 
             if ( backtracking==0 ) {
-
-              			if( text != null ) {
-              			        d.setInitCode( text.substring(1, text.length()-1) );
-              				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT, d.getInitCode());
-              				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION );
-              			}
+              
+              			if( text != null ) {
+              			        d.setInitCode( text.substring(1, text.length()-1) );
+              				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT, d.getInitCode());
+              				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION );
+              			}
               		
             }
-            match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement2131); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2135);
+            match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement2226); if (failed) return d;
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2230);
             text=paren_chunk(null);
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:853:33: ( COMMA )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:866:33: ( COMMA )?
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA34_0==COMMA) ) {
-                alt34=1;
+            if ( (LA37_0==COMMA) ) {
+                alt37=1;
             }
-            switch (alt34) {
+            switch (alt37) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:0:0: COMMA
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:0:0: COMMA
                     {
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2138); if (failed) return d;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2233); if (failed) return d;
 
                     }
                     break;
@@ -3133,33 +3223,33 @@
             }
 
             if ( backtracking==0 ) {
-
-              			if( text != null ) {
-              			        d.setActionCode( text.substring(1, text.length()-1) );
-              	       			location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT, d.getActionCode());
-              				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT );
-              			}
+              
+              			if( text != null ) {
+              			        d.setActionCode( text.substring(1, text.length()-1) );
+              	       			location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT, d.getActionCode());
+              				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT );
+              			}
               		
             }
-            match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement2147); if (failed) return d;
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2151);
+            match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement2242); if (failed) return d;
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2246);
             text=paren_chunk(null);
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-
-              			if( text != null ) {
-              			        d.setResultCode( text.substring(1, text.length()-1) );
-              				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT, d.getResultCode());
-              			}
+              
+              			if( text != null ) {
+              			        d.setResultCode( text.substring(1, text.length()-1) );
+              				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT, d.getResultCode());
+              			}
               		
             }
             loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2163); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2258); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              
+              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
               		
             }
 
@@ -3178,7 +3268,7 @@
 
 
     // $ANTLR start collect_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:875:1: collect_statement returns [CollectDescr d] : loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:888:1: collect_statement returns [CollectDescr d] : loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN ;
     public final CollectDescr collect_statement() throws RecognitionException {
         CollectDescr d = null;
 
@@ -3186,34 +3276,34 @@
         BaseDescr pattern = null;
 
 
-
-        		d = factory.createCollect();
+        
+        		d = factory.createCollect();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:880:10: (loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:880:10: loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:893:10: (loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:893:10: loc= COLLECT LEFT_PAREN pattern= lhs_pattern loc= RIGHT_PAREN
             {
             loc=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement2206); if (failed) return d;
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement2301); if (failed) return d;
             if ( backtracking==0 ) {
-               
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
+               
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement2216); if (failed) return d;
-            pushFollow(FOLLOW_lhs_pattern_in_collect_statement2220);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement2311); if (failed) return d;
+            pushFollow(FOLLOW_lhs_pattern_in_collect_statement2315);
             pattern=lhs_pattern();
             _fsp--;
             if (failed) return d;
             loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement2224); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement2319); if (failed) return d;
             if ( backtracking==0 ) {
-
-              		        d.setSourcePattern( (PatternDescr)pattern );
-              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+              
+              		        d.setSourcePattern( (PatternDescr)pattern );
+              			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
               		
             }
 
@@ -3232,7 +3322,7 @@
 
 
     // $ANTLR start fact_binding
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:894:1: fact_binding returns [BaseDescr d] : id= ID ':' fe= fact_expression[id.getText()] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:907:1: fact_binding returns [BaseDescr d] : id= ID ':' fe= fact_expression[id.getText()] ;
     public final BaseDescr fact_binding() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3240,35 +3330,35 @@
         BaseDescr fe = null;
 
 
-
-        		d=null;
-        		boolean multi=false;
+        
+        		d=null;
+        		boolean multi=false;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:900:4: (id= ID ':' fe= fact_expression[id.getText()] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:900:4: id= ID ':' fe= fact_expression[id.getText()]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:913:4: (id= ID ':' fe= fact_expression[id.getText()] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:913:4: id= ID ':' fe= fact_expression[id.getText()]
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_fact_binding2258); if (failed) return d;
-            match(input,70,FOLLOW_70_in_fact_binding2260); if (failed) return d;
+            match(input,ID,FOLLOW_ID_in_fact_binding2353); if (failed) return d;
+            match(input,70,FOLLOW_70_in_fact_binding2355); if (failed) return d;
             if ( backtracking==0 ) {
-
-               		        // handling incomplete parsing
-               		        d = new PatternDescr( );
-               		        ((PatternDescr) d).setIdentifier( id.getText() );
+              
+               		        // handling incomplete parsing
+               		        d = new PatternDescr( );
+               		        ((PatternDescr) d).setIdentifier( id.getText() );
                		
             }
-            pushFollow(FOLLOW_fact_expression_in_fact_binding2273);
+            pushFollow(FOLLOW_fact_expression_in_fact_binding2368);
             fe=fact_expression(id.getText());
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-
-               		        // override previously instantiated pattern
-               			d=fe;
-               			if( d != null ) {
-                 			    d.setStartCharacter( ((CommonToken)id).getStartIndex() );
-                 			}
+              
+               		        // override previously instantiated pattern
+               			d=fe;
+               			if( d != null ) {
+                 			    d.setStartCharacter( ((CommonToken)id).getStartIndex() );
+                 			}
                		
             }
 
@@ -3287,7 +3377,7 @@
 
 
     // $ANTLR start fact_expression
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:916:2: fact_expression[String id] returns [BaseDescr pd] : ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* );
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:929:2: fact_expression[String id] returns [BaseDescr pd] : ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* );
     public final BaseDescr fact_expression(String id) throws RecognitionException {
         BaseDescr pd = null;
 
@@ -3296,38 +3386,38 @@
         BaseDescr f = null;
 
 
-
-         		pd = null;
-         		boolean multi = false;
+        
+         		pd = null;
+         		boolean multi = false;
          	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:921:5: ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* )
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:934:5: ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA36_0==LEFT_PAREN) ) {
-                alt36=1;
+            if ( (LA39_0==LEFT_PAREN) ) {
+                alt39=1;
             }
-            else if ( (LA36_0==ID) ) {
-                alt36=2;
+            else if ( (LA39_0==ID) ) {
+                alt39=2;
             }
             else {
                 if (backtracking>0) {failed=true; return pd;}
                 NoViableAltException nvae =
-                    new NoViableAltException("916:2: fact_expression[String id] returns [BaseDescr pd] : ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* );", 36, 0, input);
+                    new NoViableAltException("929:2: fact_expression[String id] returns [BaseDescr pd] : ( LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN | f= fact ( ( OR | DOUBLE_PIPE ) f= fact )* );", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt36) {
+            switch (alt39) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:921:5: LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:934:5: LEFT_PAREN fe= fact_expression[id] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_expression2305); if (failed) return pd;
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2309);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_expression2400); if (failed) return pd;
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2404);
                     fe=fact_expression(id);
                     _fsp--;
                     if (failed) return pd;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_expression2312); if (failed) return pd;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_expression2407); if (failed) return pd;
                     if ( backtracking==0 ) {
                        pd=fe; 
                     }
@@ -3335,38 +3425,38 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:922:6: f= fact ( ( OR | DOUBLE_PIPE ) f= fact )*
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:935:6: f= fact ( ( OR | DOUBLE_PIPE ) f= fact )*
                     {
-                    pushFollow(FOLLOW_fact_in_fact_expression2323);
+                    pushFollow(FOLLOW_fact_in_fact_expression2418);
                     f=fact();
                     _fsp--;
                     if (failed) return pd;
                     if ( backtracking==0 ) {
-
-                       			((PatternDescr)f).setIdentifier( id );
-                       			pd = f;
+                      
+                       			((PatternDescr)f).setIdentifier( id );
+                       			pd = f;
                        		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:4: ( ( OR | DOUBLE_PIPE ) f= fact )*
-                    loop35:
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:4: ( ( OR | DOUBLE_PIPE ) f= fact )*
+                    loop38:
                     do {
-                        int alt35=2;
-                        int LA35_0 = input.LA(1);
+                        int alt38=2;
+                        int LA38_0 = input.LA(1);
 
-                        if ( ((LA35_0>=OR && LA35_0<=DOUBLE_PIPE)) ) {
-                            int LA35_7 = input.LA(2);
+                        if ( ((LA38_0>=OR && LA38_0<=DOUBLE_PIPE)) ) {
+                            int LA38_7 = input.LA(2);
 
-                            if ( (synpred53()) ) {
-                                alt35=1;
+                            if ( (synpred56()) ) {
+                                alt38=1;
                             }
 
 
                         }
 
 
-                        switch (alt35) {
+                        switch (alt38) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:6: ( OR | DOUBLE_PIPE ) f= fact
+                    	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:6: ( OR | DOUBLE_PIPE ) f= fact
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -3376,26 +3466,26 @@
                     	        if (backtracking>0) {failed=true; return pd;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_expression2335);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_expression2430);    throw mse;
                     	    }
 
                     	    if ( backtracking==0 ) {
-                    	      	if ( ! multi ) {
-                    	       					BaseDescr first = pd;
-                    	       					pd = new OrDescr();
-                    	       					((OrDescr)pd).addDescr( first );
-                    	       					multi=true;
-                    	       				}
+                    	      	if ( ! multi ) {
+                    	       					BaseDescr first = pd;
+                    	       					pd = new OrDescr();
+                    	       					((OrDescr)pd).addDescr( first );
+                    	       					multi=true;
+                    	       				}
                     	       			
                     	    }
-                    	    pushFollow(FOLLOW_fact_in_fact_expression2353);
+                    	    pushFollow(FOLLOW_fact_in_fact_expression2448);
                     	    f=fact();
                     	    _fsp--;
                     	    if (failed) return pd;
                     	    if ( backtracking==0 ) {
-
-                    	       				((PatternDescr)f).setIdentifier( id );
-                    	       				((OrDescr)pd).addDescr( f );
+                    	      
+                    	       				((PatternDescr)f).setIdentifier( id );
+                    	       				((OrDescr)pd).addDescr( f );
                     	       			
                     	    }
 
@@ -3403,7 +3493,7 @@
                     	    break;
 
                     	default :
-                    	    break loop35;
+                    	    break loop38;
                         }
                     } while (true);
 
@@ -3425,7 +3515,7 @@
 
 
     // $ANTLR start fact
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:1: fact returns [BaseDescr d] : id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:956:1: fact returns [BaseDescr d] : id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN ;
     public final BaseDescr fact() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3434,53 +3524,53 @@
         String id = null;
 
 
-
-        		d=null;
-        		PatternDescr pattern = null;
+        
+        		d=null;
+        		PatternDescr pattern = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:949:11: (id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:949:11: id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:962:11: (id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:962:11: id= dotted_name[d] loc= LEFT_PAREN ( constraints[pattern] )? endLoc= RIGHT_PAREN
             {
             if ( backtracking==0 ) {
-
-               			pattern = new PatternDescr( );
-               			d = pattern; 
+              
+               			pattern = new PatternDescr( );
+               			d = pattern; 
                	        
             }
-            pushFollow(FOLLOW_dotted_name_in_fact2414);
+            pushFollow(FOLLOW_dotted_name_in_fact2509);
             id=dotted_name(d);
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-               
-               		        pattern.setObjectType( id );
-               		        pattern.setEndCharacter( -1 );
+               
+               		        pattern.setObjectType( id );
+               		        pattern.setEndCharacter( -1 );
                		
             }
             loc=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact2428); if (failed) return d;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact2523); if (failed) return d;
             if ( backtracking==0 ) {
-
-              		                location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
-                          			location.setProperty( Location.LOCATION_PROPERTY_CLASS_NAME, id );
-               				
-               				pattern.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-               			        pattern.setLeftParentCharacter( ((CommonToken)loc).getStartIndex() );
+              
+              		                location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
+                          			location.setProperty( Location.LOCATION_PROPERTY_CLASS_NAME, id );
+               				
+               				pattern.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+               			        pattern.setLeftParentCharacter( ((CommonToken)loc).getStartIndex() );
                			
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:965:4: ( constraints[pattern] )?
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:978:4: ( constraints[pattern] )?
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( ((LA37_0>=ATTRIBUTES && LA37_0<=WHEN)||LA37_0==ENABLED||LA37_0==SALIENCE||LA37_0==DURATION||(LA37_0>=ACCUMULATE && LA37_0<=LEFT_PAREN)||(LA37_0>=INIT && LA37_0<=RESULT)||(LA37_0>=COLLECT && LA37_0<=OR)||(LA37_0>=EVAL && LA37_0<=IN)||LA37_0==NULL||(LA37_0>=AND && LA37_0<=THEN)) ) {
-                alt37=1;
+            if ( ((LA40_0>=ATTRIBUTES && LA40_0<=ID)||(LA40_0>=END && LA40_0<=WHEN)||LA40_0==ENABLED||LA40_0==SALIENCE||LA40_0==DURATION||LA40_0==ACCUMULATE||(LA40_0>=INIT && LA40_0<=OR)||(LA40_0>=EVAL && LA40_0<=IN)||LA40_0==NULL||(LA40_0>=AND && LA40_0<=THEN)) ) {
+                alt40=1;
             }
-            switch (alt37) {
+            switch (alt40) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:965:6: constraints[pattern]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:978:6: constraints[pattern]
                     {
-                    pushFollow(FOLLOW_constraints_in_fact2438);
+                    pushFollow(FOLLOW_constraints_in_fact2533);
                     constraints(pattern);
                     _fsp--;
                     if (failed) return d;
@@ -3491,15 +3581,15 @@
             }
 
             endLoc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact2451); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact2546); if (failed) return d;
             if ( backtracking==0 ) {
-
-              		        if( endLoc.getType() == RIGHT_PAREN ) {
-              				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-              				pattern.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
-              				pattern.setEndCharacter( ((CommonToken)endLoc).getStopIndex() );
-               			        pattern.setRightParentCharacter( ((CommonToken)endLoc).getStartIndex() );
-              			}
+              
+              		        if( endLoc.getType() == RIGHT_PAREN ) {
+              				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+              				pattern.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
+              				pattern.setEndCharacter( ((CommonToken)endLoc).getStopIndex() );
+               			        pattern.setRightParentCharacter( ((CommonToken)endLoc).getStartIndex() );
+              			}
                		
             }
 
@@ -3518,36 +3608,36 @@
 
 
     // $ANTLR start constraints
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:978:1: constraints[PatternDescr pattern] : constraint[pattern] ( ',' constraint[pattern] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:991:1: constraints[PatternDescr pattern] : constraint[pattern] ( ',' constraint[pattern] )* ;
     public final void constraints(PatternDescr pattern) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:4: ( constraint[pattern] ( ',' constraint[pattern] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:4: constraint[pattern] ( ',' constraint[pattern] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:992:4: ( constraint[pattern] ( ',' constraint[pattern] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:992:4: constraint[pattern] ( ',' constraint[pattern] )*
             {
-            pushFollow(FOLLOW_constraint_in_constraints2471);
+            pushFollow(FOLLOW_constraint_in_constraints2566);
             constraint(pattern);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:980:3: ( ',' constraint[pattern] )*
-            loop38:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:993:3: ( ',' constraint[pattern] )*
+            loop41:
             do {
-                int alt38=2;
-                int LA38_0 = input.LA(1);
+                int alt41=2;
+                int LA41_0 = input.LA(1);
 
-                if ( (LA38_0==COMMA) ) {
-                    alt38=1;
+                if ( (LA41_0==COMMA) ) {
+                    alt41=1;
                 }
 
 
-                switch (alt38) {
+                switch (alt41) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:980:5: ',' constraint[pattern]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:993:5: ',' constraint[pattern]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints2478); if (failed) return ;
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints2573); if (failed) return ;
             	    if ( backtracking==0 ) {
             	       location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); 
             	    }
-            	    pushFollow(FOLLOW_constraint_in_constraints2487);
+            	    pushFollow(FOLLOW_constraint_in_constraints2582);
             	    constraint(pattern);
             	    _fsp--;
             	    if (failed) return ;
@@ -3556,7 +3646,7 @@
             	    break;
 
             	default :
-            	    break loop38;
+            	    break loop41;
                 }
             } while (true);
 
@@ -3576,21 +3666,21 @@
 
 
     // $ANTLR start constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:985:1: constraint[PatternDescr pattern] : or_constr[top] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:998:1: constraint[PatternDescr pattern] : or_constr[top] ;
     public final void constraint(PatternDescr pattern) throws RecognitionException {
-
-        		ConditionalElementDescr top = null;
+        
+        		ConditionalElementDescr top = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:990:3: ( or_constr[top] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:990:3: or_constr[top]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1003:3: ( or_constr[top] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1003:3: or_constr[top]
             {
             if ( backtracking==0 ) {
-
-              			top = pattern.getConstraint();
+              
+              			top = pattern.getConstraint();
               		
             }
-            pushFollow(FOLLOW_or_constr_in_constraint2520);
+            pushFollow(FOLLOW_or_constr_in_constraint2615);
             or_constr(top);
             _fsp--;
             if (failed) return ;
@@ -3610,44 +3700,44 @@
 
 
     // $ANTLR start or_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:996:1: or_constr[ConditionalElementDescr base] : and_constr[or] (t= DOUBLE_PIPE and_constr[or] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1009:1: or_constr[ConditionalElementDescr base] : and_constr[or] (t= DOUBLE_PIPE and_constr[or] )* ;
     public final void or_constr(ConditionalElementDescr base) throws RecognitionException {
         Token t=null;
 
-
-        		OrDescr or = new OrDescr();
+        
+        		OrDescr or = new OrDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1001:3: ( and_constr[or] (t= DOUBLE_PIPE and_constr[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1001:3: and_constr[or] (t= DOUBLE_PIPE and_constr[or] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1014:3: ( and_constr[or] (t= DOUBLE_PIPE and_constr[or] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1014:3: and_constr[or] (t= DOUBLE_PIPE and_constr[or] )*
             {
-            pushFollow(FOLLOW_and_constr_in_or_constr2543);
+            pushFollow(FOLLOW_and_constr_in_or_constr2638);
             and_constr(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1002:3: (t= DOUBLE_PIPE and_constr[or] )*
-            loop39:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1015:3: (t= DOUBLE_PIPE and_constr[or] )*
+            loop42:
             do {
-                int alt39=2;
-                int LA39_0 = input.LA(1);
+                int alt42=2;
+                int LA42_0 = input.LA(1);
 
-                if ( (LA39_0==DOUBLE_PIPE) ) {
-                    alt39=1;
+                if ( (LA42_0==DOUBLE_PIPE) ) {
+                    alt42=1;
                 }
 
 
-                switch (alt39) {
+                switch (alt42) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1002:5: t= DOUBLE_PIPE and_constr[or]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1015:5: t= DOUBLE_PIPE and_constr[or]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr2553); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr2648); if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
+            	      
+            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      			
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr2563);
+            	    pushFollow(FOLLOW_and_constr_in_or_constr2658);
             	    and_constr(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -3656,17 +3746,17 @@
             	    break;
 
             	default :
-            	    break loop39;
+            	    break loop42;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		        if( or.getDescrs().size() == 1 ) {
-              		                base.addOrMerge( (BaseDescr) or.getDescrs().get(0) );
-              		        } else if ( or.getDescrs().size() > 1 ) {
-              		        	base.addDescr( or );
-              		        }
+              
+              		        if( or.getDescrs().size() == 1 ) {
+              		                base.addOrMerge( (BaseDescr) or.getDescrs().get(0) );
+              		        } else if ( or.getDescrs().size() > 1 ) {
+              		        	base.addDescr( or );
+              		        }
               		
             }
 
@@ -3685,44 +3775,44 @@
 
 
     // $ANTLR start and_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1017:1: and_constr[ConditionalElementDescr base] : unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1030:1: and_constr[ConditionalElementDescr base] : unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )* ;
     public final void and_constr(ConditionalElementDescr base) throws RecognitionException {
         Token t=null;
 
-
-        		AndDescr and = new AndDescr();
+        
+        		AndDescr and = new AndDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:3: ( unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:3: unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:3: ( unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1035:3: unary_constr[and] (t= DOUBLE_AMPER unary_constr[and] )*
             {
-            pushFollow(FOLLOW_unary_constr_in_and_constr2595);
+            pushFollow(FOLLOW_unary_constr_in_and_constr2690);
             unary_constr(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1023:3: (t= DOUBLE_AMPER unary_constr[and] )*
-            loop40:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1036:3: (t= DOUBLE_AMPER unary_constr[and] )*
+            loop43:
             do {
-                int alt40=2;
-                int LA40_0 = input.LA(1);
+                int alt43=2;
+                int LA43_0 = input.LA(1);
 
-                if ( (LA40_0==DOUBLE_AMPER) ) {
-                    alt40=1;
+                if ( (LA43_0==DOUBLE_AMPER) ) {
+                    alt43=1;
                 }
 
 
-                switch (alt40) {
+                switch (alt43) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1023:5: t= DOUBLE_AMPER unary_constr[and]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1036:5: t= DOUBLE_AMPER unary_constr[and]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr2605); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr2700); if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
+            	      
+            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      			
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr2615);
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr2710);
             	    unary_constr(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -3731,17 +3821,17 @@
             	    break;
 
             	default :
-            	    break loop40;
+            	    break loop43;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		        if( and.getDescrs().size() == 1) {
-              		                base.addOrMerge( (BaseDescr) and.getDescrs().get(0) );
-              		        } else if( and.getDescrs().size() > 1) {
-              		        	base.addDescr( and );
-              		        }
+              
+              		        if( and.getDescrs().size() == 1) {
+              		                base.addOrMerge( (BaseDescr) and.getDescrs().get(0) );
+              		        } else if( and.getDescrs().size() > 1) {
+              		        	base.addDescr( and );
+              		        }
               		
             }
 
@@ -3760,14 +3850,14 @@
 
 
     // $ANTLR start unary_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1038:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1051:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] ) ;
     public final void unary_constr(ConditionalElementDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:3: ( ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:3: ( ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )
-            int alt41=3;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )
+            int alt44=3;
             switch ( input.LA(1) ) {
             case ATTRIBUTES:
             case PACKAGE:
@@ -3775,6 +3865,7 @@
             case FUNCTION:
             case GLOBAL:
             case QUERY:
+            case ID:
             case END:
             case TEMPLATE:
             case RULE:
@@ -3787,7 +3878,6 @@
             case ACTION:
             case RESULT:
             case COLLECT:
-            case ID:
             case OR:
             case CONTAINS:
             case NOT:
@@ -3802,23 +3892,23 @@
             case FORALL:
             case THEN:
                 {
-                alt41=1;
+                alt44=1;
                 }
                 break;
             case EVAL:
                 {
-                int LA41_28 = input.LA(2);
+                int LA44_28 = input.LA(2);
 
-                if ( (synpred58()) ) {
-                    alt41=1;
+                if ( (synpred61()) ) {
+                    alt44=1;
                 }
                 else if ( (true) ) {
-                    alt41=3;
+                    alt44=3;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1040:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )", 41, 28, input);
+                        new NoViableAltException("1053:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )", 44, 28, input);
 
                     throw nvae;
                 }
@@ -3826,22 +3916,22 @@
                 break;
             case LEFT_PAREN:
                 {
-                alt41=2;
+                alt44=2;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1040:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )", 41, 0, input);
+                    new NoViableAltException("1053:3: ( field_constraint[base] | LEFT_PAREN or_constr[base] RIGHT_PAREN | EVAL predicate[base] )", 44, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt41) {
+            switch (alt44) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:5: field_constraint[base]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:5: field_constraint[base]
                     {
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr2643);
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr2738);
                     field_constraint(base);
                     _fsp--;
                     if (failed) return ;
@@ -3849,22 +3939,22 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:5: LEFT_PAREN or_constr[base] RIGHT_PAREN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1054:5: LEFT_PAREN or_constr[base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr2651); if (failed) return ;
-                    pushFollow(FOLLOW_or_constr_in_unary_constr2653);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr2746); if (failed) return ;
+                    pushFollow(FOLLOW_or_constr_in_unary_constr2748);
                     or_constr(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr2656); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr2751); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1042:5: EVAL predicate[base]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1055:5: EVAL predicate[base]
                     {
-                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr2662); if (failed) return ;
-                    pushFollow(FOLLOW_predicate_in_unary_constr2664);
+                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr2757); if (failed) return ;
+                    pushFollow(FOLLOW_predicate_in_unary_constr2759);
                     predicate(base);
                     _fsp--;
                     if (failed) return ;
@@ -3890,47 +3980,47 @@
 
 
     // $ANTLR start field_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:1: field_constraint[ConditionalElementDescr base] : (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )? ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1059:1: field_constraint[ConditionalElementDescr base] : (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )? ;
     public final void field_constraint(ConditionalElementDescr base) throws RecognitionException {
         Token fb=null;
         Token f = null;
 
 
-
-        		FieldBindingDescr fbd = null;
-        		FieldConstraintDescr fc = null;
-        		RestrictionConnectiveDescr top = null;
+        
+        		FieldBindingDescr fbd = null;
+        		FieldConstraintDescr fc = null;
+        		RestrictionConnectiveDescr top = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1053:3: ( (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1053:3: (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )?
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1066:3: ( (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )? )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1066:3: (fb= ID ':' )? f= identifier ( or_restr_connective[top] | '->' predicate[base] )?
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1053:3: (fb= ID ':' )?
-            int alt42=2;
-            int LA42_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1066:3: (fb= ID ':' )?
+            int alt45=2;
+            int LA45_0 = input.LA(1);
 
-            if ( (LA42_0==ID) ) {
-                int LA42_1 = input.LA(2);
+            if ( (LA45_0==ID) ) {
+                int LA45_1 = input.LA(2);
 
-                if ( (LA42_1==70) ) {
-                    alt42=1;
+                if ( (LA45_1==70) ) {
+                    alt45=1;
                 }
             }
-            switch (alt42) {
+            switch (alt45) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1053:5: fb= ID ':'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1066:5: fb= ID ':'
                     {
                     fb=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_field_constraint2696); if (failed) return ;
-                    match(input,70,FOLLOW_70_in_field_constraint2698); if (failed) return ;
+                    match(input,ID,FOLLOW_ID_in_field_constraint2791); if (failed) return ;
+                    match(input,70,FOLLOW_70_in_field_constraint2793); 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() );
-                      			base.addDescr( fbd );
-
+                       
+                      			fbd = new FieldBindingDescr();
+                      			fbd.setIdentifier( fb.getText() );
+                      			fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
+                      			fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
+                      			base.addDescr( fbd );
+                      
                       		    
                     }
 
@@ -3939,66 +4029,66 @@
 
             }
 
-            pushFollow(FOLLOW_identifier_in_field_constraint2719);
+            pushFollow(FOLLOW_identifier_in_field_constraint2814);
             f=identifier();
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              		    if( f != null ) {
-              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
-              			location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, f.getText());
-              		    
-              			if ( fbd != null ) {
-              			    fbd.setFieldName( f.getText() );
-               			    fbd.setEndCharacter( ((CommonToken)f).getStopIndex() );
-              			} 
-              			fc = new FieldConstraintDescr(f.getText());
-              			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-              			fc.setStartCharacter( ((CommonToken)f).getStartIndex() );
-              			top = fc.getRestriction();
-              			
-              			// it must be a field constraint, as it is not a binding
-              			if( fb == null ) {
-              			    base.addDescr( fc );
-              			}
-              		    }
+              
+              		    if( f != null ) {
+              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+              			location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, f.getText());
+              		    
+              			if ( fbd != null ) {
+              			    fbd.setFieldName( f.getText() );
+               			    fbd.setEndCharacter( ((CommonToken)f).getStopIndex() );
+              			} 
+              			fc = new FieldConstraintDescr(f.getText());
+              			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+              			fc.setStartCharacter( ((CommonToken)f).getStartIndex() );
+              			top = fc.getRestriction();
+              			
+              			// it must be a field constraint, as it is not a binding
+              			if( fb == null ) {
+              			    base.addDescr( fc );
+              			}
+              		    }
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1084:3: ( or_restr_connective[top] | '->' predicate[base] )?
-            int alt43=3;
-            int LA43_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1097:3: ( or_restr_connective[top] | '->' predicate[base] )?
+            int alt46=3;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA43_0==LEFT_PAREN||(LA43_0>=CONTAINS && LA43_0<=IN)||(LA43_0>=74 && LA43_0<=79)) ) {
-                alt43=1;
+            if ( (LA46_0==LEFT_PAREN||(LA46_0>=CONTAINS && LA46_0<=IN)||(LA46_0>=74 && LA46_0<=79)) ) {
+                alt46=1;
             }
-            else if ( (LA43_0==73) ) {
-                alt43=2;
+            else if ( (LA46_0==73) ) {
+                alt46=2;
             }
-            switch (alt43) {
+            switch (alt46) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1085:4: or_restr_connective[top]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1098:4: or_restr_connective[top]
                     {
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint2733);
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint2828);
                     or_restr_connective(top);
                     _fsp--;
                     if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      				// we must add now as we didn't before
-                      				if( fb != null) {
-                      				    base.addDescr( fc );
-                      				}
+                      
+                      				// we must add now as we didn't before
+                      				if( fb != null) {
+                      				    base.addDescr( fc );
+                      				}
                       			
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1093:4: '->' predicate[base]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1106:4: '->' predicate[base]
                     {
-                    match(input,73,FOLLOW_73_in_field_constraint2748); if (failed) return ;
-                    pushFollow(FOLLOW_predicate_in_field_constraint2750);
+                    match(input,73,FOLLOW_73_in_field_constraint2843); if (failed) return ;
+                    pushFollow(FOLLOW_predicate_in_field_constraint2845);
                     predicate(base);
                     _fsp--;
                     if (failed) return ;
@@ -4024,50 +4114,50 @@
 
 
     // $ANTLR start or_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1098:1: or_restr_connective[ RestrictionConnectiveDescr base ] : and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1111:1: or_restr_connective[ RestrictionConnectiveDescr base ] : and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )* ;
     public final void or_restr_connective(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
 
-
-        		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
+        
+        		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1103:3: ( and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1103:3: and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1116:3: ( and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1116:3: and_restr_connective[or] (t= DOUBLE_PIPE and_restr_connective[or] )*
             {
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective2779);
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective2874);
             and_restr_connective(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1104:3: (t= DOUBLE_PIPE and_restr_connective[or] )*
-            loop44:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1117:3: (t= DOUBLE_PIPE and_restr_connective[or] )*
+            loop47:
             do {
-                int alt44=2;
-                int LA44_0 = input.LA(1);
+                int alt47=2;
+                int LA47_0 = input.LA(1);
 
-                if ( (LA44_0==DOUBLE_PIPE) ) {
-                    int LA44_2 = input.LA(2);
+                if ( (LA47_0==DOUBLE_PIPE) ) {
+                    int LA47_2 = input.LA(2);
 
-                    if ( (synpred63()) ) {
-                        alt44=1;
+                    if ( (synpred66()) ) {
+                        alt47=1;
                     }
 
 
                 }
 
 
-                switch (alt44) {
+                switch (alt47) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1104:5: t= DOUBLE_PIPE and_restr_connective[or]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1117:5: t= DOUBLE_PIPE and_restr_connective[or]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective2789); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective2884); if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+            	      
+            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective2801);
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective2896);
             	    and_restr_connective(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -4076,17 +4166,17 @@
             	    break;
 
             	default :
-            	    break loop44;
+            	    break loop47;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		        if( or.getRestrictions().size() == 1 ) {
-              		                base.addOrMerge( (RestrictionDescr) or.getRestrictions().get( 0 ) );
-              		        } else if ( or.getRestrictions().size() > 1 ) {
-              		        	base.addRestriction( or );
-              		        }
+              
+              		        if( or.getRestrictions().size() == 1 ) {
+              		                base.addOrMerge( (RestrictionDescr) or.getRestrictions().get( 0 ) );
+              		        } else if ( or.getRestrictions().size() > 1 ) {
+              		        	base.addRestriction( or );
+              		        }
               		
             }
 
@@ -4105,50 +4195,50 @@
 
 
     // $ANTLR start and_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:1: and_restr_connective[ RestrictionConnectiveDescr base ] : constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1133:1: and_restr_connective[ RestrictionConnectiveDescr base ] : constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )* ;
     public final void and_restr_connective(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
 
-
-        		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
+        
+        		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1125:3: ( constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1125:3: constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1138:3: ( constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1138:3: constraint_expression[and] (t= DOUBLE_AMPER constraint_expression[and] )*
             {
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective2835);
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective2930);
             constraint_expression(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:3: (t= DOUBLE_AMPER constraint_expression[and] )*
-            loop45:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1139:3: (t= DOUBLE_AMPER constraint_expression[and] )*
+            loop48:
             do {
-                int alt45=2;
-                int LA45_0 = input.LA(1);
+                int alt48=2;
+                int LA48_0 = input.LA(1);
 
-                if ( (LA45_0==DOUBLE_AMPER) ) {
-                    int LA45_2 = input.LA(2);
+                if ( (LA48_0==DOUBLE_AMPER) ) {
+                    int LA48_2 = input.LA(2);
 
-                    if ( (synpred64()) ) {
-                        alt45=1;
+                    if ( (synpred67()) ) {
+                        alt48=1;
                     }
 
 
                 }
 
 
-                switch (alt45) {
+                switch (alt48) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:5: t= DOUBLE_AMPER constraint_expression[and]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1139:5: t= DOUBLE_AMPER constraint_expression[and]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective2845); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective2940); if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+            	      
+            	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective2855);
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective2950);
             	    constraint_expression(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -4157,17 +4247,17 @@
             	    break;
 
             	default :
-            	    break loop45;
+            	    break loop48;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		        if( and.getRestrictions().size() == 1) {
-              		                base.addOrMerge( (RestrictionDescr) and.getRestrictions().get( 0 ) );
-              		        } else if ( and.getRestrictions().size() > 1 ) {
-              		        	base.addRestriction( and );
-              		        }
+              
+              		        if( and.getRestrictions().size() == 1) {
+              		                base.addOrMerge( (RestrictionDescr) and.getRestrictions().get( 0 ) );
+              		        } else if ( and.getRestrictions().size() > 1 ) {
+              		        	base.addRestriction( and );
+              		        }
               		
             }
 
@@ -4186,34 +4276,34 @@
 
 
     // $ANTLR start constraint_expression
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1141:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1154:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN ) ;
     public final void constraint_expression(RestrictionConnectiveDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1143:3: ( ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1143:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1156:3: ( ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1156:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1143:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )
-            int alt46=3;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1156:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )
+            int alt49=3;
             switch ( input.LA(1) ) {
             case IN:
                 {
-                alt46=1;
+                alt49=1;
                 }
                 break;
             case NOT:
                 {
-                int LA46_2 = input.LA(2);
+                int LA49_2 = input.LA(2);
 
-                if ( (LA46_2==CONTAINS||(LA46_2>=MATCHES && LA46_2<=MEMBEROF)) ) {
-                    alt46=2;
+                if ( (LA49_2==CONTAINS||(LA49_2>=MATCHES && LA49_2<=MEMBEROF)) ) {
+                    alt49=2;
                 }
-                else if ( (LA46_2==IN) ) {
-                    alt46=1;
+                else if ( (LA49_2==IN) ) {
+                    alt49=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1143:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )", 46, 2, input);
+                        new NoViableAltException("1156:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )", 49, 2, input);
 
                     throw nvae;
                 }
@@ -4230,27 +4320,27 @@
             case 78:
             case 79:
                 {
-                alt46=2;
+                alt49=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt46=3;
+                alt49=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1143:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )", 46, 0, input);
+                    new NoViableAltException("1156:3: ( compound_operator[base] | simple_operator[base] | LEFT_PAREN or_restr_connective[base] RIGHT_PAREN )", 49, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt46) {
+            switch (alt49) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1143:5: compound_operator[base]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1156:5: compound_operator[base]
                     {
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression2890);
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression2985);
                     compound_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -4258,9 +4348,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1144:5: simple_operator[base]
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1157:5: simple_operator[base]
                     {
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression2897);
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression2992);
                     simple_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -4268,19 +4358,19 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1145:5: LEFT_PAREN or_restr_connective[base] RIGHT_PAREN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1158:5: LEFT_PAREN or_restr_connective[base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression2904); if (failed) return ;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression2999); if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+                      
+                      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression2913);
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3008);
                     or_restr_connective(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression2919); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3014); if (failed) return ;
 
                     }
                     break;
@@ -4303,80 +4393,80 @@
 
 
     // $ANTLR start simple_operator
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1154:1: simple_operator[RestrictionConnectiveDescr base] : (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1167:1: simple_operator[RestrictionConnectiveDescr base] : (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op] ;
     public final void simple_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
         Token n=null;
         RestrictionDescr rd = null;
 
 
-
-        		String op = null;
+        
+        		String op = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1159:3: ( (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1159:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1172:3: ( (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1172:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF ) rd= expression_value[op]
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1159:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )
-            int alt47=13;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1172:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )
+            int alt50=13;
             switch ( input.LA(1) ) {
             case 74:
                 {
-                alt47=1;
+                alt50=1;
                 }
                 break;
             case 75:
                 {
-                alt47=2;
+                alt50=2;
                 }
                 break;
             case 76:
                 {
-                alt47=3;
+                alt50=3;
                 }
                 break;
             case 77:
                 {
-                alt47=4;
+                alt50=4;
                 }
                 break;
             case 78:
                 {
-                alt47=5;
+                alt50=5;
                 }
                 break;
             case 79:
                 {
-                alt47=6;
+                alt50=6;
                 }
                 break;
             case CONTAINS:
                 {
-                alt47=7;
+                alt50=7;
                 }
                 break;
             case NOT:
                 {
                 switch ( input.LA(2) ) {
-                case MATCHES:
+                case MEMBEROF:
                     {
-                    alt47=11;
+                    alt50=13;
                     }
                     break;
-                case MEMBEROF:
+                case MATCHES:
                     {
-                    alt47=13;
+                    alt50=11;
                     }
                     break;
                 case CONTAINS:
                     {
-                    alt47=8;
+                    alt50=8;
                     }
                     break;
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1159:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )", 47, 8, input);
+                        new NoViableAltException("1172:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )", 50, 8, input);
 
                     throw nvae;
                 }
@@ -4385,135 +4475,135 @@
                 break;
             case EXCLUDES:
                 {
-                alt47=9;
+                alt50=9;
                 }
                 break;
             case MATCHES:
                 {
-                alt47=10;
+                alt50=10;
                 }
                 break;
             case MEMBEROF:
                 {
-                alt47=12;
+                alt50=12;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1159:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )", 47, 0, input);
+                    new NoViableAltException("1172:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF )", 50, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt47) {
+            switch (alt50) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1159:5: t= '=='
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1172:5: t= '=='
                     {
                     t=(Token)input.LT(1);
-                    match(input,74,FOLLOW_74_in_simple_operator2950); if (failed) return ;
+                    match(input,74,FOLLOW_74_in_simple_operator3045); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:5: t= '>'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1173:5: t= '>'
                     {
                     t=(Token)input.LT(1);
-                    match(input,75,FOLLOW_75_in_simple_operator2958); if (failed) return ;
+                    match(input,75,FOLLOW_75_in_simple_operator3053); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:5: t= '>='
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1174:5: t= '>='
                     {
                     t=(Token)input.LT(1);
-                    match(input,76,FOLLOW_76_in_simple_operator2966); if (failed) return ;
+                    match(input,76,FOLLOW_76_in_simple_operator3061); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1162:5: t= '<'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1175:5: t= '<'
                     {
                     t=(Token)input.LT(1);
-                    match(input,77,FOLLOW_77_in_simple_operator2974); if (failed) return ;
+                    match(input,77,FOLLOW_77_in_simple_operator3069); if (failed) return ;
 
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1163:5: t= '<='
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1176:5: t= '<='
                     {
                     t=(Token)input.LT(1);
-                    match(input,78,FOLLOW_78_in_simple_operator2982); if (failed) return ;
+                    match(input,78,FOLLOW_78_in_simple_operator3077); if (failed) return ;
 
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1164:5: t= '!='
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1177:5: t= '!='
                     {
                     t=(Token)input.LT(1);
-                    match(input,79,FOLLOW_79_in_simple_operator2990); if (failed) return ;
+                    match(input,79,FOLLOW_79_in_simple_operator3085); if (failed) return ;
 
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1165:5: t= CONTAINS
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1178:5: t= CONTAINS
                     {
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator2998); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator3093); if (failed) return ;
 
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1166:5: n= NOT t= CONTAINS
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1179:5: n= NOT t= CONTAINS
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator3006); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator3101); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator3010); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator3105); if (failed) return ;
 
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1167:5: t= EXCLUDES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1180:5: t= EXCLUDES
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator3018); if (failed) return ;
+                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator3113); if (failed) return ;
 
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1168:5: t= MATCHES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1181:5: t= MATCHES
                     {
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator3026); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator3121); if (failed) return ;
 
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:5: n= NOT t= MATCHES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1182:5: n= NOT t= MATCHES
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator3034); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator3129); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator3038); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator3133); if (failed) return ;
 
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1170:5: t= MEMBEROF
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1183:5: t= MEMBEROF
                     {
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator3046); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator3141); if (failed) return ;
 
                     }
                     break;
                 case 13 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1171:5: n= NOT t= MEMBEROF
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1184:5: n= NOT t= MEMBEROF
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator3054); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator3149); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator3058); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator3153); if (failed) return ;
 
                     }
                     break;
@@ -4521,28 +4611,28 @@
             }
 
             if ( backtracking==0 ) {
-
-                		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                                  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, t.getText());
-              		    if( n != null ) {
-              		        op = "not "+t.getText();
-              		    } else {
-              		        op = t.getText();
-              		    }
+              
+                		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                                  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, t.getText());
+              		    if( n != null ) {
+              		        op = "not "+t.getText();
+              		    } else {
+              		        op = t.getText();
+              		    }
               		
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator3072);
+            pushFollow(FOLLOW_expression_value_in_simple_operator3167);
             rd=expression_value(op);
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              			    if( rd != null ) {
-              				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
-              			        base.addRestriction( rd );
-              			    } else if ( rd == null && op != null ) {
-              			        base.addRestriction( new LiteralRestrictionDescr(op, null) );
-              			    }
+              
+              			    if( rd != null ) {
+              				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+              			        base.addRestriction( rd );
+              			    } else if ( rd == null && op != null ) {
+              			        base.addRestriction( new LiteralRestrictionDescr(op, null) );
+              			    }
               		
             }
 
@@ -4561,65 +4651,65 @@
 
 
     // $ANTLR start compound_operator
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1193:1: compound_operator[RestrictionConnectiveDescr base] : ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1206:1: compound_operator[RestrictionConnectiveDescr base] : ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN ;
     public final void compound_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         RestrictionDescr rd = null;
 
 
-
-        		String op = null;
-        		RestrictionConnectiveDescr group = null;
+        
+        		String op = null;
+        		RestrictionConnectiveDescr group = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1199:3: ( ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1199:3: ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1212:3: ( ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1212:3: ( IN | NOT IN ) LEFT_PAREN rd= expression_value[op] ( COMMA rd= expression_value[op] )* RIGHT_PAREN
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1199:3: ( IN | NOT IN )
-            int alt48=2;
-            int LA48_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1212:3: ( IN | NOT IN )
+            int alt51=2;
+            int LA51_0 = input.LA(1);
 
-            if ( (LA48_0==IN) ) {
-                alt48=1;
+            if ( (LA51_0==IN) ) {
+                alt51=1;
             }
-            else if ( (LA48_0==NOT) ) {
-                alt48=2;
+            else if ( (LA51_0==NOT) ) {
+                alt51=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1199:3: ( IN | NOT IN )", 48, 0, input);
+                    new NoViableAltException("1212:3: ( IN | NOT IN )", 51, 0, input);
 
                 throw nvae;
             }
-            switch (alt48) {
+            switch (alt51) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1199:5: IN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1212:5: IN
                     {
-                    match(input,IN,FOLLOW_IN_in_compound_operator3101); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator3196); if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      			  op = "==";
-                      			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
-                      			  base.addRestriction( group );
-                        		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                                          	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
+                      
+                      			  op = "==";
+                      			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
+                      			  base.addRestriction( group );
+                        		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                                          	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
                       			
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1207:5: NOT IN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1220:5: NOT IN
                     {
-                    match(input,NOT,FOLLOW_NOT_in_compound_operator3113); if (failed) return ;
-                    match(input,IN,FOLLOW_IN_in_compound_operator3115); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_compound_operator3208); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator3210); if (failed) return ;
                     if ( backtracking==0 ) {
-
-                      			  op = "!=";
-                      			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
-                      			  base.addRestriction( group );
-                        		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                                          	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
+                      
+                      			  op = "!=";
+                      			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
+                      			  base.addRestriction( group );
+                        		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                                          	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
                       			
                     }
 
@@ -4628,43 +4718,43 @@
 
             }
 
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator3130); if (failed) return ;
-            pushFollow(FOLLOW_expression_value_in_compound_operator3134);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator3225); if (failed) return ;
+            pushFollow(FOLLOW_expression_value_in_compound_operator3229);
             rd=expression_value(op);
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              			    if( rd != null ) {
-              			        group.addRestriction( rd );
-              			    }
+              
+              			    if( rd != null ) {
+              			        group.addRestriction( rd );
+              			    }
               			
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1222:3: ( COMMA rd= expression_value[op] )*
-            loop49:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:3: ( COMMA rd= expression_value[op] )*
+            loop52:
             do {
-                int alt49=2;
-                int LA49_0 = input.LA(1);
+                int alt52=2;
+                int LA52_0 = input.LA(1);
 
-                if ( (LA49_0==COMMA) ) {
-                    alt49=1;
+                if ( (LA52_0==COMMA) ) {
+                    alt52=1;
                 }
 
 
-                switch (alt49) {
+                switch (alt52) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1222:5: COMMA rd= expression_value[op]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1235:5: COMMA rd= expression_value[op]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator3146); if (failed) return ;
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator3150);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator3241); if (failed) return ;
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator3245);
             	    rd=expression_value(op);
             	    _fsp--;
             	    if (failed) return ;
             	    if ( backtracking==0 ) {
-
-            	      			    if( rd != null ) {
-            	      		        	group.addRestriction( rd );
-            	      			    }
+            	      
+            	      			    if( rd != null ) {
+            	      		        	group.addRestriction( rd );
+            	      			    }
             	      			
             	    }
 
@@ -4672,14 +4762,14 @@
             	    break;
 
             	default :
-            	    break loop49;
+            	    break loop52;
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator3166); if (failed) return ;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator3261); if (failed) return ;
             if ( backtracking==0 ) {
-
-              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+              
+              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
               		
             }
 
@@ -4698,7 +4788,7 @@
 
 
     // $ANTLR start expression_value
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1235:1: expression_value[String op] returns [RestrictionDescr rd] : (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1248:1: expression_value[String op] returns [RestrictionDescr rd] : (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) ;
     public final RestrictionDescr expression_value(String op) throws RecognitionException {
         RestrictionDescr rd = null;
 
@@ -4709,26 +4799,26 @@
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1237:3: ( (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1237:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1250:3: ( (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1250:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1237:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
-            int alt50=4;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1250:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+            int alt53=4;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                int LA50_1 = input.LA(2);
+                int LA53_1 = input.LA(2);
 
-                if ( (LA50_1==EOF||LA50_1==COMMA||LA50_1==RIGHT_PAREN||(LA50_1>=DOUBLE_PIPE && LA50_1<=DOUBLE_AMPER)) ) {
-                    alt50=1;
+                if ( (LA53_1==71) ) {
+                    alt53=2;
                 }
-                else if ( (LA50_1==71) ) {
-                    alt50=2;
+                else if ( (LA53_1==EOF||LA53_1==RIGHT_PAREN||LA53_1==COMMA||(LA53_1>=DOUBLE_PIPE && LA53_1<=DOUBLE_AMPER)) ) {
+                    alt53=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return rd;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1237:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 50, 1, input);
+                        new NoViableAltException("1250:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 53, 1, input);
 
                     throw nvae;
                 }
@@ -4740,76 +4830,76 @@
             case FLOAT:
             case NULL:
                 {
-                alt50=3;
+                alt53=3;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt50=4;
+                alt53=4;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return rd;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1237:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 50, 0, input);
+                    new NoViableAltException("1250:3: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 53, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt50) {
+            switch (alt53) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1237:5: bvc= ID
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1250:5: bvc= ID
                     {
                     bvc=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_expression_value3194); if (failed) return rd;
+                    match(input,ID,FOLLOW_ID_in_expression_value3289); if (failed) return rd;
                     if ( backtracking==0 ) {
-
-                      				rd = new VariableRestrictionDescr(op, bvc.getText());
+                      
+                      				rd = new VariableRestrictionDescr(op, bvc.getText());
                       			
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1241:5: lc= enum_constraint
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1254:5: lc= enum_constraint
                     {
-                    pushFollow(FOLLOW_enum_constraint_in_expression_value3207);
+                    pushFollow(FOLLOW_enum_constraint_in_expression_value3302);
                     lc=enum_constraint();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
-                       
-                      				rd  = new QualifiedIdentifierRestrictionDescr(op, lc);
+                       
+                      				rd  = new QualifiedIdentifierRestrictionDescr(op, lc);
                       			
                     }
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1245:5: lc= literal_constraint
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1258:5: lc= literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value3227);
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value3322);
                     lc=literal_constraint();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
-                       
-                      				rd  = new LiteralRestrictionDescr(op, lc);
+                       
+                      				rd  = new LiteralRestrictionDescr(op, lc);
                       			
                     }
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1249:5: rvc= retval_constraint
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1262:5: rvc= retval_constraint
                     {
-                    pushFollow(FOLLOW_retval_constraint_in_expression_value3241);
+                    pushFollow(FOLLOW_retval_constraint_in_expression_value3336);
                     rvc=retval_constraint();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
-                       
-                      				rd = new ReturnValueRestrictionDescr(op, rvc);							
+                       
+                      				rd = new ReturnValueRestrictionDescr(op, rvc);							
                       			
                     }
 
@@ -4819,8 +4909,8 @@
             }
 
             if ( backtracking==0 ) {
-
-              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+              
+              			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
               		
             }
 
@@ -4839,61 +4929,61 @@
 
 
     // $ANTLR start literal_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1259:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1272:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) ;
     public final String literal_constraint() throws RecognitionException {
         String text = null;
 
         Token t=null;
 
-
-        		text = null;
+        
+        		text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:4: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1276:4: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1276:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
-            int alt51=5;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1276:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            int alt54=5;
             switch ( input.LA(1) ) {
             case STRING:
                 {
-                alt51=1;
+                alt54=1;
                 }
                 break;
             case INT:
                 {
-                alt51=2;
+                alt54=2;
                 }
                 break;
             case FLOAT:
                 {
-                alt51=3;
+                alt54=3;
                 }
                 break;
             case BOOL:
                 {
-                alt51=4;
+                alt54=4;
                 }
                 break;
             case NULL:
                 {
-                alt51=5;
+                alt54=5;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return text;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1263:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 51, 0, input);
+                    new NoViableAltException("1276:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 54, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt51) {
+            switch (alt54) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:6: t= STRING
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1276:6: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint3284); if (failed) return text;
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint3379); if (failed) return text;
                     if ( backtracking==0 ) {
                        text = getString( t ); 
                     }
@@ -4901,10 +4991,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1264:5: t= INT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1277:5: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint3295); if (failed) return text;
+                    match(input,INT,FOLLOW_INT_in_literal_constraint3390); if (failed) return text;
                     if ( backtracking==0 ) {
                        text = t.getText(); 
                     }
@@ -4912,10 +5002,10 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1265:5: t= FLOAT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1278:5: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint3308); if (failed) return text;
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint3403); if (failed) return text;
                     if ( backtracking==0 ) {
                        text = t.getText(); 
                     }
@@ -4923,10 +5013,10 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:5: t= BOOL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1279:5: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint3319); if (failed) return text;
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint3414); if (failed) return text;
                     if ( backtracking==0 ) {
                        text = t.getText(); 
                     }
@@ -4934,10 +5024,10 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1267:5: t= NULL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1280:5: t= NULL
                     {
                     t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint3331); if (failed) return text;
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint3426); if (failed) return text;
                     if ( backtracking==0 ) {
                        text = null; 
                     }
@@ -4963,7 +5053,7 @@
 
 
     // $ANTLR start enum_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1271:1: enum_constraint returns [String text] : id= ID ( '.' ident= identifier )+ ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1284:1: enum_constraint returns [String text] : id= ID ( '.' ident= identifier )+ ;
     public final String enum_constraint() throws RecognitionException {
         String text = null;
 
@@ -4971,36 +5061,36 @@
         Token ident = null;
 
 
-
-        		text = null;
+        
+        		text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:3: (id= ID ( '.' ident= identifier )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:3: id= ID ( '.' ident= identifier )+
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1289:3: (id= ID ( '.' ident= identifier )+ )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1289:3: id= ID ( '.' ident= identifier )+
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_enum_constraint3366); if (failed) return text;
+            match(input,ID,FOLLOW_ID_in_enum_constraint3461); if (failed) return text;
             if ( backtracking==0 ) {
                text=id.getText(); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:32: ( '.' ident= identifier )+
-            int cnt52=0;
-            loop52:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1289:32: ( '.' ident= identifier )+
+            int cnt55=0;
+            loop55:
             do {
-                int alt52=2;
-                int LA52_0 = input.LA(1);
+                int alt55=2;
+                int LA55_0 = input.LA(1);
 
-                if ( (LA52_0==71) ) {
-                    alt52=1;
+                if ( (LA55_0==71) ) {
+                    alt55=1;
                 }
 
 
-                switch (alt52) {
+                switch (alt55) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:34: '.' ident= identifier
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1289:34: '.' ident= identifier
             	    {
-            	    match(input,71,FOLLOW_71_in_enum_constraint3372); if (failed) return text;
-            	    pushFollow(FOLLOW_identifier_in_enum_constraint3376);
+            	    match(input,71,FOLLOW_71_in_enum_constraint3467); if (failed) return text;
+            	    pushFollow(FOLLOW_identifier_in_enum_constraint3471);
             	    ident=identifier();
             	    _fsp--;
             	    if (failed) return text;
@@ -5012,13 +5102,13 @@
             	    break;
 
             	default :
-            	    if ( cnt52 >= 1 ) break loop52;
+            	    if ( cnt55 >= 1 ) break loop55;
             	    if (backtracking>0) {failed=true; return text;}
                         EarlyExitException eee =
-                            new EarlyExitException(52, input);
+                            new EarlyExitException(55, input);
                         throw eee;
                 }
-                cnt52++;
+                cnt55++;
             } while (true);
 
 
@@ -5037,34 +5127,34 @@
 
 
     // $ANTLR start predicate
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1280:1: predicate[ConditionalElementDescr base] : text= paren_chunk[d] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1293:1: predicate[ConditionalElementDescr base] : text= paren_chunk[d] ;
     public final void predicate(ConditionalElementDescr base) throws RecognitionException {
         String text = null;
 
 
-
-        		PredicateDescr d = null;
+        
+        		PredicateDescr d = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1285:3: (text= paren_chunk[d] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1285:3: text= paren_chunk[d]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1298:3: (text= paren_chunk[d] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1298:3: text= paren_chunk[d]
             {
             if ( backtracking==0 ) {
-
-              			d = new PredicateDescr( );
+              
+              			d = new PredicateDescr( );
               		
             }
-            pushFollow(FOLLOW_paren_chunk_in_predicate3418);
+            pushFollow(FOLLOW_paren_chunk_in_predicate3513);
             text=paren_chunk(d);
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
-
-              		        if( text != null ) {
-              			        String body = text.substring(1, text.length()-1);
-              			        d.setContent( body );
-              				base.addDescr( d );
-              		        }
+              
+              		        if( text != null ) {
+              			        String body = text.substring(1, text.length()-1);
+              			        d.setContent( body );
+              				base.addDescr( d );
+              		        }
               		
             }
 
@@ -5083,7 +5173,7 @@
 
 
     // $ANTLR start paren_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1298:1: paren_chunk[BaseDescr descr] returns [String text] : loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1311:1: paren_chunk[BaseDescr descr] returns [String text] : loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN ;
     public final String paren_chunk(BaseDescr descr) throws RecognitionException {
         String text = null;
 
@@ -5091,47 +5181,47 @@
         String chunk = null;
 
 
-
-                   StringBuffer buf = null;
-                   Integer channel = null;
+        
+                   StringBuffer buf = null;
+                   Integer channel = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1304:10: (loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1304:10: loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:10: (loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1317:10: loc= LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )* loc= RIGHT_PAREN
             {
             if ( backtracking==0 ) {
-
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
+              
+              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+              		    buf = new StringBuffer();
               	        
             }
             loc=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk3467); if (failed) return text;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk3562); if (failed) return text;
             if ( backtracking==0 ) {
-
-              		    buf.append( loc.getText());
+              
+              		    buf.append( loc.getText());
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1313:3: (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )*
-            loop53:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1326:3: (~ ( LEFT_PAREN | RIGHT_PAREN ) | chunk= paren_chunk[null] )*
+            loop56:
             do {
-                int alt53=3;
-                int LA53_0 = input.LA(1);
+                int alt56=3;
+                int LA56_0 = input.LA(1);
 
-                if ( ((LA53_0>=ATTRIBUTES && LA53_0<=ACCUMULATE)||(LA53_0>=COMMA && LA53_0<=RESULT)||(LA53_0>=COLLECT && LA53_0<=79)) ) {
-                    alt53=1;
+                if ( ((LA56_0>=ATTRIBUTES && LA56_0<=QUERY)||LA56_0==ID||(LA56_0>=END && LA56_0<=79)) ) {
+                    alt56=1;
                 }
-                else if ( (LA53_0==LEFT_PAREN) ) {
-                    alt53=2;
+                else if ( (LA56_0==LEFT_PAREN) ) {
+                    alt56=2;
                 }
 
 
-                switch (alt53) {
+                switch (alt56) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1314:4: ~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1327:4: ~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
-            	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=ACCUMULATE)||(input.LA(1)>=COMMA && input.LA(1)<=RESULT)||(input.LA(1)>=COLLECT && input.LA(1)<=79) ) {
+            	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=QUERY)||input.LA(1)==ID||(input.LA(1)>=END && input.LA(1)<=79) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -5139,27 +5229,27 @@
             	        if (backtracking>0) {failed=true; return text;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk3483);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk3578);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( input.LT(-1).getText() );
+            	      
+            	      			    buf.append( input.LT(-1).getText() );
             	      			  
             	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:4: chunk= paren_chunk[null]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1332:4: chunk= paren_chunk[null]
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk3507);
+            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk3602);
             	    chunk=paren_chunk(null);
             	    _fsp--;
             	    if (failed) return text;
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( chunk );
+            	      
+            	      			    buf.append( chunk );
             	      			  
             	    }
 
@@ -5167,28 +5257,28 @@
             	    break;
 
             	default :
-            	    break loop53;
+            	    break loop56;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
+              
+              		    if( channel != null ) {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+              		    } else {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+              		    }
               		
             }
             loc=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk3544); if (failed) return text;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk3639); if (failed) return text;
             if ( backtracking==0 ) {
-
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
+              
+                                  buf.append( loc.getText() );
+              		    text = buf.toString();
+              		    if( descr != null ) {
+              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              		    }
                               
             }
 
@@ -5207,7 +5297,7 @@
 
 
     // $ANTLR start curly_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1341:1: curly_chunk[BaseDescr descr] returns [String text] : loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1354:1: curly_chunk[BaseDescr descr] returns [String text] : loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY ;
     public final String curly_chunk(BaseDescr descr) throws RecognitionException {
         String text = null;
 
@@ -5215,42 +5305,42 @@
         String chunk = null;
 
 
-
-                   StringBuffer buf = null;
-                   Integer channel = null;
+        
+                   StringBuffer buf = null;
+                   Integer channel = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1347:3: (loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1347:3: loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1360:3: (loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1360:3: loc= LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )* loc= RIGHT_CURLY
             {
             loc=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk3595); if (failed) return text;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk3690); if (failed) return text;
             if ( backtracking==0 ) {
-
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
-              		    
-              		    buf.append( loc.getText() );
+              
+              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+              		    buf = new StringBuffer();
+              		    
+              		    buf.append( loc.getText() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1355:3: (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )*
-            loop54:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1368:3: (~ ( LEFT_CURLY | RIGHT_CURLY ) | chunk= curly_chunk[descr] )*
+            loop57:
             do {
-                int alt54=3;
-                int LA54_0 = input.LA(1);
+                int alt57=3;
+                int LA57_0 = input.LA(1);
 
-                if ( ((LA54_0>=ATTRIBUTES && LA54_0<=NULL)||(LA54_0>=LEFT_SQUARE && LA54_0<=79)) ) {
-                    alt54=1;
+                if ( ((LA57_0>=ATTRIBUTES && LA57_0<=NULL)||(LA57_0>=LEFT_SQUARE && LA57_0<=79)) ) {
+                    alt57=1;
                 }
-                else if ( (LA54_0==LEFT_CURLY) ) {
-                    alt54=2;
+                else if ( (LA57_0==LEFT_CURLY) ) {
+                    alt57=2;
                 }
 
 
-                switch (alt54) {
+                switch (alt57) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1356:4: ~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1369:4: ~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
             	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=79) ) {
             	        input.consume();
@@ -5260,27 +5350,27 @@
             	        if (backtracking>0) {failed=true; return text;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk3611);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk3706);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( input.LT(-1).getText() );
+            	      
+            	      			    buf.append( input.LT(-1).getText() );
             	      			  
             	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1361:4: chunk= curly_chunk[descr]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1374:4: chunk= curly_chunk[descr]
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk3635);
+            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk3730);
             	    chunk=curly_chunk(descr);
             	    _fsp--;
             	    if (failed) return text;
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( chunk );
+            	      
+            	      			    buf.append( chunk );
             	      			  
             	    }
 
@@ -5288,28 +5378,28 @@
             	    break;
 
             	default :
-            	    break loop54;
+            	    break loop57;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
+              
+              		    if( channel != null ) {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+              		    } else {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+              		    }
               		
             }
             loc=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk3672); if (failed) return text;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk3767); if (failed) return text;
             if ( backtracking==0 ) {
-
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
+              
+                                  buf.append( loc.getText() );
+              		    text = buf.toString();
+              		    if( descr != null ) {
+              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              		    }
                               
             }
 
@@ -5328,7 +5418,7 @@
 
 
     // $ANTLR start square_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1383:1: square_chunk[BaseDescr descr] returns [String text] : loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1396:1: square_chunk[BaseDescr descr] returns [String text] : loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE ;
     public final String square_chunk(BaseDescr descr) throws RecognitionException {
         String text = null;
 
@@ -5336,46 +5426,46 @@
         String chunk = null;
 
 
-
-                   StringBuffer buf = null;
-                   Integer channel = null;
+        
+                   StringBuffer buf = null;
+                   Integer channel = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1389:10: (loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1389:10: loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:10: (loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1402:10: loc= LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )* loc= RIGHT_SQUARE
             {
             if ( backtracking==0 ) {
-
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
+              
+              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+              		    buf = new StringBuffer();
               	        
             }
             loc=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk3735); if (failed) return text;
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk3830); if (failed) return text;
             if ( backtracking==0 ) {
-
-              		    buf.append( loc.getText());
-               
+              
+              		    buf.append( loc.getText());
+               
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1399:3: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )*
-            loop55:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1412:3: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | chunk= square_chunk[null] )*
+            loop58:
             do {
-                int alt55=3;
-                int LA55_0 = input.LA(1);
+                int alt58=3;
+                int LA58_0 = input.LA(1);
 
-                if ( ((LA55_0>=ATTRIBUTES && LA55_0<=RIGHT_CURLY)||(LA55_0>=AND && LA55_0<=79)) ) {
-                    alt55=1;
+                if ( ((LA58_0>=ATTRIBUTES && LA58_0<=RIGHT_CURLY)||(LA58_0>=AND && LA58_0<=79)) ) {
+                    alt58=1;
                 }
-                else if ( (LA55_0==LEFT_SQUARE) ) {
-                    alt55=2;
+                else if ( (LA58_0==LEFT_SQUARE) ) {
+                    alt58=2;
                 }
 
 
-                switch (alt55) {
+                switch (alt58) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400:4: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1413:4: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
             	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=AND && input.LA(1)<=79) ) {
             	        input.consume();
@@ -5385,27 +5475,27 @@
             	        if (backtracking>0) {failed=true; return text;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk3751);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk3846);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( input.LT(-1).getText() );
+            	      
+            	      			    buf.append( input.LT(-1).getText() );
             	      			  
             	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1405:4: chunk= square_chunk[null]
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1418:4: chunk= square_chunk[null]
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_square_chunk3775);
+            	    pushFollow(FOLLOW_square_chunk_in_square_chunk3870);
             	    chunk=square_chunk(null);
             	    _fsp--;
             	    if (failed) return text;
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( chunk );
+            	      
+            	      			    buf.append( chunk );
             	      			  
             	    }
 
@@ -5413,28 +5503,28 @@
             	    break;
 
             	default :
-            	    break loop55;
+            	    break loop58;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
+              
+              		    if( channel != null ) {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+              		    } else {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+              		    }
               		
             }
             loc=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk3812); if (failed) return text;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk3907); if (failed) return text;
             if ( backtracking==0 ) {
-
-                                  buf.append( loc.getText() );
-              		    text = buf.toString();
-              		    if( descr != null ) {
-              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-              		    }
+              
+                                  buf.append( loc.getText() );
+              		    text = buf.toString();
+              		    if( descr != null ) {
+              		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+              		    }
                               
             }
 
@@ -5453,21 +5543,21 @@
 
 
     // $ANTLR start retval_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1427:1: retval_constraint returns [String text] : c= paren_chunk[null] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1440:1: retval_constraint returns [String text] : c= paren_chunk[null] ;
     public final String retval_constraint() throws RecognitionException {
         String text = null;
 
         String c = null;
 
 
-
-        		text = null;
+        
+        		text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1432:3: (c= paren_chunk[null] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1432:3: c= paren_chunk[null]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:3: (c= paren_chunk[null] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1445:3: c= paren_chunk[null]
             {
-            pushFollow(FOLLOW_paren_chunk_in_retval_constraint3857);
+            pushFollow(FOLLOW_paren_chunk_in_retval_constraint3952);
             c=paren_chunk(null);
             _fsp--;
             if (failed) return text;
@@ -5490,7 +5580,7 @@
 
 
     // $ANTLR start lhs_or
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1435:1: lhs_or returns [BaseDescr d] : left= lhs_and ( ( OR | '||' ) right= lhs_and )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1448:1: lhs_or returns [BaseDescr d] : left= lhs_and ( ( OR | '||' ) right= lhs_and )* ;
     public final BaseDescr lhs_or() throws RecognitionException {
         BaseDescr d = null;
 
@@ -5499,35 +5589,35 @@
         BaseDescr right = null;
 
 
-
-        		d = null;
-        		OrDescr or = null;
+        
+        		d = null;
+        		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1441:3: (left= lhs_and ( ( OR | '||' ) right= lhs_and )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1441:3: left= lhs_and ( ( OR | '||' ) right= lhs_and )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1454:3: (left= lhs_and ( ( OR | '||' ) right= lhs_and )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1454:3: left= lhs_and ( ( OR | '||' ) right= lhs_and )*
             {
-            pushFollow(FOLLOW_lhs_and_in_lhs_or3885);
+            pushFollow(FOLLOW_lhs_and_in_lhs_or3980);
             left=lhs_and();
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
               d = left; 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1442:3: ( ( OR | '||' ) right= lhs_and )*
-            loop56:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1455:3: ( ( OR | '||' ) right= lhs_and )*
+            loop59:
             do {
-                int alt56=2;
-                int LA56_0 = input.LA(1);
+                int alt59=2;
+                int LA59_0 = input.LA(1);
 
-                if ( ((LA56_0>=OR && LA56_0<=DOUBLE_PIPE)) ) {
-                    alt56=1;
+                if ( ((LA59_0>=OR && LA59_0<=DOUBLE_PIPE)) ) {
+                    alt59=1;
                 }
 
 
-                switch (alt56) {
+                switch (alt59) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1442:5: ( OR | '||' ) right= lhs_and
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1455:5: ( OR | '||' ) right= lhs_and
             	    {
             	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
             	        input.consume();
@@ -5537,27 +5627,27 @@
             	        if (backtracking>0) {failed=true; return d;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3893);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3988);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
+            	      
+            	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
             	      			
             	    }
-            	    pushFollow(FOLLOW_lhs_and_in_lhs_or3909);
+            	    pushFollow(FOLLOW_lhs_and_in_lhs_or4004);
             	    right=lhs_and();
             	    _fsp--;
             	    if (failed) return d;
             	    if ( backtracking==0 ) {
-
-            	      				if ( or == null ) {
-            	      					or = new OrDescr();
-            	      					or.addDescr( left );
-            	      					d = or;
-            	      				}
-            	      				
-            	      				or.addDescr( right );
+            	      
+            	      				if ( or == null ) {
+            	      					or = new OrDescr();
+            	      					or.addDescr( left );
+            	      					d = or;
+            	      				}
+            	      				
+            	      				or.addDescr( right );
             	      			
             	    }
 
@@ -5565,7 +5655,7 @@
             	    break;
 
             	default :
-            	    break loop56;
+            	    break loop59;
                 }
             } while (true);
 
@@ -5585,7 +5675,7 @@
 
 
     // $ANTLR start lhs_and
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1459:1: lhs_and returns [BaseDescr d] : left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1472:1: lhs_and returns [BaseDescr d] : left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* ;
     public final BaseDescr lhs_and() throws RecognitionException {
         BaseDescr d = null;
 
@@ -5594,35 +5684,35 @@
         BaseDescr right = null;
 
 
-
-        		d = null;
-        		AndDescr and = null;
+        
+        		d = null;
+        		AndDescr and = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1465:3: (left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1465:3: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1478:3: (left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1478:3: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
             {
-            pushFollow(FOLLOW_lhs_unary_in_lhs_and3945);
+            pushFollow(FOLLOW_lhs_unary_in_lhs_and4040);
             left=lhs_unary();
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
                d = left; 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
-            loop57:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1479:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+            loop60:
             do {
-                int alt57=2;
-                int LA57_0 = input.LA(1);
+                int alt60=2;
+                int LA60_0 = input.LA(1);
 
-                if ( (LA57_0==DOUBLE_AMPER||LA57_0==AND) ) {
-                    alt57=1;
+                if ( (LA60_0==DOUBLE_AMPER||LA60_0==AND) ) {
+                    alt60=1;
                 }
 
 
-                switch (alt57) {
+                switch (alt60) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1479:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
             	    {
             	    if ( input.LA(1)==DOUBLE_AMPER||input.LA(1)==AND ) {
             	        input.consume();
@@ -5632,27 +5722,27 @@
             	        if (backtracking>0) {failed=true; return d;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3953);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and4048);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
+            	      
+            	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
             	      			
             	    }
-            	    pushFollow(FOLLOW_lhs_unary_in_lhs_and3969);
+            	    pushFollow(FOLLOW_lhs_unary_in_lhs_and4064);
             	    right=lhs_unary();
             	    _fsp--;
             	    if (failed) return d;
             	    if ( backtracking==0 ) {
-
-            	      				if ( and == null ) {
-            	      					and = new AndDescr();
-            	      					and.addDescr( left );
-            	      					d = and;
-            	      				}
-            	      				
-            	      				and.addDescr( right );
+            	      
+            	      				if ( and == null ) {
+            	      					and = new AndDescr();
+            	      					and.addDescr( left );
+            	      					d = and;
+            	      				}
+            	      				
+            	      				and.addDescr( right );
             	      			
             	    }
 
@@ -5660,7 +5750,7 @@
             	    break;
 
             	default :
-            	    break loop57;
+            	    break loop60;
                 }
             } while (true);
 
@@ -5680,7 +5770,7 @@
 
 
     // $ANTLR start lhs_unary
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:1: lhs_unary returns [BaseDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1496:1: lhs_unary returns [BaseDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon ;
     public final BaseDescr lhs_unary() throws RecognitionException {
         BaseDescr d = null;
 
@@ -5693,59 +5783,59 @@
         FromDescr fm = null;
 
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1487:4: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1487:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1500:4: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1500:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' ) opt_semicolon
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1487:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' )
-            int alt60=6;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1500:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' )
+            int alt63=6;
             switch ( input.LA(1) ) {
             case EXISTS:
                 {
-                alt60=1;
+                alt63=1;
                 }
                 break;
             case NOT:
                 {
-                alt60=2;
+                alt63=2;
                 }
                 break;
             case EVAL:
                 {
-                alt60=3;
+                alt63=3;
                 }
                 break;
             case ID:
                 {
-                alt60=4;
+                alt63=4;
                 }
                 break;
             case FORALL:
                 {
-                alt60=5;
+                alt63=5;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt60=6;
+                alt63=6;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1487:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' )", 60, 0, input);
+                    new NoViableAltException("1500:4: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )? | u= lhs_forall | '(' u= lhs_or ')' )", 63, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt60) {
+            switch (alt63) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1487:6: u= lhs_exist
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1500:6: u= lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary4006);
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary4101);
                     u=lhs_exist();
                     _fsp--;
                     if (failed) return d;
@@ -5753,9 +5843,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1488:5: u= lhs_not
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1501:5: u= lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary4014);
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary4109);
                     u=lhs_not();
                     _fsp--;
                     if (failed) return d;
@@ -5763,9 +5853,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1489:5: u= lhs_eval
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1502:5: u= lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary4022);
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary4117);
                     u=lhs_eval();
                     _fsp--;
                     if (failed) return d;
@@ -5773,176 +5863,176 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1490:5: u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )?
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1503:5: u= lhs_pattern ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )?
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_unary4030);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_unary4125);
                     u=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1490:19: ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )?
-                    int alt59=2;
-                    int LA59_0 = input.LA(1);
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1503:19: ( FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) ) )?
+                    int alt62=2;
+                    int LA62_0 = input.LA(1);
 
-                    if ( (LA59_0==FROM) ) {
-                        alt59=1;
+                    if ( (LA62_0==FROM) ) {
+                        alt62=1;
                     }
-                    switch (alt59) {
+                    switch (alt62) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1491:13: FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1504:13: FROM ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )
                             {
-                            match(input,FROM,FOLLOW_FROM_in_lhs_unary4046); if (failed) return d;
+                            match(input,FROM,FOLLOW_FROM_in_lhs_unary4141); if (failed) return d;
                             if ( backtracking==0 ) {
-
-                              				location.setType(Location.LOCATION_LHS_FROM);
-                              				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
+                              
+                              				location.setType(Location.LOCATION_LHS_FROM);
+                              				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
                               		          
                             }
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1496:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )
-                            int alt58=3;
-                            int LA58_0 = input.LA(1);
+                            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1509:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )
+                            int alt61=3;
+                            int LA61_0 = input.LA(1);
 
-                            if ( (LA58_0==ACCUMULATE) ) {
-                                int LA58_1 = input.LA(2);
+                            if ( (LA61_0==ACCUMULATE) ) {
+                                int LA61_1 = input.LA(2);
 
-                                if ( (synpred105()) ) {
-                                    alt58=1;
+                                if ( (synpred108()) ) {
+                                    alt61=1;
                                 }
-                                else if ( (synpred108()) ) {
-                                    alt58=3;
+                                else if ( (synpred111()) ) {
+                                    alt61=3;
                                 }
                                 else {
                                     if (backtracking>0) {failed=true; return d;}
                                     NoViableAltException nvae =
-                                        new NoViableAltException("1496:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 58, 1, input);
+                                        new NoViableAltException("1509:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 61, 1, input);
 
                                     throw nvae;
                                 }
                             }
-                            else if ( (LA58_0==COLLECT) ) {
-                                int LA58_2 = input.LA(2);
+                            else if ( (LA61_0==COLLECT) ) {
+                                int LA61_2 = input.LA(2);
 
-                                if ( (synpred106()) ) {
-                                    alt58=2;
+                                if ( (synpred109()) ) {
+                                    alt61=2;
                                 }
-                                else if ( (synpred108()) ) {
-                                    alt58=3;
+                                else if ( (synpred111()) ) {
+                                    alt61=3;
                                 }
                                 else {
                                     if (backtracking>0) {failed=true; return d;}
                                     NoViableAltException nvae =
-                                        new NoViableAltException("1496:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 58, 2, input);
+                                        new NoViableAltException("1509:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 61, 2, input);
 
                                     throw nvae;
                                 }
                             }
-                            else if ( (LA58_0==ID) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==ID) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==PACKAGE) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==PACKAGE) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==FUNCTION) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==FUNCTION) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==GLOBAL) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==GLOBAL) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==IMPORT) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==IMPORT) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==RULE) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==RULE) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==QUERY) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==QUERY) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==TEMPLATE) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==TEMPLATE) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==ATTRIBUTES) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==ATTRIBUTES) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==ENABLED) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==ENABLED) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==SALIENCE) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==SALIENCE) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==DURATION) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==DURATION) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==FROM) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==FROM) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==INIT) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==INIT) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==ACTION) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==ACTION) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==RESULT) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==RESULT) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==OR) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==OR) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==AND) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==AND) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==CONTAINS) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==CONTAINS) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==EXCLUDES) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==EXCLUDES) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==MEMBEROF) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==MEMBEROF) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==MATCHES) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==MATCHES) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==NULL) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==NULL) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==EXISTS) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==EXISTS) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==NOT) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==NOT) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==EVAL) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==EVAL) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==FORALL) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==FORALL) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==WHEN) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==WHEN) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==THEN) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==THEN) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==END) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==END) && (synpred111())) {
+                                alt61=3;
                             }
-                            else if ( (LA58_0==IN) && (synpred108())) {
-                                alt58=3;
+                            else if ( (LA61_0==IN) && (synpred111())) {
+                                alt61=3;
                             }
                             else {
                                 if (backtracking>0) {failed=true; return d;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("1496:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 58, 0, input);
+                                    new NoViableAltException("1509:13: ( ( ACCUMULATE )=> (ac= accumulate_statement ) | ( COLLECT )=> (cs= collect_statement ) | (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement ) )", 61, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt58) {
+                            switch (alt61) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:14: ( ACCUMULATE )=> (ac= accumulate_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1510:14: ( ACCUMULATE )=> (ac= accumulate_statement )
                                     {
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:32: (ac= accumulate_statement )
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:33: ac= accumulate_statement
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1510:32: (ac= accumulate_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1510:33: ac= accumulate_statement
                                     {
-                                    pushFollow(FOLLOW_accumulate_statement_in_lhs_unary4101);
+                                    pushFollow(FOLLOW_accumulate_statement_in_lhs_unary4196);
                                     ac=accumulate_statement();
                                     _fsp--;
                                     if (failed) return d;
@@ -5956,12 +6046,12 @@
                                     }
                                     break;
                                 case 2 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:14: ( COLLECT )=> (cs= collect_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1511:14: ( COLLECT )=> (cs= collect_statement )
                                     {
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:29: (cs= collect_statement )
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:30: cs= collect_statement
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1511:29: (cs= collect_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1511:30: cs= collect_statement
                                     {
-                                    pushFollow(FOLLOW_collect_statement_in_lhs_unary4130);
+                                    pushFollow(FOLLOW_collect_statement_in_lhs_unary4225);
                                     cs=collect_statement();
                                     _fsp--;
                                     if (failed) return d;
@@ -5975,12 +6065,12 @@
                                     }
                                     break;
                                 case 3 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:14: (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1512:14: (~ ( ACCUMULATE | COLLECT ) )=> (fm= from_statement )
                                     {
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:43: (fm= from_statement )
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:44: fm= from_statement
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1512:43: (fm= from_statement )
+                                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1512:44: fm= from_statement
                                     {
-                                    pushFollow(FOLLOW_from_statement_in_lhs_unary4165);
+                                    pushFollow(FOLLOW_from_statement_in_lhs_unary4260);
                                     fm=from_statement();
                                     _fsp--;
                                     if (failed) return d;
@@ -6006,9 +6096,9 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502:5: u= lhs_forall
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1515:5: u= lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary4204);
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary4299);
                     u=lhs_forall();
                     _fsp--;
                     if (failed) return d;
@@ -6016,14 +6106,14 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1503:5: '(' u= lhs_or ')'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1516:5: '(' u= lhs_or ')'
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary4212); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary4216);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary4307); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary4311);
                     u=lhs_or();
                     _fsp--;
                     if (failed) return d;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary4218); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary4313); if (failed) return d;
 
                     }
                     break;
@@ -6033,7 +6123,7 @@
             if ( backtracking==0 ) {
                d = u; 
             }
-            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary4228);
+            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary4323);
             opt_semicolon();
             _fsp--;
             if (failed) return d;
@@ -6053,7 +6143,7 @@
 
 
     // $ANTLR start lhs_exist
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:1: lhs_exist returns [BaseDescr d] : loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1521:1: lhs_exist returns [BaseDescr d] : loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) ;
     public final BaseDescr lhs_exist() throws RecognitionException {
         BaseDescr d = null;
 
@@ -6062,49 +6152,49 @@
         BaseDescr pattern = null;
 
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1512:4: (loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1512:4: loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1525:4: (loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1525:4: loc= EXISTS ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
             {
             loc=(Token)input.LT(1);
-            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist4252); if (failed) return d;
+            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist4347); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new ExistsDescr( ); 
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
+              
+              			d = new ExistsDescr( ); 
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1519:10: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
-            int alt61=2;
-            int LA61_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:10: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
+            int alt64=2;
+            int LA64_0 = input.LA(1);
 
-            if ( (LA61_0==LEFT_PAREN) ) {
-                alt61=1;
+            if ( (LA64_0==LEFT_PAREN) ) {
+                alt64=1;
             }
-            else if ( (LA61_0==ID) ) {
-                alt61=2;
+            else if ( (LA64_0==ID) ) {
+                alt64=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1519:10: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )", 61, 0, input);
+                    new NoViableAltException("1532:10: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )", 64, 0, input);
 
                 throw nvae;
             }
-            switch (alt61) {
+            switch (alt64) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1519:12: ( '(' pattern= lhs_or end= ')' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:12: ( '(' pattern= lhs_or end= ')' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1519:12: ( '(' pattern= lhs_or end= ')' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1519:14: '(' pattern= lhs_or end= ')'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:12: ( '(' pattern= lhs_or end= ')' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1532:14: '(' pattern= lhs_or end= ')'
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist4272); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist4276);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist4367); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist4371);
                     pattern=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -6112,7 +6202,7 @@
                        if ( pattern != null ) ((ExistsDescr)d).addDescr( pattern ); 
                     }
                     end=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist4308); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist4403); if (failed) return d;
                     if ( backtracking==0 ) {
                        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); 
                     }
@@ -6123,18 +6213,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1524:12: pattern= lhs_pattern
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1537:12: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist4358);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist4453);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      	                	if ( pattern != null ) {
-                      	                		((ExistsDescr)d).addDescr( pattern );
-                      	                		d.setEndCharacter( pattern.getEndCharacter() );
-                      	                	}
+                      
+                      	                	if ( pattern != null ) {
+                      	                		((ExistsDescr)d).addDescr( pattern );
+                      	                		d.setEndCharacter( pattern.getEndCharacter() );
+                      	                	}
                       	                
                     }
 
@@ -6159,7 +6249,7 @@
 
 
     // $ANTLR start lhs_not
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1534:1: lhs_not returns [NotDescr d] : loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1547:1: lhs_not returns [NotDescr d] : loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) ;
     public final NotDescr lhs_not() throws RecognitionException {
         NotDescr d = null;
 
@@ -6168,49 +6258,49 @@
         BaseDescr pattern = null;
 
 
-
-        		d = null;
+        
+        		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:4: (loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:4: loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1551:4: (loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1551:4: loc= NOT ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
             {
             loc=(Token)input.LT(1);
-            match(input,NOT,FOLLOW_NOT_in_lhs_not4412); if (failed) return d;
+            match(input,NOT,FOLLOW_NOT_in_lhs_not4507); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			d = new NotDescr( ); 
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
+              
+              			d = new NotDescr( ); 
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1545:3: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1558:3: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )
+            int alt65=2;
+            int LA65_0 = input.LA(1);
 
-            if ( (LA62_0==LEFT_PAREN) ) {
-                alt62=1;
+            if ( (LA65_0==LEFT_PAREN) ) {
+                alt65=1;
             }
-            else if ( (LA62_0==ID) ) {
-                alt62=2;
+            else if ( (LA65_0==ID) ) {
+                alt65=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1545:3: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )", 62, 0, input);
+                    new NoViableAltException("1558:3: ( ( '(' pattern= lhs_or end= ')' ) | pattern= lhs_pattern )", 65, 0, input);
 
                 throw nvae;
             }
-            switch (alt62) {
+            switch (alt65) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1545:5: ( '(' pattern= lhs_or end= ')' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1558:5: ( '(' pattern= lhs_or end= ')' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1545:5: ( '(' pattern= lhs_or end= ')' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1545:7: '(' pattern= lhs_or end= ')'
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1558:5: ( '(' pattern= lhs_or end= ')' )
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1558:7: '(' pattern= lhs_or end= ')'
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not4425); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not4429);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not4520); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not4524);
                     pattern=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -6218,7 +6308,7 @@
                        if ( pattern != null ) d.addDescr( pattern ); 
                     }
                     end=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not4462); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not4557); if (failed) return d;
                     if ( backtracking==0 ) {
                        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); 
                     }
@@ -6229,18 +6319,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1551:3: pattern= lhs_pattern
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1564:3: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not4499);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not4594);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
-
-                      	                	if ( pattern != null ) {
-                      	                		d.addDescr( pattern );
-                      	                		d.setEndCharacter( pattern.getEndCharacter() );
-                      	                	}
+                      
+                      	                	if ( pattern != null ) {
+                      	                		d.addDescr( pattern );
+                      	                		d.setEndCharacter( pattern.getEndCharacter() );
+                      	                	}
                       	                
                     }
 
@@ -6265,7 +6355,7 @@
 
 
     // $ANTLR start lhs_eval
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1561:1: lhs_eval returns [BaseDescr d] : loc= EVAL c= paren_chunk[d] ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1574:1: lhs_eval returns [BaseDescr d] : loc= EVAL c= paren_chunk[d] ;
     public final BaseDescr lhs_eval() throws RecognitionException {
         BaseDescr d = null;
 
@@ -6273,34 +6363,34 @@
         String c = null;
 
 
-
-        		d = new EvalDescr( );
+        
+        		d = new EvalDescr( );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1566:3: (loc= EVAL c= paren_chunk[d] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1566:3: loc= EVAL c= paren_chunk[d]
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1579:3: (loc= EVAL c= paren_chunk[d] )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1579:3: loc= EVAL c= paren_chunk[d]
             {
             loc=(Token)input.LT(1);
-            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval4547); if (failed) return d;
+            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval4642); if (failed) return d;
             if ( backtracking==0 ) {
-
-              			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
+              
+              			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
               		
             }
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval4558);
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval4653);
             c=paren_chunk(d);
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-               
-              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		        if( c != null ) {
-              	  		    this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-              		            String body = c.length() > 1 ? c.substring(1, c.length()-1) : "";
-              			    checkTrailingSemicolon( body, offset(loc.getLine()) );
-              			    ((EvalDescr) d).setContent( body );
-              			    location.setProperty(Location.LOCATION_EVAL_CONTENT, body);
-              			}
+               
+              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              		        if( c != null ) {
+              	  		    this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+              		            String body = c.length() > 1 ? c.substring(1, c.length()-1) : "";
+              			    checkTrailingSemicolon( body, offset(loc.getLine()) );
+              			    ((EvalDescr) d).setContent( body );
+              			    location.setProperty(Location.LOCATION_EVAL_CONTENT, body);
+              			}
               		
             }
 
@@ -6319,7 +6409,7 @@
 
 
     // $ANTLR start lhs_forall
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1583:1: lhs_forall returns [ForallDescr d] : loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')' ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1596:1: lhs_forall returns [ForallDescr d] : loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')' ;
     public final ForallDescr lhs_forall() throws RecognitionException {
         ForallDescr d = null;
 
@@ -6330,70 +6420,70 @@
         BaseDescr pattern = null;
 
 
-
-        		d = factory.createForall();
+        
+        		d = factory.createForall();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1587:4: (loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1587:4: loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')'
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1600:4: (loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')' )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1600:4: loc= FORALL '(' base= lhs_pattern ( ( ',' )? pattern= lhs_pattern )+ end= ')'
             {
             loc=(Token)input.LT(1);
-            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall4587); if (failed) return d;
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall4589); if (failed) return d;
-            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall4593);
+            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall4682); if (failed) return d;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall4684); if (failed) return d;
+            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall4688);
             base=lhs_pattern();
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
-
-              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-              		        // adding the base pattern
-              		        d.addDescr( base );
-              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+              
+              			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+              		        // adding the base pattern
+              		        d.addDescr( base );
+              			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:3: ( ( ',' )? pattern= lhs_pattern )+
-            int cnt64=0;
-            loop64:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1607:3: ( ( ',' )? pattern= lhs_pattern )+
+            int cnt67=0;
+            loop67:
             do {
-                int alt64=2;
-                int LA64_0 = input.LA(1);
+                int alt67=2;
+                int LA67_0 = input.LA(1);
 
-                if ( (LA64_0==COMMA||LA64_0==ID) ) {
-                    alt64=1;
+                if ( (LA67_0==ID||LA67_0==COMMA) ) {
+                    alt67=1;
                 }
 
 
-                switch (alt64) {
+                switch (alt67) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:5: ( ',' )? pattern= lhs_pattern
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1607:5: ( ',' )? pattern= lhs_pattern
             	    {
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:5: ( ',' )?
-            	    int alt63=2;
-            	    int LA63_0 = input.LA(1);
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1607:5: ( ',' )?
+            	    int alt66=2;
+            	    int LA66_0 = input.LA(1);
 
-            	    if ( (LA63_0==COMMA) ) {
-            	        alt63=1;
+            	    if ( (LA66_0==COMMA) ) {
+            	        alt66=1;
             	    }
-            	    switch (alt63) {
+            	    switch (alt66) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:6: ','
+            	            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1607:6: ','
             	            {
-            	            match(input,COMMA,FOLLOW_COMMA_in_lhs_forall4607); if (failed) return d;
+            	            match(input,COMMA,FOLLOW_COMMA_in_lhs_forall4702); if (failed) return d;
 
             	            }
             	            break;
 
             	    }
 
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall4613);
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall4708);
             	    pattern=lhs_pattern();
             	    _fsp--;
             	    if (failed) return d;
             	    if ( backtracking==0 ) {
-
-            	      		        // adding additional patterns
-            	      			d.addDescr( pattern );
+            	      
+            	      		        // adding additional patterns
+            	      			d.addDescr( pattern );
             	      		
             	    }
 
@@ -6401,20 +6491,20 @@
             	    break;
 
             	default :
-            	    if ( cnt64 >= 1 ) break loop64;
+            	    if ( cnt67 >= 1 ) break loop67;
             	    if (backtracking>0) {failed=true; return d;}
                         EarlyExitException eee =
-                            new EarlyExitException(64, input);
+                            new EarlyExitException(67, input);
                         throw eee;
                 }
-                cnt64++;
+                cnt67++;
             } while (true);
 
             end=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall4628); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall4723); if (failed) return d;
             if ( backtracking==0 ) {
-
-              		        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() );
+              
+              		        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() );
               		
             }
 
@@ -6433,7 +6523,7 @@
 
 
     // $ANTLR start dotted_name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1606:1: dotted_name[BaseDescr descr] returns [String name] : id= ID ( '.' ident= identifier )* ( '[' loc= ']' )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1619:1: dotted_name[BaseDescr descr] returns [String name] : id= ID ( '.' ident= identifier )* ( '[' loc= ']' )* ;
     public final String dotted_name(BaseDescr descr) throws RecognitionException {
         String name = null;
 
@@ -6442,50 +6532,50 @@
         Token ident = null;
 
 
-
-        		name = null;
+        
+        		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1611:3: (id= ID ( '.' ident= identifier )* ( '[' loc= ']' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1611:3: id= ID ( '.' ident= identifier )* ( '[' loc= ']' )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1624:3: (id= ID ( '.' ident= identifier )* ( '[' loc= ']' )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1624:3: id= ID ( '.' ident= identifier )* ( '[' loc= ']' )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_dotted_name4659); if (failed) return name;
+            match(input,ID,FOLLOW_ID_in_dotted_name4754); if (failed) return name;
             if ( backtracking==0 ) {
-               
-              		    name=id.getText(); 
-              		    if( descr != null ) {
-              			descr.setStartCharacter( ((CommonToken)id).getStartIndex() );
-              			descr.setEndCharacter( ((CommonToken)id).getStopIndex() );
-              		    }
+               
+              		    name=id.getText(); 
+              		    if( descr != null ) {
+              			descr.setStartCharacter( ((CommonToken)id).getStartIndex() );
+              			descr.setEndCharacter( ((CommonToken)id).getStopIndex() );
+              		    }
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:3: ( '.' ident= identifier )*
-            loop65:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1632:3: ( '.' ident= identifier )*
+            loop68:
             do {
-                int alt65=2;
-                int LA65_0 = input.LA(1);
+                int alt68=2;
+                int LA68_0 = input.LA(1);
 
-                if ( (LA65_0==71) ) {
-                    alt65=1;
+                if ( (LA68_0==71) ) {
+                    alt68=1;
                 }
 
 
-                switch (alt65) {
+                switch (alt68) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:5: '.' ident= identifier
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1632:5: '.' ident= identifier
             	    {
-            	    match(input,71,FOLLOW_71_in_dotted_name4671); if (failed) return name;
-            	    pushFollow(FOLLOW_identifier_in_dotted_name4675);
+            	    match(input,71,FOLLOW_71_in_dotted_name4766); if (failed) return name;
+            	    pushFollow(FOLLOW_identifier_in_dotted_name4770);
             	    ident=identifier();
             	    _fsp--;
             	    if (failed) return name;
             	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "." + ident.getText(); 
-            	          		        if( descr != null ) {
-            	      			    descr.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-            	      		        }
+            	       
+            	      		        name = name + "." + ident.getText(); 
+            	          		        if( descr != null ) {
+            	      			    descr.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+            	      		        }
             	      		    
             	    }
 
@@ -6493,34 +6583,34 @@
             	    break;
 
             	default :
-            	    break loop65;
+            	    break loop68;
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:3: ( '[' loc= ']' )*
-            loop66:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1640:3: ( '[' loc= ']' )*
+            loop69:
             do {
-                int alt66=2;
-                int LA66_0 = input.LA(1);
+                int alt69=2;
+                int LA69_0 = input.LA(1);
 
-                if ( (LA66_0==LEFT_SQUARE) ) {
-                    alt66=1;
+                if ( (LA69_0==LEFT_SQUARE) ) {
+                    alt69=1;
                 }
 
 
-                switch (alt66) {
+                switch (alt69) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:5: '[' loc= ']'
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1640:5: '[' loc= ']'
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4697); if (failed) return name;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4792); if (failed) return name;
             	    loc=(Token)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4701); if (failed) return name;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4796); if (failed) return name;
             	    if ( backtracking==0 ) {
-            	       
-            	      		        name = name + "[]";
-            	          		        if( descr != null ) {
-            	      			    descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-            	      		        }
+            	       
+            	      		        name = name + "[]";
+            	          		        if( descr != null ) {
+            	      			    descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+            	      		        }
             	      		    
             	    }
 
@@ -6528,7 +6618,7 @@
             	    break;
 
             	default :
-            	    break loop66;
+            	    break loop69;
                 }
             } while (true);
 
@@ -6548,44 +6638,44 @@
 
 
     // $ANTLR start argument
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:1: argument returns [String name] : id= identifier ( '[' ']' )* ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1650:1: argument returns [String name] : id= identifier ( '[' ']' )* ;
     public final String argument() throws RecognitionException {
         String name = null;
 
         Token id = null;
 
 
-
-        		name = null;
+        
+        		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:3: (id= identifier ( '[' ']' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:3: id= identifier ( '[' ']' )*
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1655:3: (id= identifier ( '[' ']' )* )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1655:3: id= identifier ( '[' ']' )*
             {
-            pushFollow(FOLLOW_identifier_in_argument4740);
+            pushFollow(FOLLOW_identifier_in_argument4835);
             id=identifier();
             _fsp--;
             if (failed) return name;
             if ( backtracking==0 ) {
                name=id.getText(); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:40: ( '[' ']' )*
-            loop67:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1655:40: ( '[' ']' )*
+            loop70:
             do {
-                int alt67=2;
-                int LA67_0 = input.LA(1);
+                int alt70=2;
+                int LA70_0 = input.LA(1);
 
-                if ( (LA67_0==LEFT_SQUARE) ) {
-                    alt67=1;
+                if ( (LA70_0==LEFT_SQUARE) ) {
+                    alt70=1;
                 }
 
 
-                switch (alt67) {
+                switch (alt70) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:42: '[' ']'
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1655:42: '[' ']'
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument4746); if (failed) return name;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument4748); if (failed) return name;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument4841); if (failed) return name;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument4843); if (failed) return name;
             	    if ( backtracking==0 ) {
             	       name = name + "[]";
             	    }
@@ -6594,7 +6684,7 @@
             	    break;
 
             	default :
-            	    break loop67;
+            	    break loop70;
                 }
             } while (true);
 
@@ -6614,49 +6704,49 @@
 
 
     // $ANTLR start rhs_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:1: rhs_chunk[RuleDescr rule] : start= THEN (~ END )* loc= END ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1658:1: rhs_chunk[RuleDescr rule] : start= THEN (~ END )* loc= END ;
     public final void rhs_chunk(RuleDescr rule) throws RecognitionException {
         Token start=null;
         Token loc=null;
 
-
-                   StringBuffer buf = null;
-                   Integer channel = null;
+        
+                   StringBuffer buf = null;
+                   Integer channel = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:10: (start= THEN (~ END )* loc= END )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:10: start= THEN (~ END )* loc= END
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1664:10: (start= THEN (~ END )* loc= END )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1664:10: start= THEN (~ END )* loc= END
             {
             if ( backtracking==0 ) {
-
-              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-              		    buf = new StringBuffer();
+              
+              	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+              		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+              		    buf = new StringBuffer();
               	        
             }
             start=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4792); if (failed) return ;
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4887); if (failed) return ;
             if ( backtracking==0 ) {
-
-              			location.setType( Location.LOCATION_RHS );
+              
+              			location.setType( Location.LOCATION_RHS );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1660:3: (~ END )*
-            loop68:
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1673:3: (~ END )*
+            loop71:
             do {
-                int alt68=2;
-                int LA68_0 = input.LA(1);
+                int alt71=2;
+                int LA71_0 = input.LA(1);
 
-                if ( ((LA68_0>=ATTRIBUTES && LA68_0<=QUERY)||(LA68_0>=TEMPLATE && LA68_0<=79)) ) {
-                    alt68=1;
+                if ( ((LA71_0>=ATTRIBUTES && LA71_0<=RIGHT_PAREN)||(LA71_0>=TEMPLATE && LA71_0<=79)) ) {
+                    alt71=1;
                 }
 
 
-                switch (alt68) {
+                switch (alt71) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1661:6: ~ END
+            	    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1674:6: ~ END
             	    {
-            	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=79) ) {
+            	    if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=RIGHT_PAREN)||(input.LA(1)>=TEMPLATE && input.LA(1)<=79) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6664,12 +6754,12 @@
             	        if (backtracking>0) {failed=true; return ;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4808);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4903);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
-
-            	      			    buf.append( input.LT(-1).getText() );
+            	      
+            	      			    buf.append( input.LT(-1).getText() );
             	      			  
             	    }
 
@@ -6677,37 +6767,37 @@
             	    break;
 
             	default :
-            	    break loop68;
+            	    break loop71;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-
-              		    if( channel != null ) {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-              		    } else {
-              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-              		    }
+              
+              		    if( channel != null ) {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+              		    } else {
+              			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+              		    }
               		
             }
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk4845); if (failed) return ;
+            match(input,END,FOLLOW_END_in_rhs_chunk4940); if (failed) return ;
             if ( backtracking==0 ) {
-
-                                  // ignoring first line in the consequence
-                                  int index = 0;
-                                  while( (index < buf.length() ) && Character.isWhitespace( buf.charAt( index ) ) &&
-                                         (buf.charAt( index ) != 10 ) && (buf.charAt( index ) != 13 ))
-                                             index++;
-                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\r' ) )
-                                      index++;
-                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\n' ) )
-                                      index++;
-                                  
-              		    rule.setConsequence( buf.substring( index ) );
-                   		    rule.setConsequenceLocation(offset(start.getLine()), start.getCharPositionInLine());
-               		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-               		    location.setProperty( Location.LOCATION_RHS_CONTENT, rule.getConsequence() );
+              
+                                  // ignoring first line in the consequence
+                                  int index = 0;
+                                  while( (index < buf.length() ) && Character.isWhitespace( buf.charAt( index ) ) &&
+                                         (buf.charAt( index ) != 10 ) && (buf.charAt( index ) != 13 ))
+                                             index++;
+                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\r' ) )
+                                      index++;
+                                  if( (index < buf.length() ) && ( buf.charAt( index ) == '\n' ) )
+                                      index++;
+                                  
+              		    rule.setConsequence( buf.substring( index ) );
+                   		    rule.setConsequenceLocation(offset(start.getLine()), start.getCharPositionInLine());
+               		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+               		    location.setProperty( Location.LOCATION_RHS_CONTENT, rule.getConsequence() );
                               
             }
 
@@ -6726,7 +6816,7 @@
 
 
     // $ANTLR start name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1692:1: name returns [String s] : (tok= ID | str= STRING ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1705:1: name returns [String s] : (tok= ID | str= STRING ) ;
     public final String name() throws RecognitionException {
         String s = null;
 
@@ -6734,48 +6824,48 @@
         Token str=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:2: ( (tok= ID | str= STRING ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:2: (tok= ID | str= STRING )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1707:2: ( (tok= ID | str= STRING ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1707:2: (tok= ID | str= STRING )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:2: (tok= ID | str= STRING )
-            int alt69=2;
-            int LA69_0 = input.LA(1);
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1707:2: (tok= ID | str= STRING )
+            int alt72=2;
+            int LA72_0 = input.LA(1);
 
-            if ( (LA69_0==ID) ) {
-                alt69=1;
+            if ( (LA72_0==ID) ) {
+                alt72=1;
             }
-            else if ( (LA69_0==STRING) ) {
-                alt69=2;
+            else if ( (LA72_0==STRING) ) {
+                alt72=2;
             }
             else {
                 if (backtracking>0) {failed=true; return s;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1694:2: (tok= ID | str= STRING )", 69, 0, input);
+                    new NoViableAltException("1707:2: (tok= ID | str= STRING )", 72, 0, input);
 
                 throw nvae;
             }
-            switch (alt69) {
+            switch (alt72) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1695:6: tok= ID
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1708:6: tok= ID
                     {
                     tok=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_name4889); if (failed) return s;
+                    match(input,ID,FOLLOW_ID_in_name4984); if (failed) return s;
                     if ( backtracking==0 ) {
-
-                      	        s = tok.getText();
+                      
+                      	        s = tok.getText();
                       	    
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1700:6: str= STRING
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1713:6: str= STRING
                     {
                     str=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_name4908); if (failed) return s;
+                    match(input,STRING,FOLLOW_STRING_in_name5003); if (failed) return s;
                     if ( backtracking==0 ) {
-
-                      	       s = getString( str );
+                      
+                      	       s = getString( str );
                       	    
                     }
 
@@ -6800,454 +6890,454 @@
 
 
     // $ANTLR start identifier
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:1: identifier returns [Token tok] : (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN ) ;
+    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1720:1: identifier returns [Token tok] : (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN ) ;
     public final Token identifier() throws RecognitionException {
         Token tok = null;
 
         Token t=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:2: ( (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1722:2: ( (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN ) )
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1722:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )
-            int alt70=33;
+            // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1722:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )
+            int alt73=33;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                alt70=1;
+                alt73=1;
                 }
                 break;
             case PACKAGE:
                 {
-                alt70=2;
+                alt73=2;
                 }
                 break;
             case FUNCTION:
                 {
-                alt70=3;
+                alt73=3;
                 }
                 break;
             case GLOBAL:
                 {
-                alt70=4;
+                alt73=4;
                 }
                 break;
             case IMPORT:
                 {
-                alt70=5;
+                alt73=5;
                 }
                 break;
             case RULE:
                 {
-                alt70=6;
+                alt73=6;
                 }
                 break;
             case QUERY:
                 {
-                alt70=7;
+                alt73=7;
                 }
                 break;
             case TEMPLATE:
                 {
-                alt70=8;
+                alt73=8;
                 }
                 break;
             case ATTRIBUTES:
                 {
-                alt70=9;
+                alt73=9;
                 }
                 break;
             case ENABLED:
                 {
-                alt70=10;
+                alt73=10;
                 }
                 break;
             case SALIENCE:
                 {
-                alt70=11;
+                alt73=11;
                 }
                 break;
             case DURATION:
                 {
-                alt70=12;
+                alt73=12;
                 }
                 break;
             case FROM:
                 {
-                alt70=13;
+                alt73=13;
                 }
                 break;
             case ACCUMULATE:
                 {
-                alt70=14;
+                alt73=14;
                 }
                 break;
             case INIT:
                 {
-                alt70=15;
+                alt73=15;
                 }
                 break;
             case ACTION:
                 {
-                alt70=16;
+                alt73=16;
                 }
                 break;
             case RESULT:
                 {
-                alt70=17;
+                alt73=17;
                 }
                 break;
             case COLLECT:
                 {
-                alt70=18;
+                alt73=18;
                 }
                 break;
             case OR:
                 {
-                alt70=19;
+                alt73=19;
                 }
                 break;
             case AND:
                 {
-                alt70=20;
+                alt73=20;
                 }
                 break;
             case CONTAINS:
                 {
-                alt70=21;
+                alt73=21;
                 }
                 break;
             case EXCLUDES:
                 {
-                alt70=22;
+                alt73=22;
                 }
                 break;
             case MEMBEROF:
                 {
-                alt70=23;
+                alt73=23;
                 }
                 break;
             case MATCHES:
                 {
-                alt70=24;
+                alt73=24;
                 }
                 break;
             case NULL:
                 {
-                alt70=25;
+                alt73=25;
                 }
                 break;
             case EXISTS:
                 {
-                alt70=26;
+                alt73=26;
                 }
                 break;
             case NOT:
                 {
-                alt70=27;
+                alt73=27;
                 }
                 break;
             case EVAL:
                 {
-                alt70=28;
+                alt73=28;
                 }
                 break;
             case FORALL:
                 {
-                alt70=29;
+                alt73=29;
                 }
                 break;
             case WHEN:
                 {
-                alt70=30;
+                alt73=30;
                 }
                 break;
             case THEN:
                 {
-                alt70=31;
+                alt73=31;
                 }
                 break;
             case END:
                 {
-                alt70=32;
+                alt73=32;
                 }
                 break;
             case IN:
                 {
-                alt70=33;
+                alt73=33;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return tok;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1709:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )", 70, 0, input);
+                    new NoViableAltException("1722:2: (t= ID | t= PACKAGE | t= FUNCTION | t= GLOBAL | t= IMPORT | t= RULE | t= QUERY | t= TEMPLATE | t= ATTRIBUTES | t= ENABLED | t= SALIENCE | t= DURATION | t= FROM | t= ACCUMULATE | t= INIT | t= ACTION | t= RESULT | t= COLLECT | t= OR | t= AND | t= CONTAINS | t= EXCLUDES | t= MEMBEROF | t= MATCHES | t= NULL | t= EXISTS | t= NOT | t= EVAL | t= FORALL | t= WHEN | t= THEN | t= END | t= IN )", 73, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt70) {
+            switch (alt73) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:10: t= ID
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1722:10: t= ID
                     {
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_identifier4946); if (failed) return tok;
+                    match(input,ID,FOLLOW_ID_in_identifier5041); if (failed) return tok;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1710:4: t= PACKAGE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1723:4: t= PACKAGE
                     {
                     t=(Token)input.LT(1);
-                    match(input,PACKAGE,FOLLOW_PACKAGE_in_identifier4959); if (failed) return tok;
+                    match(input,PACKAGE,FOLLOW_PACKAGE_in_identifier5054); if (failed) return tok;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1711:4: t= FUNCTION
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1724:4: t= FUNCTION
                     {
                     t=(Token)input.LT(1);
-                    match(input,FUNCTION,FOLLOW_FUNCTION_in_identifier4966); if (failed) return tok;
+                    match(input,FUNCTION,FOLLOW_FUNCTION_in_identifier5061); if (failed) return tok;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1712:4: t= GLOBAL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1725:4: t= GLOBAL
                     {
                     t=(Token)input.LT(1);
-                    match(input,GLOBAL,FOLLOW_GLOBAL_in_identifier4973); if (failed) return tok;
+                    match(input,GLOBAL,FOLLOW_GLOBAL_in_identifier5068); if (failed) return tok;
 
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1713:4: t= IMPORT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1726:4: t= IMPORT
                     {
                     t=(Token)input.LT(1);
-                    match(input,IMPORT,FOLLOW_IMPORT_in_identifier4980); if (failed) return tok;
+                    match(input,IMPORT,FOLLOW_IMPORT_in_identifier5075); if (failed) return tok;
 
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1714:4: t= RULE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1727:4: t= RULE
                     {
                     t=(Token)input.LT(1);
-                    match(input,RULE,FOLLOW_RULE_in_identifier4989); if (failed) return tok;
+                    match(input,RULE,FOLLOW_RULE_in_identifier5084); if (failed) return tok;
 
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1715:4: t= QUERY
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1728:4: t= QUERY
                     {
                     t=(Token)input.LT(1);
-                    match(input,QUERY,FOLLOW_QUERY_in_identifier4996); if (failed) return tok;
+                    match(input,QUERY,FOLLOW_QUERY_in_identifier5091); if (failed) return tok;
 
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:17: t= TEMPLATE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1729:17: t= TEMPLATE
                     {
                     t=(Token)input.LT(1);
-                    match(input,TEMPLATE,FOLLOW_TEMPLATE_in_identifier5017); if (failed) return tok;
+                    match(input,TEMPLATE,FOLLOW_TEMPLATE_in_identifier5112); if (failed) return tok;
 
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:17: t= ATTRIBUTES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1730:17: t= ATTRIBUTES
                     {
                     t=(Token)input.LT(1);
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_identifier5045); if (failed) return tok;
+                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_identifier5140); if (failed) return tok;
 
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:17: t= ENABLED
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1731:17: t= ENABLED
                     {
                     t=(Token)input.LT(1);
-                    match(input,ENABLED,FOLLOW_ENABLED_in_identifier5071); if (failed) return tok;
+                    match(input,ENABLED,FOLLOW_ENABLED_in_identifier5166); if (failed) return tok;
 
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1719:17: t= SALIENCE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1732:17: t= SALIENCE
                     {
                     t=(Token)input.LT(1);
-                    match(input,SALIENCE,FOLLOW_SALIENCE_in_identifier5100); if (failed) return tok;
+                    match(input,SALIENCE,FOLLOW_SALIENCE_in_identifier5195); if (failed) return tok;
 
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1720:17: t= DURATION
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1733:17: t= DURATION
                     {
                     t=(Token)input.LT(1);
-                    match(input,DURATION,FOLLOW_DURATION_in_identifier5122); if (failed) return tok;
+                    match(input,DURATION,FOLLOW_DURATION_in_identifier5217); if (failed) return tok;
 
                     }
                     break;
                 case 13 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1721:17: t= FROM
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1734:17: t= FROM
                     {
                     t=(Token)input.LT(1);
-                    match(input,FROM,FOLLOW_FROM_in_identifier5144); if (failed) return tok;
+                    match(input,FROM,FOLLOW_FROM_in_identifier5239); if (failed) return tok;
 
                     }
                     break;
                 case 14 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1722:17: t= ACCUMULATE
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1735:17: t= ACCUMULATE
                     {
                     t=(Token)input.LT(1);
-                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_identifier5173); if (failed) return tok;
+                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_identifier5268); if (failed) return tok;
 
                     }
                     break;
                 case 15 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:17: t= INIT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1736:17: t= INIT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INIT,FOLLOW_INIT_in_identifier5195); if (failed) return tok;
+                    match(input,INIT,FOLLOW_INIT_in_identifier5290); if (failed) return tok;
 
                     }
                     break;
                 case 16 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:17: t= ACTION
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1737:17: t= ACTION
                     {
                     t=(Token)input.LT(1);
-                    match(input,ACTION,FOLLOW_ACTION_in_identifier5224); if (failed) return tok;
+                    match(input,ACTION,FOLLOW_ACTION_in_identifier5319); if (failed) return tok;
 
                     }
                     break;
                 case 17 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1725:17: t= RESULT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1738:17: t= RESULT
                     {
                     t=(Token)input.LT(1);
-                    match(input,RESULT,FOLLOW_RESULT_in_identifier5253); if (failed) return tok;
+                    match(input,RESULT,FOLLOW_RESULT_in_identifier5348); if (failed) return tok;
 
                     }
                     break;
                 case 18 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1726:17: t= COLLECT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1739:17: t= COLLECT
                     {
                     t=(Token)input.LT(1);
-                    match(input,COLLECT,FOLLOW_COLLECT_in_identifier5282); if (failed) return tok;
+                    match(input,COLLECT,FOLLOW_COLLECT_in_identifier5377); if (failed) return tok;
 
                     }
                     break;
                 case 19 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:17: t= OR
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1740:17: t= OR
                     {
                     t=(Token)input.LT(1);
-                    match(input,OR,FOLLOW_OR_in_identifier5311); if (failed) return tok;
+                    match(input,OR,FOLLOW_OR_in_identifier5406); if (failed) return tok;
 
                     }
                     break;
                 case 20 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:17: t= AND
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1741:17: t= AND
                     {
                     t=(Token)input.LT(1);
-                    match(input,AND,FOLLOW_AND_in_identifier5340); if (failed) return tok;
+                    match(input,AND,FOLLOW_AND_in_identifier5435); if (failed) return tok;
 
                     }
                     break;
                 case 21 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1729:17: t= CONTAINS
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1742:17: t= CONTAINS
                     {
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_identifier5369); if (failed) return tok;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_identifier5464); if (failed) return tok;
 
                     }
                     break;
                 case 22 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1730:17: t= EXCLUDES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1743:17: t= EXCLUDES
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_identifier5391); if (failed) return tok;
+                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_identifier5486); if (failed) return tok;
 
                     }
                     break;
                 case 23 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:17: t= MEMBEROF
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1744:17: t= MEMBEROF
                     {
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_identifier5413); if (failed) return tok;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_identifier5508); if (failed) return tok;
 
                     }
                     break;
                 case 24 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:17: t= MATCHES
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1745:17: t= MATCHES
                     {
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_identifier5433); if (failed) return tok;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_identifier5528); if (failed) return tok;
 
                     }
                     break;
                 case 25 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:17: t= NULL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1746:17: t= NULL
                     {
                     t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_identifier5462); if (failed) return tok;
+                    match(input,NULL,FOLLOW_NULL_in_identifier5557); if (failed) return tok;
 
                     }
                     break;
                 case 26 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1734:17: t= EXISTS
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1747:17: t= EXISTS
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXISTS,FOLLOW_EXISTS_in_identifier5491); if (failed) return tok;
+                    match(input,EXISTS,FOLLOW_EXISTS_in_identifier5586); if (failed) return tok;
 
                     }
                     break;
                 case 27 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:17: t= NOT
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1748:17: t= NOT
                     {
                     t=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_identifier5520); if (failed) return tok;
+                    match(input,NOT,FOLLOW_NOT_in_identifier5615); if (failed) return tok;
 
                     }
                     break;
                 case 28 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:17: t= EVAL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1749:17: t= EVAL
                     {
                     t=(Token)input.LT(1);
-                    match(input,EVAL,FOLLOW_EVAL_in_identifier5549); if (failed) return tok;
+                    match(input,EVAL,FOLLOW_EVAL_in_identifier5644); if (failed) return tok;
 
                     }
                     break;
                 case 29 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1737:17: t= FORALL
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1750:17: t= FORALL
                     {
                     t=(Token)input.LT(1);
-                    match(input,FORALL,FOLLOW_FORALL_in_identifier5578); if (failed) return tok;
+                    match(input,FORALL,FOLLOW_FORALL_in_identifier5673); if (failed) return tok;
 
                     }
                     break;
                 case 30 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1738:17: t= WHEN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1751:17: t= WHEN
                     {
                     t=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_identifier5616); if (failed) return tok;
+                    match(input,WHEN,FOLLOW_WHEN_in_identifier5711); if (failed) return tok;
 
                     }
                     break;
                 case 31 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1739:17: t= THEN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1752:17: t= THEN
                     {
                     t=(Token)input.LT(1);
-                    match(input,THEN,FOLLOW_THEN_in_identifier5648); if (failed) return tok;
+                    match(input,THEN,FOLLOW_THEN_in_identifier5743); if (failed) return tok;
 
                     }
                     break;
                 case 32 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1740:17: t= END
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1753:17: t= END
                     {
                     t=(Token)input.LT(1);
-                    match(input,END,FOLLOW_END_in_identifier5677); if (failed) return tok;
+                    match(input,END,FOLLOW_END_in_identifier5772); if (failed) return tok;
 
                     }
                     break;
                 case 33 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:11: t= IN
+                    // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1754:11: t= IN
                     {
                     t=(Token)input.LT(1);
-                    match(input,IN,FOLLOW_IN_in_identifier5696); if (failed) return tok;
+                    match(input,IN,FOLLOW_IN_in_identifier5791); if (failed) return tok;
 
                     }
                     break;
@@ -7255,8 +7345,8 @@
             }
 
             if ( backtracking==0 ) {
-
-              	    tok = t;
+              
+              	    tok = t;
               	
             }
 
@@ -7275,8 +7365,8 @@
 
     // $ANTLR start synpred7
     public final void synpred7_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:4: ( function_import_statement )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:208:4: function_import_statement
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:4: ( function_import_statement )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:208:4: function_import_statement
         {
         pushFollow(FOLLOW_function_import_statement_in_synpred7156);
         function_import_statement();
@@ -7289,8 +7379,8 @@
 
     // $ANTLR start synpred8
     public final void synpred8_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:209:4: ( import_statement )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:209:4: import_statement
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:209:4: ( import_statement )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:209:4: import_statement
         {
         pushFollow(FOLLOW_import_statement_in_synpred8162);
         import_statement();
@@ -7301,46 +7391,46 @@
     }
     // $ANTLR end synpred8
 
-    // $ANTLR start synpred43
-    public final void synpred43_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:767:4: ( paren_chunk[from] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:767:4: paren_chunk[from]
+    // $ANTLR start synpred46
+    public final void synpred46_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:780:4: ( paren_chunk[from] )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:780:4: paren_chunk[from]
         {
-        pushFollow(FOLLOW_paren_chunk_in_synpred431908);
+        pushFollow(FOLLOW_paren_chunk_in_synpred462003);
         paren_chunk(from);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred43
+    // $ANTLR end synpred46
 
-    // $ANTLR start synpred45
-    public final void synpred45_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:6: ( LEFT_SQUARE )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:8: LEFT_SQUARE
+    // $ANTLR start synpred48
+    public final void synpred48_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:816:6: ( LEFT_SQUARE )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:816:8: LEFT_SQUARE
         {
-        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred451978); if (failed) return ;
+        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred482073); if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred45
+    // $ANTLR end synpred48
 
-    // $ANTLR start synpred46
-    public final void synpred46_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:808:6: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:808:8: LEFT_PAREN
+    // $ANTLR start synpred49
+    public final void synpred49_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:821:6: ( LEFT_PAREN )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:821:8: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred462012); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred492107); if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred46
+    // $ANTLR end synpred49
 
-    // $ANTLR start synpred53
-    public final void synpred53_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:6: ( ( OR | DOUBLE_PIPE ) fact )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:6: ( OR | DOUBLE_PIPE ) fact
+    // $ANTLR start synpred56
+    public final void synpred56_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:6: ( ( OR | DOUBLE_PIPE ) fact )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:940:6: ( OR | DOUBLE_PIPE ) fact
         {
         if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
             input.consume();
@@ -7350,90 +7440,90 @@
             if (backtracking>0) {failed=true; return ;}
             MismatchedSetException mse =
                 new MismatchedSetException(null,input);
-            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred532335);    throw mse;
+            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred562430);    throw mse;
         }
 
-        pushFollow(FOLLOW_fact_in_synpred532353);
+        pushFollow(FOLLOW_fact_in_synpred562448);
         fact();
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred53
+    // $ANTLR end synpred56
 
-    // $ANTLR start synpred58
-    public final void synpred58_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:5: ( field_constraint[base] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:5: field_constraint[base]
+    // $ANTLR start synpred61
+    public final void synpred61_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:5: ( field_constraint[base] )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1053:5: field_constraint[base]
         {
-        pushFollow(FOLLOW_field_constraint_in_synpred582643);
+        pushFollow(FOLLOW_field_constraint_in_synpred612738);
         field_constraint(base);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred58
+    // $ANTLR end synpred61
 
-    // $ANTLR start synpred63
-    public final void synpred63_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1104:5: ( DOUBLE_PIPE and_restr_connective[or] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1104:5: DOUBLE_PIPE and_restr_connective[or]
+    // $ANTLR start synpred66
+    public final void synpred66_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1117:5: ( DOUBLE_PIPE and_restr_connective[or] )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1117:5: DOUBLE_PIPE and_restr_connective[or]
         {
-        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred632789); if (failed) return ;
-        pushFollow(FOLLOW_and_restr_connective_in_synpred632801);
+        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred662884); if (failed) return ;
+        pushFollow(FOLLOW_and_restr_connective_in_synpred662896);
         and_restr_connective(or);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred63
+    // $ANTLR end synpred66
 
-    // $ANTLR start synpred64
-    public final void synpred64_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:5: ( DOUBLE_AMPER constraint_expression[and] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:5: DOUBLE_AMPER constraint_expression[and]
+    // $ANTLR start synpred67
+    public final void synpred67_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1139:5: ( DOUBLE_AMPER constraint_expression[and] )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1139:5: DOUBLE_AMPER constraint_expression[and]
         {
-        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred642845); if (failed) return ;
-        pushFollow(FOLLOW_constraint_expression_in_synpred642855);
+        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred672940); if (failed) return ;
+        pushFollow(FOLLOW_constraint_expression_in_synpred672950);
         constraint_expression(and);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred64
+    // $ANTLR end synpred67
 
-    // $ANTLR start synpred105
-    public final void synpred105_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:14: ( ACCUMULATE )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:16: ACCUMULATE
+    // $ANTLR start synpred108
+    public final void synpred108_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1510:14: ( ACCUMULATE )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1510:16: ACCUMULATE
         {
-        match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_synpred1054092); if (failed) return ;
+        match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_synpred1084187); if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred105
+    // $ANTLR end synpred108
 
-    // $ANTLR start synpred106
-    public final void synpred106_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:14: ( COLLECT )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:16: COLLECT
+    // $ANTLR start synpred109
+    public final void synpred109_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1511:14: ( COLLECT )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1511:16: COLLECT
         {
-        match(input,COLLECT,FOLLOW_COLLECT_in_synpred1064121); if (failed) return ;
+        match(input,COLLECT,FOLLOW_COLLECT_in_synpred1094216); if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred106
+    // $ANTLR end synpred109
 
-    // $ANTLR start synpred108
-    public final void synpred108_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:14: (~ ( ACCUMULATE | COLLECT ) )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:16: ~ ( ACCUMULATE | COLLECT )
+    // $ANTLR start synpred111
+    public final void synpred111_fragment() throws RecognitionException {   
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1512:14: (~ ( ACCUMULATE | COLLECT ) )
+        // C:\\dev\\jbossrules\\trunk\\drools-compiler\\src\\main\\resources\\org\\drools\\lang\\DRL.g:1512:16: ~ ( ACCUMULATE | COLLECT )
         {
-        if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=LOCK_ON_ACTIVE)||(input.LA(1)>=LEFT_PAREN && input.LA(1)<=RIGHT_PAREN)||(input.LA(1)>=ID && input.LA(1)<=79) ) {
+        if ( (input.LA(1)>=ATTRIBUTES && input.LA(1)<=LOCK_ON_ACTIVE)||(input.LA(1)>=COMMA && input.LA(1)<=RESULT)||(input.LA(1)>=OR && input.LA(1)<=79) ) {
             input.consume();
             errorRecovery=false;failed=false;
         }
@@ -7441,19 +7531,19 @@
             if (backtracking>0) {failed=true; return ;}
             MismatchedSetException mse =
                 new MismatchedSetException(null,input);
-            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred1084151);    throw mse;
+            recoverFromMismatchedSet(input,mse,FOLLOW_set_in_synpred1114246);    throw mse;
         }
 
 
         }
     }
-    // $ANTLR end synpred108
+    // $ANTLR end synpred111
 
-    public final boolean synpred106() {
+    public final boolean synpred108() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred106_fragment(); // can never throw exception
+            synpred108_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7463,11 +7553,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred53() {
+    public final boolean synpred109() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred53_fragment(); // can never throw exception
+            synpred109_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7477,11 +7567,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred7() {
+    public final boolean synpred46() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred7_fragment(); // can never throw exception
+            synpred46_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7491,11 +7581,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred45() {
+    public final boolean synpred66() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred45_fragment(); // can never throw exception
+            synpred66_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7505,11 +7595,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred63() {
+    public final boolean synpred48() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred63_fragment(); // can never throw exception
+            synpred48_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7519,11 +7609,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred58() {
+    public final boolean synpred56() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred58_fragment(); // can never throw exception
+            synpred56_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7533,11 +7623,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred43() {
+    public final boolean synpred111() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred43_fragment(); // can never throw exception
+            synpred111_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7547,11 +7637,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred108() {
+    public final boolean synpred67() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred108_fragment(); // can never throw exception
+            synpred67_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7561,11 +7651,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred105() {
+    public final boolean synpred49() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred105_fragment(); // can never throw exception
+            synpred49_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7575,11 +7665,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred8() {
+    public final boolean synpred61() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred8_fragment(); // can never throw exception
+            synpred61_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7589,11 +7679,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred64() {
+    public final boolean synpred7() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred64_fragment(); // can never throw exception
+            synpred7_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7603,11 +7693,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred46() {
+    public final boolean synpred8() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred46_fragment(); // can never throw exception
+            synpred8_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7626,25 +7716,26 @@
     static final String DFA11_eofS =
         "\6\uffff";
     static final String DFA11_minS =
-        "\2\4\2\uffff\1\65\1\4";
+        "\2\4\1\uffff\1\65\1\uffff\1\4";
     static final String DFA11_maxS =
-        "\1\72\1\107\2\uffff\1\65\1\72";
+        "\1\72\1\107\1\uffff\1\65\1\uffff\1\72";
     static final String DFA11_acceptS =
-        "\2\uffff\1\2\1\1\2\uffff";
+        "\2\uffff\1\2\1\uffff\1\1\1\uffff";
     static final String DFA11_specialS =
         "\6\uffff}>";
     static final String[] DFA11_transitionS = {
-            "\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\2\uffff\1\2\2\uffff"+
-            "\3\2\1\uffff\1\2\1\1\1\2\2\uffff\7\2\1\uffff\1\2\4\uffff\5\2",
-            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\2\uffff\1\3\1\uffff"+
-            "\1\2\3\3\1\2\3\3\2\uffff\7\3\1\uffff\1\3\2\uffff\1\4\1\uffff"+
-            "\5\3\14\uffff\1\3",
+            "\6\2\1\uffff\1\1\1\uffff\4\2\3\uffff\1\2\1\uffff\1\2\6\uffff"+
+            "\1\2\2\uffff\1\2\1\uffff\5\2\2\uffff\7\2\1\uffff\1\2\4\uffff"+
+            "\5\2",
+            "\6\4\1\uffff\1\4\1\2\4\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4"+
+            "\2\uffff\1\4\1\2\5\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
+            "\5\4\14\uffff\1\4",
             "",
+            "\1\5",
             "",
-            "\1\5",
-            "\12\3\3\uffff\1\3\1\uffff\1\3\6\uffff\1\3\2\uffff\1\3\1\uffff"+
-            "\1\2\3\3\1\2\3\3\2\uffff\7\3\1\uffff\1\3\2\uffff\1\4\1\uffff"+
-            "\5\3"
+            "\6\4\1\uffff\1\4\1\2\4\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4"+
+            "\2\uffff\1\4\1\2\5\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
+            "\5\4"
     };
 
     static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
@@ -7693,16 +7784,17 @@
     static final String DFA12_specialS =
         "\6\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\12\2\3\uffff\1\2\1\uffff\1\2\6\uffff\1\2\2\uffff\1\2\2\uffff"+
-            "\3\2\1\uffff\1\2\1\1\1\2\2\uffff\7\2\1\uffff\1\2\4\uffff\5\2",
-            "\12\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4\2\uffff\1\4\1\uffff"+
-            "\1\2\3\4\1\2\3\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
+            "\6\2\1\uffff\1\1\1\uffff\4\2\3\uffff\1\2\1\uffff\1\2\6\uffff"+
+            "\1\2\2\uffff\1\2\1\uffff\5\2\2\uffff\7\2\1\uffff\1\2\4\uffff"+
+            "\5\2",
+            "\6\4\1\uffff\1\4\1\2\4\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4"+
+            "\2\uffff\1\4\1\2\5\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
             "\5\4\14\uffff\1\4",
             "",
             "\1\5",
             "",
-            "\12\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4\2\uffff\1\4\1\uffff"+
-            "\1\2\3\4\1\2\3\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
+            "\6\4\1\uffff\1\4\1\2\4\4\3\uffff\1\4\1\uffff\1\4\6\uffff\1\4"+
+            "\2\uffff\1\4\1\2\5\4\2\uffff\7\4\1\uffff\1\4\2\uffff\1\3\1\uffff"+
             "\5\4"
     };
 
@@ -7742,13 +7834,13 @@
  
 
     public static final BitSet FOLLOW_69_in_opt_semicolon46 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_prolog_in_compilation_unit64 = new BitSet(new long[]{0x0000000000001BC0L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit71 = new BitSet(new long[]{0x0000000000001BC2L});
-    public static final BitSet FOLLOW_package_statement_in_prolog96 = new BitSet(new long[]{0x000000009FEB4012L});
+    public static final BitSet FOLLOW_prolog_in_compilation_unit64 = new BitSet(new long[]{0x000000000000C3C0L});
+    public static final BitSet FOLLOW_statement_in_compilation_unit71 = new BitSet(new long[]{0x000000000000C3C2L});
+    public static final BitSet FOLLOW_package_statement_in_prolog96 = new BitSet(new long[]{0x00000002FF5A0012L});
     public static final BitSet FOLLOW_ATTRIBUTES_in_prolog111 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_prolog113 = new BitSet(new long[]{0x000000009FEB4002L});
-    public static final BitSet FOLLOW_COMMA_in_prolog122 = new BitSet(new long[]{0x000000001FEB4000L});
-    public static final BitSet FOLLOW_rule_attribute_in_prolog127 = new BitSet(new long[]{0x000000009FEB4002L});
+    public static final BitSet FOLLOW_70_in_prolog113 = new BitSet(new long[]{0x00000002FF5A0002L});
+    public static final BitSet FOLLOW_COMMA_in_prolog122 = new BitSet(new long[]{0x00000000FF5A0000L});
+    public static final BitSet FOLLOW_rule_attribute_in_prolog127 = new BitSet(new long[]{0x00000002FF5A0002L});
     public static final BitSet FOLLOW_function_import_statement_in_statement156 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_import_statement_in_statement162 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_global_in_statement168 = new BitSet(new long[]{0x0000000000000002L});
@@ -7756,323 +7848,328 @@
     public static final BitSet FOLLOW_template_in_statement188 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule_in_statement197 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_query_in_statement209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_package_statement238 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_PACKAGE_in_package_statement238 = new BitSet(new long[]{0x0000000000000800L});
     public static final BitSet FOLLOW_dotted_name_in_package_statement242 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
     public static final BitSet FOLLOW_opt_semicolon_in_package_statement245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_import_statement277 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
+    public static final BitSet FOLLOW_IMPORT_in_import_statement277 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
     public static final BitSet FOLLOW_import_name_in_import_statement300 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
     public static final BitSet FOLLOW_opt_semicolon_in_import_statement303 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_IMPORT_in_function_import_statement329 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement331 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
+    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement331 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
     public static final BitSet FOLLOW_import_name_in_function_import_statement354 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
     public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement357 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_identifier_in_import_name385 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
-    public static final BitSet FOLLOW_71_in_import_name397 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
+    public static final BitSet FOLLOW_71_in_import_name397 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
     public static final BitSet FOLLOW_identifier_in_import_name401 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000180L});
     public static final BitSet FOLLOW_72_in_import_name425 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_global461 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_dotted_name_in_global472 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
+    public static final BitSet FOLLOW_GLOBAL_in_global461 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_dotted_name_in_global472 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
     public static final BitSet FOLLOW_identifier_in_global484 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
     public static final BitSet FOLLOW_opt_semicolon_in_global486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_function513 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function518 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_function525 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_function534 = new BitSet(new long[]{0x07C2FE7F240A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function544 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_argument_in_function551 = new BitSet(new long[]{0x0000000880000000L});
-    public static final BitSet FOLLOW_COMMA_in_function565 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_dotted_name_in_function570 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_argument_in_function577 = new BitSet(new long[]{0x0000000880000000L});
+    public static final BitSet FOLLOW_FUNCTION_in_function513 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_dotted_name_in_function518 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_function525 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_function534 = new BitSet(new long[]{0x07C2FE7D2051FBF0L});
+    public static final BitSet FOLLOW_dotted_name_in_function544 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_argument_in_function551 = new BitSet(new long[]{0x0000000200001000L});
+    public static final BitSet FOLLOW_COMMA_in_function565 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_dotted_name_in_function570 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_argument_in_function577 = new BitSet(new long[]{0x0000000200001000L});
     public static final BitSet FOLLOW_RIGHT_PAREN_in_function601 = new BitSet(new long[]{0x0004000000000000L});
     public static final BitSet FOLLOW_curly_chunk_in_function607 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_query639 = new BitSet(new long[]{0x0000002000008000L});
-    public static final BitSet FOLLOW_name_in_query643 = new BitSet(new long[]{0x03000A2040000400L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query656 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_END_in_query673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_template703 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_template707 = new BitSet(new long[]{0x0000002000000000L,0x0000000000000020L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template709 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_template_slot_in_template724 = new BitSet(new long[]{0x0000002000000400L});
-    public static final BitSet FOLLOW_END_in_template741 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_template_slot789 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_template_slot807 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template_slot809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_rule842 = new BitSet(new long[]{0x0000002000008000L});
-    public static final BitSet FOLLOW_name_in_rule846 = new BitSet(new long[]{0x040000009FEB6010L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule855 = new BitSet(new long[]{0x0400000000002000L});
-    public static final BitSet FOLLOW_WHEN_in_rule864 = new BitSet(new long[]{0x07000A2040000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_rule866 = new BitSet(new long[]{0x07000A2040000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule884 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule905 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes926 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_rule_attributes928 = new BitSet(new long[]{0x000000009FEB4002L});
-    public static final BitSet FOLLOW_COMMA_in_rule_attributes937 = new BitSet(new long[]{0x000000001FEB4000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes942 = new BitSet(new long[]{0x000000009FEB4002L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1004 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1031 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1042 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1073 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1083 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_in_rule_attribute1102 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1134 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_date_effective1138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1171 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_date_expires1175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_enabled1210 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1214 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_salience1259 = new BitSet(new long[]{0x0000000040100000L});
-    public static final BitSet FOLLOW_INT_in_salience1272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_salience1287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1355 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1359 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1436 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1485 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1489 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1521 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1525 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1557 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_duration1595 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_INT_in_duration1599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DIALECT_in_dialect1631 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_STRING_in_dialect1635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1684 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1712 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1754 = new BitSet(new long[]{0x03000A2040000002L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern1819 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_pattern1828 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_from_statement1855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_from_source1897 = new BitSet(new long[]{0x0000000040000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source1908 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source1922 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_71_in_expression_chain1951 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_expression_chain1955 = new BitSet(new long[]{0x0010000040000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain1986 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain2020 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain2041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2082 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2092 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_accumulate_statement2096 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2098 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_statement2108 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2119 = new BitSet(new long[]{0x0000000280000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2122 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_ACTION_in_accumulate_statement2131 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2135 = new BitSet(new long[]{0x0000000480000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2138 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2147 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2151 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_collect_statement2206 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement2216 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_collect_statement2220 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement2224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_fact_binding2258 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_fact_binding2260 = new BitSet(new long[]{0x0000002040000000L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_binding2273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_expression2305 = new BitSet(new long[]{0x0000002040000000L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2309 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_expression2312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2323 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_set_in_fact_expression2335 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2353 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_fact2414 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact2428 = new BitSet(new long[]{0x07C2FE7F640A3FF0L});
-    public static final BitSet FOLLOW_constraints_in_fact2438 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2451 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints2471 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_COMMA_in_constraints2478 = new BitSet(new long[]{0x07C2FE77640A3FF0L});
-    public static final BitSet FOLLOW_constraint_in_constraints2487 = new BitSet(new long[]{0x0000000080000002L});
-    public static final BitSet FOLLOW_or_constr_in_constraint2520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr2543 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr2553 = new BitSet(new long[]{0x07C2FE77640A3FF0L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr2563 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr2595 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr2605 = new BitSet(new long[]{0x07C2FE77640A3FF0L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr2615 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_unary_constr2643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr2651 = new BitSet(new long[]{0x07C2FE77640A3FF0L});
-    public static final BitSet FOLLOW_or_constr_in_unary_constr2653 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr2656 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_unary_constr2662 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_predicate_in_unary_constr2664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_field_constraint2696 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
-    public static final BitSet FOLLOW_70_in_field_constraint2698 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_field_constraint2719 = new BitSet(new long[]{0x0000FC0040000002L,0x000000000000FE00L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint2733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_73_in_field_constraint2748 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_predicate_in_field_constraint2750 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective2779 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective2789 = new BitSet(new long[]{0x0000FC0040000000L,0x000000000000FC00L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective2801 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective2835 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective2845 = new BitSet(new long[]{0x0000FC0040000000L,0x000000000000FC00L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective2855 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression2890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression2897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression2904 = new BitSet(new long[]{0x0000FC0040000000L,0x000000000000FC00L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression2913 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression2919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_74_in_simple_operator2950 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_75_in_simple_operator2958 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_76_in_simple_operator2966 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_77_in_simple_operator2974 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_78_in_simple_operator2982 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_79_in_simple_operator2990 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator2998 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator3006 = new BitSet(new long[]{0x0000040000000000L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator3010 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator3018 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator3026 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator3034 = new BitSet(new long[]{0x0000200000000000L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator3038 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator3046 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator3054 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator3058 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator3072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_compound_operator3101 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_NOT_in_compound_operator3113 = new BitSet(new long[]{0x0000800000000000L});
-    public static final BitSet FOLLOW_IN_in_compound_operator3115 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator3130 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator3134 = new BitSet(new long[]{0x0000000880000000L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator3146 = new BitSet(new long[]{0x0003002040148000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator3150 = new BitSet(new long[]{0x0000000880000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator3166 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_expression_value3194 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enum_constraint_in_expression_value3207 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value3227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_retval_constraint_in_expression_value3241 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint3284 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint3295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint3308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint3319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint3331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_enum_constraint3366 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_enum_constraint3372 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_enum_constraint3376 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate3418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk3467 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_set_in_paren_chunk3483 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk3507 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk3544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk3595 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_set_in_curly_chunk3611 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3635 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk3672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk3735 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_set_in_square_chunk3751 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_square_chunk_in_square_chunk3775 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk3812 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3857 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3885 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_or3893 = new BitSet(new long[]{0x03000A2040000000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3909 = new BitSet(new long[]{0x000000C000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3945 = new BitSet(new long[]{0x0040010000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_and3953 = new BitSet(new long[]{0x03000A2040000000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3969 = new BitSet(new long[]{0x0040010000000002L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary4006 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary4014 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary4022 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_unary4030 = new BitSet(new long[]{0x0080000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_FROM_in_lhs_unary4046 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary4101 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_collect_statement_in_lhs_unary4130 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_from_statement_in_lhs_unary4165 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary4204 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary4212 = new BitSet(new long[]{0x03000A2040000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary4216 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary4218 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
-    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary4228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_lhs_exist4252 = new BitSet(new long[]{0x0000002040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist4272 = new BitSet(new long[]{0x03000A2040000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist4276 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist4308 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist4358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_lhs_not4412 = new BitSet(new long[]{0x0000002040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not4425 = new BitSet(new long[]{0x03000A2040000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not4429 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not4462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not4499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_lhs_eval4547 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval4558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_lhs_forall4587 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall4589 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall4593 = new BitSet(new long[]{0x0000002080000000L});
-    public static final BitSet FOLLOW_COMMA_in_lhs_forall4607 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall4613 = new BitSet(new long[]{0x0000002880000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall4628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_dotted_name4659 = new BitSet(new long[]{0x0010000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_71_in_dotted_name4671 = new BitSet(new long[]{0x07C2FE77240A3FF0L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4675 = new BitSet(new long[]{0x0010000000000002L,0x0000000000000080L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4697 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4701 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_identifier_in_argument4740 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument4746 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument4748 = new BitSet(new long[]{0x0010000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk4792 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_set_in_rhs_chunk4808 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
-    public static final BitSet FOLLOW_END_in_rhs_chunk4845 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_name4889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_name4908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_identifier4946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_identifier4959 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_identifier4966 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_identifier4973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_identifier4980 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_identifier4989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_identifier4996 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_identifier5017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_identifier5045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_identifier5071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_identifier5100 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_identifier5122 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_identifier5144 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_identifier5173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INIT_in_identifier5195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTION_in_identifier5224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RESULT_in_identifier5253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_identifier5282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OR_in_identifier5311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AND_in_identifier5340 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_CONTAINS_in_identifier5369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXCLUDES_in_identifier5391 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MEMBEROF_in_identifier5413 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MATCHES_in_identifier5433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_identifier5462 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_identifier5491 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_identifier5520 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_identifier5549 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_identifier5578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHEN_in_identifier5616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_identifier5648 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_END_in_identifier5677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_identifier5696 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QUERY_in_query639 = new BitSet(new long[]{0x0000000000040800L});
+    public static final BitSet FOLLOW_name_in_query643 = new BitSet(new long[]{0x03000A0000002C00L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_query656 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_ID_in_query680 = new BitSet(new long[]{0x0000000200001000L});
+    public static final BitSet FOLLOW_COMMA_in_query693 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_ID_in_query697 = new BitSet(new long[]{0x0000000200001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_query734 = new BitSet(new long[]{0x03000A0000002C00L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query751 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_END_in_query768 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TEMPLATE_in_template798 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_template802 = new BitSet(new long[]{0x0000000000000800L,0x0000000000000020L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template804 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_template_slot_in_template819 = new BitSet(new long[]{0x0000000000002800L});
+    public static final BitSet FOLLOW_END_in_template836 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template838 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dotted_name_in_template_slot884 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_template_slot902 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template_slot904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_in_rule937 = new BitSet(new long[]{0x0000000000040800L});
+    public static final BitSet FOLLOW_name_in_rule941 = new BitSet(new long[]{0x04000002FF5B0010L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule950 = new BitSet(new long[]{0x0400000000010000L});
+    public static final BitSet FOLLOW_WHEN_in_rule959 = new BitSet(new long[]{0x07000A0000000C00L,0x0000000000000040L});
+    public static final BitSet FOLLOW_70_in_rule961 = new BitSet(new long[]{0x07000A0000000C00L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_rule979 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_in_rule1000 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes1021 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_70_in_rule_attributes1023 = new BitSet(new long[]{0x00000002FF5A0002L});
+    public static final BitSet FOLLOW_COMMA_in_rule_attributes1032 = new BitSet(new long[]{0x00000000FF5A0000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1037 = new BitSet(new long[]{0x00000002FF5A0002L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1088 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1099 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1148 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1158 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1168 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1178 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1188 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_in_rule_attribute1197 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1229 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_date_effective1233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1266 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_date_expires1270 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENABLED_in_enabled1305 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SALIENCE_in_salience1354 = new BitSet(new long[]{0x0000000000800400L});
+    public static final BitSet FOLLOW_INT_in_salience1367 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1382 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1422 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1450 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1454 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1531 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1535 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1580 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1584 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1616 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1620 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1652 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1656 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DURATION_in_duration1690 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_INT_in_duration1694 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DIALECT_in_dialect1726 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_STRING_in_dialect1730 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1779 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1807 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active1811 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1849 = new BitSet(new long[]{0x03000A0000000C02L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs1886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern1914 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern1923 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_from_statement1950 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_from_source1992 = new BitSet(new long[]{0x0000000000000402L,0x0000000000000080L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source2003 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source2017 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_71_in_expression_chain2046 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_expression_chain2050 = new BitSet(new long[]{0x0010000000000402L,0x0000000000000080L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain2081 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain2115 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain2136 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2177 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2187 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_pattern_in_accumulate_statement2191 = new BitSet(new long[]{0x0000000600000000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2193 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_statement2203 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2214 = new BitSet(new long[]{0x0000000A00000000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2217 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_ACTION_in_accumulate_statement2226 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2230 = new BitSet(new long[]{0x0000001200000000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2233 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2242 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2246 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2258 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement2301 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement2311 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_pattern_in_collect_statement2315 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement2319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_fact_binding2353 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_70_in_fact_binding2355 = new BitSet(new long[]{0x0000000000000C00L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_binding2368 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_expression2400 = new BitSet(new long[]{0x0000000000000C00L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2404 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_expression2407 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_fact_expression2418 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_set_in_fact_expression2430 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_fact_in_fact_expression2448 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_dotted_name_in_fact2509 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact2523 = new BitSet(new long[]{0x07C2FE7D2051FFF0L});
+    public static final BitSet FOLLOW_constraints_in_fact2533 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact2546 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints2566 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_COMMA_in_constraints2573 = new BitSet(new long[]{0x07C2FE7D2051EFF0L});
+    public static final BitSet FOLLOW_constraint_in_constraints2582 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_or_constr_in_constraint2615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr2638 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr2648 = new BitSet(new long[]{0x07C2FE7D2051EFF0L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr2658 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr2690 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr2700 = new BitSet(new long[]{0x07C2FE7D2051EFF0L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr2710 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr2738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr2746 = new BitSet(new long[]{0x07C2FE7D2051EFF0L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr2748 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr2751 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_unary_constr2757 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_predicate_in_unary_constr2759 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_field_constraint2791 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000040L});
+    public static final BitSet FOLLOW_70_in_field_constraint2793 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_field_constraint2814 = new BitSet(new long[]{0x0000FC0000000402L,0x000000000000FE00L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint2828 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_73_in_field_constraint2843 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_predicate_in_field_constraint2845 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective2874 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective2884 = new BitSet(new long[]{0x0000FC0000000400L,0x000000000000FC00L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective2896 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective2930 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective2940 = new BitSet(new long[]{0x0000FC0000000400L,0x000000000000FC00L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective2950 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression2985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression2992 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression2999 = new BitSet(new long[]{0x0000FC0000000400L,0x000000000000FC00L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression3008 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression3014 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_in_simple_operator3045 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_75_in_simple_operator3053 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_76_in_simple_operator3061 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_77_in_simple_operator3069 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_78_in_simple_operator3077 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_79_in_simple_operator3085 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator3093 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator3101 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator3105 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator3113 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator3121 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator3129 = new BitSet(new long[]{0x0000200000000000L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator3133 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator3141 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator3149 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator3153 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator3167 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_in_compound_operator3196 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_NOT_in_compound_operator3208 = new BitSet(new long[]{0x0000800000000000L});
+    public static final BitSet FOLLOW_IN_in_compound_operator3210 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator3225 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator3229 = new BitSet(new long[]{0x0000000200001000L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator3241 = new BitSet(new long[]{0x0003000000A40C00L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator3245 = new BitSet(new long[]{0x0000000200001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator3261 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_expression_value3289 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enum_constraint_in_expression_value3302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value3322 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_retval_constraint_in_expression_value3336 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint3379 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint3390 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint3403 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint3414 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint3426 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_enum_constraint3461 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
+    public static final BitSet FOLLOW_71_in_enum_constraint3467 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_enum_constraint3471 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_paren_chunk_in_predicate3513 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk3562 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_set_in_paren_chunk3578 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk3602 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk3639 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk3690 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_set_in_curly_chunk3706 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3730 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk3767 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk3830 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_set_in_square_chunk3846 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_square_chunk_in_square_chunk3870 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk3907 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint3952 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or3980 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_or3988 = new BitSet(new long[]{0x03000A0000000C00L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or4004 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and4040 = new BitSet(new long[]{0x0040010000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_and4048 = new BitSet(new long[]{0x03000A0000000C00L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and4064 = new BitSet(new long[]{0x0040010000000002L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary4101 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary4109 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary4117 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_unary4125 = new BitSet(new long[]{0x0080000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_FROM_in_lhs_unary4141 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_accumulate_statement_in_lhs_unary4196 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_collect_statement_in_lhs_unary4225 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_from_statement_in_lhs_unary4260 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary4299 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary4307 = new BitSet(new long[]{0x03000A0000000C00L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary4311 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary4313 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000020L});
+    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary4323 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_lhs_exist4347 = new BitSet(new long[]{0x0000000000000C00L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist4367 = new BitSet(new long[]{0x03000A0000000C00L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist4371 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist4403 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist4453 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_lhs_not4507 = new BitSet(new long[]{0x0000000000000C00L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not4520 = new BitSet(new long[]{0x03000A0000000C00L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not4524 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not4557 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not4594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_lhs_eval4642 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval4653 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_lhs_forall4682 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall4684 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall4688 = new BitSet(new long[]{0x0000000200000800L});
+    public static final BitSet FOLLOW_COMMA_in_lhs_forall4702 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall4708 = new BitSet(new long[]{0x0000000200001800L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall4723 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_dotted_name4754 = new BitSet(new long[]{0x0010000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_71_in_dotted_name4766 = new BitSet(new long[]{0x07C2FE7D2051EBF0L});
+    public static final BitSet FOLLOW_identifier_in_dotted_name4770 = new BitSet(new long[]{0x0010000000000002L,0x0000000000000080L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4792 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4796 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_identifier_in_argument4835 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument4841 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument4843 = new BitSet(new long[]{0x0010000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk4887 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_set_in_rhs_chunk4903 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000FFFFL});
+    public static final BitSet FOLLOW_END_in_rhs_chunk4940 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_name4984 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_name5003 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_identifier5041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PACKAGE_in_identifier5054 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FUNCTION_in_identifier5061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_GLOBAL_in_identifier5068 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IMPORT_in_identifier5075 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_in_identifier5084 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QUERY_in_identifier5091 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TEMPLATE_in_identifier5112 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ATTRIBUTES_in_identifier5140 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENABLED_in_identifier5166 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SALIENCE_in_identifier5195 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DURATION_in_identifier5217 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_identifier5239 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_identifier5268 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INIT_in_identifier5290 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACTION_in_identifier5319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RESULT_in_identifier5348 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_identifier5377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OR_in_identifier5406 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AND_in_identifier5435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_CONTAINS_in_identifier5464 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXCLUDES_in_identifier5486 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_MEMBEROF_in_identifier5508 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_MATCHES_in_identifier5528 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_identifier5557 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_identifier5586 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_identifier5615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_identifier5644 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_identifier5673 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_WHEN_in_identifier5711 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_THEN_in_identifier5743 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_END_in_identifier5772 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_in_identifier5791 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_function_import_statement_in_synpred7156 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_import_statement_in_synpred8162 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_synpred431908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred451978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred462012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred532335 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_fact_in_synpred532353 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_synpred582643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred632789 = new BitSet(new long[]{0x0000FC0040000000L,0x000000000000FC00L});
-    public static final BitSet FOLLOW_and_restr_connective_in_synpred632801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred642845 = new BitSet(new long[]{0x0000FC0040000000L,0x000000000000FC00L});
-    public static final BitSet FOLLOW_constraint_expression_in_synpred642855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_synpred1054092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_synpred1064121 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_synpred1084151 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_synpred462003 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred482073 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred492107 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_set_in_synpred562430 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_fact_in_synpred562448 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_synpred612738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred662884 = new BitSet(new long[]{0x0000FC0000000400L,0x000000000000FC00L});
+    public static final BitSet FOLLOW_and_restr_connective_in_synpred662896 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred672940 = new BitSet(new long[]{0x0000FC0000000400L,0x000000000000FC00L});
+    public static final BitSet FOLLOW_constraint_expression_in_synpred672950 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_synpred1084187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_synpred1094216 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_set_in_synpred1114246 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL__.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL__.g	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRL__.g	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1,294 +0,0 @@
-lexer grammar DRL;
- at header {
-	package org.drools.lang;
-}
-
-T69 : ';' ;
-T70 : ':' ;
-T71 : '.' ;
-T72 : '.*' ;
-T73 : '->' ;
-T74 : '==' ;
-T75 : '>' ;
-T76 : '>=' ;
-T77 : '<' ;
-T78 : '<=' ;
-T79 : '!=' ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1748
-WS      :       (	' '
-                |	'\t'
-                |	'\f'
-                |	EOL
-                )
-                { $channel=HIDDEN; }
-        ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1756
-fragment
-EOL 	:	     
-   		(       ( '\r\n' )=> '\r\n'  // Evil DOS
-                |       '\r'    // Macintosh
-                |       '\n'    // Unix (the right way)
-                )
-        ;  
-        
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1764
-INT	
-	:	('-')?('0'..'9')+
-		;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1768
-FLOAT
-	:	('-')?('0'..'9')+ '.' ('0'..'9')+
-	;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1772
-STRING
-    :  ('"' ( EscapeSequence | ~('\\'|'"') )* '"')
-     | ('\'' ( EscapeSequence | ~('\\'|'\'') )* '\'')
-    ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1777
-fragment
-HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1780
-fragment
-EscapeSequence
-    :   '\\' ('b'|'B'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\'|'.'|'o'|
-              'x'|'a'|'e'|'c'|'d'|'D'|'s'|'S'|'w'|'W'|'p'|'A'|
-              'G'|'Z'|'z'|'Q'|'E'|'*'|'['|']'|'('|')'|'$'|'^'|
-              '{'|'}'|'?'|'+'|'-'|'&'|'|')
-    |   UnicodeEscape
-    |   OctalEscape
-    ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1790
-fragment
-OctalEscape
-    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7')
-    ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1797
-fragment
-UnicodeEscape
-    :   '\\' 'u' HexDigit HexDigit HexDigit HexDigit
-    ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1802
-BOOL
-	:	('true'|'false') 
-	;	
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1806
-PACKAGE	:	'package';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1808
-IMPORT	:	'import';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1810
-FUNCTION :	'function';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1812
-GLOBAL	:	'global';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1814
-RULE    :	'rule';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1816
-QUERY	:	'query';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1818
-TEMPLATE :	'template';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1820
-ATTRIBUTES :	'attributes';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1822
-DATE_EFFECTIVE 
-	:	'date-effective';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1825
-DATE_EXPIRES 
-	:	'date-expires';	
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1828
-ENABLED :	'enabled';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1830
-SALIENCE 
-	:	'salience';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1833
-NO_LOOP :	'no-loop';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1835
-AUTO_FOCUS 
-	:	'auto-focus';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1838
-ACTIVATION_GROUP 
-	:	'activation-group';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1841
-AGENDA_GROUP 
-	:	'agenda-group';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1844
-DIALECT 
-	:	'dialect';	
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1847
-RULEFLOW_GROUP 
-	:	'ruleflow-group';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1850
-DURATION 
-	:	'duration';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1853
-LOCK_ON_ACTIVE
-	:	'lock-on-active';	
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1856
-FROM	:	'from';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1858
-ACCUMULATE 
-	:	'accumulate';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1861
-INIT	:	'init';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1863
-ACTION	:	'action';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1865
-RESULT	:	'result';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1867
-COLLECT :	'collect';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1869
-OR	:	'or';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1871
-AND	:	'and';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1873
-CONTAINS 
-	:	'contains';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1876
-EXCLUDES 
-	:	'excludes';
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1879
-MEMBEROF
-	:	'memberOf';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1882
-MATCHES :	'matches';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1884
-IN	:	'in';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1886
-NULL	:	'null';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1888
-EXISTS	:	'exists';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1890
-NOT	:	'not';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1892
-EVAL	:	'eval';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1894
-FORALL	:	'forall';							
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1896
-WHEN    :	'when'; 
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1898
-THEN	:    	'then';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1900
-END     :	'end';
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1902
-ID	
-	:	('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')* 
-	;
-		
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1906
-LEFT_PAREN
-        :	'('
-        ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1910
-RIGHT_PAREN
-        :	')'
-        ;
-        
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1914
-LEFT_SQUARE
-        :	'['
-        ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1918
-RIGHT_SQUARE
-        :	']'
-        ;        
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1922
-LEFT_CURLY
-        :	'{'
-        ;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1926
-RIGHT_CURLY
-        :	'}'
-        ;
-        
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1930
-COMMA	:	','
-	;
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1933
-DOUBLE_AMPER
-	:	'&&'
-	;
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1937
-DOUBLE_PIPE
-	:	'||'
-	;				
-	
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1941
-SH_STYLE_SINGLE_LINE_COMMENT	
-	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
-                { $channel=HIDDEN; }
-	;
-        
-        
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1947
-C_STYLE_SINGLE_LINE_COMMENT	
-	:	'//' ( options{greedy=false;} : .)* EOL // ('\r')? '\n' 
-                { $channel=HIDDEN; }
-	;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1952
-MULTI_LINE_COMMENT
-	:	'/*' (options{greedy=false;} : .)* '*/'
-                { $channel=HIDDEN; }
-	;
-
-// $ANTLR src "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g" 1957
-MISC 	:
-		'!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+'  | '?' | '=' | '/' | '\'' | '\\' | '|' | '&'
-	;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/AndDescr.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -26,7 +26,7 @@
     /**
      * 
      */
-    private static final long serialVersionUID = 8225023304408452585L;
+    private static final long serialVersionUID = 400L;
     private List              descrs           = new ArrayList();
 
     public AndDescr() {
@@ -35,6 +35,10 @@
     public void addDescr(final BaseDescr baseDescr) {
         this.descrs.add( baseDescr );
     }
+    
+    public void insertDescr(int index, final BaseDescr baseDescr) {
+        this.descrs.add( index, baseDescr );
+    }
 
     public List getDescrs() {
         return this.descrs;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/QueryDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/QueryDescr.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/QueryDescr.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -17,19 +17,46 @@
  */
 
 public class QueryDescr extends RuleDescr {
+    private String[] params;
+    
+    private static final String[] EMPTY_PARAMS = new String[0];
     /**
      * 
      */
-    private static final long serialVersionUID = -7193800196930051812L;
+    private static final long serialVersionUID = 400L;
 
     public QueryDescr(final String name) {
         this( name,
               "" );
+        this.params = EMPTY_PARAMS;        
     }
+    
+    public QueryDescr(final String name, final String[] params) {
+        this( name,
+              "" );
+        this.params = params;        
+    }    
 
     public QueryDescr(final String ruleName,
                       final String documentation) {
         super( ruleName,
                documentation );
+        this.params = EMPTY_PARAMS;         
     }
+    
+    public QueryDescr(final String ruleName,
+                      final String documentation, 
+                      final String[] params) {
+        super( ruleName,
+               documentation );
+        this.params = params;         
+    }
+    
+    public void setParameters(String[] params) {
+        this.params = params;
+    }
+    
+    public String[] getParameters() {
+        return this.params;
+    }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/CollectBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -31,11 +31,14 @@
     implements
     ConditionalElementBuilder {
 
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
     public ConditionalElement build(final RuleBuildContext context,
                                     final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
 
         final CollectDescr collectDescr = (CollectDescr) descr;
         final PatternBuilder patternBuilder = (PatternBuilder) context.getDialect().getBuilder( PatternDescr.class );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ConditionalElementBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -18,6 +18,7 @@
 
 import org.drools.lang.descr.BaseDescr;
 import org.drools.rule.ConditionalElement;
+import org.drools.rule.Pattern;
 
 /**
  * An interface to define classes capable of building
@@ -28,6 +29,10 @@
 public interface ConditionalElementBuilder {
 
     public ConditionalElement build(final RuleBuildContext context,
-                                    final BaseDescr descr);
+                                    final BaseDescr descr);    
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern);
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/Dialect.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -23,6 +23,8 @@
     
     PatternBuilder getPatternBuilder();    
     
+    QueryBuilder getQueryBuilder();
+    
     ConditionalElementBuilder getEvalBuilder();
 
     AccumulateBuilder getAccumulateBuilder();

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ForallBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -33,11 +33,14 @@
     implements
     ConditionalElementBuilder {
 
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
     public ConditionalElement build(final RuleBuildContext context,
                                     final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
         final ForallDescr forallDescr = (ForallDescr) descr;
 
         final PatternBuilder patternBuilder = (PatternBuilder) context.getDialect().getBuilder( PatternDescr.class );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/GroupElementBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -26,6 +26,7 @@
 import org.drools.lang.descr.ExistsDescr;
 import org.drools.lang.descr.NotDescr;
 import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.QueryDescr;
 import org.drools.rule.Pattern;
 import org.drools.rule.ConditionalElement;
 import org.drools.rule.GroupElement;
@@ -38,16 +39,23 @@
 public class GroupElementBuilder
     implements
     ConditionalElementBuilder {
-
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
+    
     public ConditionalElement build(final RuleBuildContext context,
                                     final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
         final ConditionalElementDescr cedescr = (ConditionalElementDescr) descr;
 
-        final GroupElement ge = this.newGroupElementFor( cedescr.getClass() );
-        context.getBuildStack().push( ge );
+        final GroupElement ge = newGroupElementFor( cedescr.getClass() );
+        context.getBuildStack().push( ge );        
+        
+        if ( prefixPattern != null ) {
+            ge.addChild( prefixPattern );
+        }
 
         // iterate over child descriptors
         for ( final Iterator it = cedescr.getDescrs().iterator(); it.hasNext(); ) {

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -0,0 +1,61 @@
+package org.drools.rule.builder;
+
+import org.drools.RuntimeDroolsException;
+import org.drools.base.ClassFieldExtractor;
+import org.drools.base.ClassObjectType;
+import org.drools.base.DroolsQuery;
+import org.drools.base.FieldFactory;
+import org.drools.base.ValueType;
+import org.drools.base.evaluators.Operator;
+import org.drools.base.extractors.ArrayExtractor;
+import org.drools.compiler.RuleError;
+import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.QueryDescr;
+import org.drools.rule.LiteralConstraint;
+import org.drools.rule.Pattern;
+import org.drools.spi.Extractor;
+import org.drools.spi.FieldExtractor;
+import org.drools.spi.FieldValue;
+import org.drools.spi.ObjectType;
+
+public class QueryBuilder {
+    public Pattern build(final RuleBuildContext context,
+                         final QueryDescr queryDescr) {   
+        ObjectType objectType = new ClassObjectType( DroolsQuery.class );
+        final Pattern  pattern = new Pattern( context.getNextPatternId(),
+                               0, // offset is 0 by default
+                               objectType,
+                               null );        
+        
+        final ClassFieldExtractor extractor = new ClassFieldExtractor( DroolsQuery.class,
+                                                                       "name" );
+
+        final FieldValue field = FieldFactory.getFieldValue( queryDescr.getName(),
+                                                             ValueType.STRING_TYPE );
+
+        final LiteralConstraint constraint = new LiteralConstraint( extractor,
+                                                                    ValueType.STRING_TYPE.getEvaluator( Operator.EQUAL ),
+                                                                    field );
+        // adds appropriate constraint to the pattern
+        pattern.addConstraint( constraint );
+        
+        Extractor arrayExtractor = null;
+        try {
+            ClassLoader classloader = context.getPkg().getPackageCompilationData().getClassLoader();
+            arrayExtractor = context.getDialect().getClassFieldExtractorCache().getExtractor( ((ClassObjectType) objectType).getClassType(),
+                                                                                         "arguments",
+                                                                                         classloader );
+        } catch ( final RuntimeDroolsException e ) {
+                context.getErrors().add( new RuleError( context.getRule(),
+                                                        queryDescr,
+                                                        e,
+                                                        "Unable to create Field Extractor for 'getArguments'" ) );
+        }
+        
+        String[] params = queryDescr.getParameters();
+        for ( int i = 0; i < params.length; i++ ) {            
+            pattern.addDeclaration( params[i], new ArrayExtractor(arrayExtractor, i) );
+        }
+        return pattern;
+    }
+}

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -21,6 +21,7 @@
 import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.GroupElement;
+import org.drools.rule.Pattern;
 import org.drools.spi.Salience;
 
 /**
@@ -45,8 +46,14 @@
 
         final ConditionalElementBuilder builder = (ConditionalElementBuilder) context.getDialect().getBuilder( ruleDescr.getLhs().getClass() );
         if ( builder != null ) {
+            Pattern prefixPattern = null;
+            if ( context.getRuleDescr() instanceof QueryDescr ) {
+                prefixPattern = context.getDialect().getQueryBuilder().build( context, ( QueryDescr ) context.getRuleDescr() );
+            }
             final GroupElement ce = (GroupElement) builder.build( context,
-                                                                  ruleDescr.getLhs() );
+                                                                  ruleDescr.getLhs(),
+                                                                  prefixPattern );
+            
             context.getRule().setLhs( ce );
         } else {
             throw new RuntimeDroolsException( "BUG: builder not found for descriptor class " + ruleDescr.getLhs().getClass() );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -42,14 +42,14 @@
     ConditionalElementBuilder,
     AccumulateBuilder {
 
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.builder.ConditionalElementBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
-    /* (non-Javadoc)
-     * @see org.drools.semantics.java.builder.AccumulateBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
     public ConditionalElement build(final RuleBuildContext context,
                                     final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
 
         final AccumulateDescr accumDescr = (AccumulateDescr) descr;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -38,6 +38,7 @@
 import org.drools.lang.descr.NotDescr;
 import org.drools.lang.descr.OrDescr;
 import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
@@ -53,6 +54,7 @@
 import org.drools.rule.builder.GroupElementBuilder;
 import org.drools.rule.builder.PatternBuilder;
 import org.drools.rule.builder.PredicateBuilder;
+import org.drools.rule.builder.QueryBuilder;
 import org.drools.rule.builder.ReturnValueBuilder;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.RuleClassBuilder;
@@ -68,6 +70,7 @@
 
     // builders
     private final PatternBuilder           pattern      = new PatternBuilder( this );
+    private final QueryBuilder             query        = new QueryBuilder();
     private final SalienceBuilder          salience     = new MVELSalienceBuilder();
     private final JavaAccumulateBuilder    accumulate   = new JavaAccumulateBuilder();
     private final JavaEvalBuilder          eval         = new JavaEvalBuilder();
@@ -76,7 +79,7 @@
     private final JavaConsequenceBuilder   consequence  = new JavaConsequenceBuilder();
     private final JavaRuleClassBuilder     rule         = new JavaRuleClassBuilder();
     private final MVELFromBuilder          from         = new MVELFromBuilder();
-    private final JavaFunctionBuilder      function     = new JavaFunctionBuilder();
+    private final JavaFunctionBuilder      function     = new JavaFunctionBuilder();    
 
     // 
     private final KnowledgeHelperFixer     knowledgeHelperFixer;
@@ -149,6 +152,9 @@
 
         this.builders.put( PatternDescr.class,
                            getPatternBuilder() );
+        
+        this.builders.put( QueryDescr.class,
+                           getQueryBuilder() );
 
         this.builders.put( FromDescr.class,
                            getFromBuilder() );
@@ -267,6 +273,10 @@
         return this.pattern;
     }
     
+    public QueryBuilder getQueryBuilder() {
+        return this.query;
+    }
+    
     public SalienceBuilder getSalienceBuilder() {
         return this.salience;
     }    

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -24,6 +24,7 @@
 import org.drools.rule.ConditionalElement;
 import org.drools.rule.Declaration;
 import org.drools.rule.EvalCondition;
+import org.drools.rule.Pattern;
 import org.drools.rule.builder.ConditionalElementBuilder;
 import org.drools.rule.builder.RuleBuildContext;
 
@@ -35,6 +36,11 @@
     implements
     ConditionalElementBuilder {
 
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
     /**
      * Builds and returns an Eval Conditional Element
      * 
@@ -44,9 +50,10 @@
      * @param descr The Eval Descriptor to build the eval conditional element from
      * 
      * @return the Eval Conditional Element
-     */
+     */    
     public ConditionalElement build(final RuleBuildContext context,
-                                    final BaseDescr descr) {
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
         // it must be an EvalDescr
         final EvalDescr evalDescr = (EvalDescr) descr;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -26,6 +26,7 @@
 import org.drools.lang.descr.NotDescr;
 import org.drools.lang.descr.OrDescr;
 import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.Package;
 import org.drools.rule.builder.AccumulateBuilder;
@@ -38,6 +39,7 @@
 import org.drools.rule.builder.GroupElementBuilder;
 import org.drools.rule.builder.PatternBuilder;
 import org.drools.rule.builder.PredicateBuilder;
+import org.drools.rule.builder.QueryBuilder;
 import org.drools.rule.builder.ReturnValueBuilder;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.RuleClassBuilder;
@@ -60,6 +62,7 @@
     Dialect {
 
     private final PatternBuilder                    pattern     = new PatternBuilder( this );
+    private final QueryBuilder             query        = new QueryBuilder();    
     //private final JavaAccumulateBuilder           accumulate  = new JavaAccumulateBuilder();
     private final SalienceBuilder                   salience    = new MVELSalienceBuilder();
     private final MVELEvalBuilder                   eval        = new MVELEvalBuilder();
@@ -136,6 +139,9 @@
 
         this.builders.put( FromDescr.class,
                            getFromBuilder() );
+        
+        this.builders.put( QueryDescr.class,
+                           getQueryBuilder() );        
 
         //        this.builders.put( AccumulateDescr.class,
         //                           getAccumulateBuilder() );
@@ -250,6 +256,10 @@
     public PatternBuilder getPatternBuilder() {
         return this.pattern;
     }
+    
+    public QueryBuilder getQueryBuilder() {
+        return this.query;
+    }    
 
     public AccumulateBuilder getAccumulateBuilder() {
         throw new UnsupportedOperationException( "MVEL does not yet support accumuate" );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -28,6 +28,7 @@
 import org.drools.rule.ConditionalElement;
 import org.drools.rule.Declaration;
 import org.drools.rule.EvalCondition;
+import org.drools.rule.Pattern;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.PatternBuilder;
 import org.drools.rule.builder.ConditionalElementBuilder;
@@ -42,6 +43,11 @@
     implements
     ConditionalElementBuilder {
 
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr) {
+        return build(context, descr, null);
+    }    
+    
     /**
      * Builds and returns an Eval Conditional Element
      * 
@@ -53,7 +59,8 @@
      * @return the Eval Conditional Element
      */
     public ConditionalElement build(final RuleBuildContext context,
-                                    final BaseDescr descr) {
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
         // it must be an EvalDescr
         final EvalDescr evalDescr = (EvalDescr) descr;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -46,11 +46,14 @@
     ConditionalElementBuilder,
     FromBuilder {
 
-    /* (non-Javadoc)
-     * @see org.drools.dialect.mvel.FromBuilder#build(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.semantics.java.builder.PatternBuilder, org.drools.lang.descr.BaseDescr)
-     */
     public ConditionalElement build(final RuleBuildContext context,
                                     final BaseDescr descr) {
+        return build(context, descr, null);
+    }
+    
+    public ConditionalElement build(final RuleBuildContext context,
+                                    final BaseDescr descr,
+                                    final Pattern prefixPattern) {
         final FromDescr fromDescr = (FromDescr) descr;
 
         final PatternBuilder patternBuilder = (PatternBuilder) context.getDialect().getBuilder( PatternDescr.class );

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-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1,1959 +1,1972 @@
-grammar DRL; 
-options {backtrack=true;}
-
- at parser::header {
-	package org.drools.lang;
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-	import org.drools.compiler.SwitchingCommonTokenStream;
-}
-
- at parser::members {
-	private PackageDescr packageDescr;
-	private List errors = new ArrayList();
-	private String source = "unknown";
-	private int lineOffset = 0;
-	private DescrFactory factory = new DescrFactory();
-	private boolean parserDebug = false;
-	private Location location = new Location( Location.LOCATION_UNKNOWN );
-	
-	// THE FOLLOWING LINES ARE DUMMY ATTRIBUTES TO WORK AROUND AN ANTLR BUG
-	private BaseDescr from = null;
-	private FieldConstraintDescr fc = null;
-	private RestrictionConnectiveDescr and = null;
-	private RestrictionConnectiveDescr or = null;
-	private ConditionalElementDescr base = null;
-	
-	public void setParserDebug(boolean parserDebug) {
-		this.parserDebug = parserDebug;
-	}
-	
-	public void debug(String message) {
-		if ( parserDebug ) 
-			System.err.println( "drl parser: " + message );
-	}
-	
-	public void setSource(String source) {
-		this.source = source;
-	}
-	public DescrFactory getFactory() {
-		return factory;
-	}	
-
-	public String getSource() {
-		return this.source;
-	}
-	
-	public PackageDescr getPackageDescr() {
-		return packageDescr;
-	}
-	
-	private int offset(int line) {
-		return line + lineOffset;
-	}
-	
-	/**
-	 * This will set the offset to record when reparsing. Normally is zero of course 
-	 */
-	public void setLineOffset(int i) {
-	 	this.lineOffset = i;
-	}
-	
-	private String getString(Token token) {
-		String orig = token.getText();
-		return orig.substring( 1, orig.length() -1 );
-	}
-	
-	public void reportError(RecognitionException ex) {
-	        // if we've already reported an error and have not matched a token
-                // yet successfully, don't report any errors.
-                if ( errorRecovery ) {
-                        return;
-                }
-                errorRecovery = true;
-
-		ex.line = offset(ex.line); //add the offset if there is one
-		errors.add( ex ); 
-	}
-     	
-     	/** return the raw RecognitionException errors */
-     	public List getErrors() {
-     		return errors;
-     	}
-     	
-     	/** Return a list of pretty strings summarising the errors */
-     	public List getErrorMessages() {
-     		List messages = new ArrayList();
- 		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-     	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-     	     	}
-     	     	return messages;
-     	}
-     	
-     	/** return true if any parser errors were accumulated */
-     	public boolean hasErrors() {
-  		return ! errors.isEmpty();
-     	}
-     	
-     	/** This will take a RecognitionException, and create a sensible error message out of it */
-     	public String createErrorMessage(RecognitionException e)
-        {
-		StringBuffer message = new StringBuffer();		
-                message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                if ( e instanceof MismatchedTokenException ) {
-                        MismatchedTokenException mte = (MismatchedTokenException)e;
-                        message.append("mismatched token: "+
-                                                           e.token+
-                                                           "; expecting type "+
-                                                           tokenNames[mte.expecting]);
-                }
-                else if ( e instanceof MismatchedTreeNodeException ) {
-                        MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                        message.append("mismatched tree node: "+
-                                                           mtne.toString() +
-                                                           "; expecting type "+
-                                                           tokenNames[mtne.expecting]);
-                }
-                else if ( e instanceof NoViableAltException ) {
-                        NoViableAltException nvae = (NoViableAltException)e;
-			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                        /*
-                        message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                           " state "+nvae.stateNumber+
-                                                           " (decision="+nvae.decisionNumber+
-                                                           ") no viable alt; token="+
-                                                           e.token);
-                                                           */
-                }
-                else if ( e instanceof EarlyExitException ) {
-                        EarlyExitException eee = (EarlyExitException)e;
-                        message.append("required (...)+ loop (decision="+
-                                                           eee.decisionNumber+
-                                                           ") did not match anything; token="+
-                                                           e.token);
-                }
-                else if ( e instanceof MismatchedSetException ) {
-                        MismatchedSetException mse = (MismatchedSetException)e;
-                        message.append("mismatched token '"+
-                                                           e.token+
-                                                           "' expecting set "+mse.expecting);
-                }
-                else if ( e instanceof MismatchedNotSetException ) {
-                        MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                        message.append("mismatched token '"+
-                                                           e.token+
-                                                           "' expecting set "+mse.expecting);
-                }
-                else if ( e instanceof FailedPredicateException ) {
-                        FailedPredicateException fpe = (FailedPredicateException)e;
-                        message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                           fpe.predicateText+"}?");
-                } else if (e instanceof GeneralParseException) {
-			message.append(" " + e.getMessage());
-		}
-               	return message.toString();
-        }   
-        
-        void checkTrailingSemicolon(String text, int line) {
-        	if (text.trim().endsWith( ";" ) ) {
-        		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
-        	}
-        }
-        
-        public Location getLocation() {
-                return this.location;
-        }
-      
-}
-
- at lexer::header {
-	package org.drools.lang;
-}
-
-opt_semicolon
-	: ';'?
-	;
-
-compilation_unit
-	@init {
-		// reset Location information
-		this.location = new Location( Location.LOCATION_UNKNOWN );
-	}
-	:	prolog 
-		( statement )+
-	;
-	
-prolog
-	@init {
-		String packageName = "";
-	}
-	:	( n=package_statement { packageName = n; } )?
-		{ 
-			this.packageDescr = factory.createPackage( packageName ); 
-		}
-			(ATTRIBUTES ':')?
-			(	','? a=rule_attribute
-				{
-					this.packageDescr.addAttribute( a );
-				}
-			)*		
-	;
-	
-statement
-	:
-	(	function_import_statement 
-	|	import_statement 
-	|	global 
-	|	function 
-	|       t=template {this.packageDescr.addFactTemplate( t ); }
-	|	r=rule { if( r != null ) this.packageDescr.addRule( r ); }			
-	|	q=query	{ if( q != null ) this.packageDescr.addRule( q ); }
-	) 
-	;
-
-package_statement returns [String packageName]
-	@init{
-		packageName = null;
-	}
-	:	
-		PACKAGE n=dotted_name[null] opt_semicolon
-		{
-			packageName = n;
-		}
-	;
-	
-
-import_statement
-        @init {
-        	ImportDescr importDecl = null;
-        }
-	:	imp=IMPORT 
-	        {
-	            importDecl = factory.createImport( );
-	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-		    if (packageDescr != null) {
-			packageDescr.addImport( importDecl );
-		    }
-	        }
-	        import_name[importDecl] opt_semicolon
-	;
-
-function_import_statement
-        @init {
-        	FunctionImportDescr importDecl = null;
-        }
-	:	imp=IMPORT FUNCTION 
-	        {
-	            importDecl = factory.createFunctionImport();
-	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
-		    if (packageDescr != null) {
-			packageDescr.addFunctionImport( importDecl );
-		    }
-	        }
-	        import_name[importDecl] opt_semicolon
-	;
-
-
-import_name[ImportDescr importDecl] returns [String name]
-	@init {
-		name = null;
-	}
-	:	
-		id=identifier 
-		{ 
-		    name=id.getText(); 
-		    importDecl.setTarget( name );
-		    importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
-		} 
-		( '.' id=identifier 
-		    { 
-		        name = name + "." + id.getText(); 
-			importDecl.setTarget( name );
-		        importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
-		    } 
-		)* 
-		( star='.*' 
-		    { 
-		        name = name + star.getText(); 
-			importDecl.setTarget( name );
-		        importDecl.setEndCharacter( ((CommonToken)star).getStopIndex() );
-		    }
-		)?
-	;
-
-
-global
-	@init {
-	    GlobalDescr global = null;
-	}
-	:
-		loc=GLOBAL 
-		{
-		    global = factory.createGlobal();
-	            global.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		    packageDescr.addGlobal( global );
-		}
-		type=dotted_name[null] 
-		{
-		    global.setType( type );
-		}
-		id=identifier opt_semicolon
-		{
-		    global.setIdentifier( id.getText() );
-		    global.setEndCharacter( ((CommonToken)id).getStopIndex() );
-		}
-	;
-	
-
-function
-	@init {
-		FunctionDescr f = null;
-	}
-	:
-		loc=FUNCTION (retType=dotted_name[null])? n=identifier
-		{
-			//System.err.println( "function :: " + n.getText() );
-			f = factory.createFunction( n.getText(), retType );
-			f.setLocation(offset(loc.getLine()), loc.getCharPositionInLine());
-	        	f.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			packageDescr.addFunction( f );
-		} 
-		'('
-			(	(paramType=dotted_name[null])? paramName=argument
-				{
-					f.addParameter( paramType, paramName );
-				}
-				(	',' (paramType=dotted_name[null])? paramName=argument
-					{
-						f.addParameter( paramType, paramName );
-					}
-				)*
-			)?
-		')'
-		body=curly_chunk[f]
-		{
-			//strip out '{','}'
-			f.setText( body.substring( 1, body.length()-1 ) );
-		}
-	;
-
-
-
-query returns [QueryDescr query]
-	@init {
-		query = null;
-		AndDescr lhs = null;
-	}
-	:
-		loc=QUERY queryName=name
-		{ 
-			query = factory.createQuery( queryName ); 
-			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			query.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			lhs = new AndDescr(); query.setLhs( lhs ); 
-			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-		(
-			normal_lhs_block[lhs]
-		)
-					
-		loc=END
-		{
-			query.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		}
-	;
-
-
-template returns [FactTemplateDescr template]
-	@init {
-		template = null;		
-	}
-	:
-		loc=TEMPLATE templateName=identifier opt_semicolon
-		{
-			template = new FactTemplateDescr(templateName.getText());
-			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
-			template.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		}
-		(
-			slot=template_slot 
-			{
-				template.addFieldTemplate(slot);
-			}
-		)+
-		loc=END opt_semicolon 
-		{
-			template.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		}		
-	;
-	
-template_slot returns [FieldTemplateDescr field]
-	@init {
-		field = null;
-	}
-	:
-	         {
-			field = factory.createFieldTemplate();
-	         }
-		 fieldType=dotted_name[field] 
-		 {
-		        field.setClassType( fieldType );
-		 }
-		 
-		 n=identifier opt_semicolon
-		 {
-		        field.setName( n.getText() );
-			field.setLocation( offset(n.getLine()), n.getCharPositionInLine() );
-			field.setEndCharacter( ((CommonToken)n).getStopIndex() );
-		 } 
-	;	
-	
-rule returns [RuleDescr rule]
-	@init {
-		rule = null;
-		String consequence = "";
-		AndDescr lhs = null;
-	}
-	:
-		loc=RULE ruleName=name 
-		{ 
-			location.setType( Location.LOCATION_RULE_HEADER );
-			debug( "start rule: " + ruleName );
-			rule = new RuleDescr( ruleName, null ); 
-			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			rule.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		}
-		rule_attributes[rule]
-		(	loc=WHEN ':'?
-			{ 
-				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-				lhs = new AndDescr(); rule.setLhs( lhs ); 
-				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				lhs.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			}
-			(
-//				{ expander != null }? expander_lhs_block[lhs] |
-				normal_lhs_block[lhs]
-			)
-					
-		)?
-		rhs_chunk[rule]
-	;
-	
-
-
-rule_attributes[RuleDescr rule]
-	: 
-			(ATTRIBUTES ':')?
-			(	','? a=rule_attribute
-				{
-					rule.addAttribute( a );
-				}
-			)*
-	;
-
-
-	
-rule_attribute returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-			a=salience { d = a; }
-		|	a=no_loop  { d = a; }
-		|	a=agenda_group  { d = a; }		
-		|	a=duration  { d = a; }			
-		|	a=activation_group { d = a; }	
-		|	a=auto_focus { d = a; }	
-		|	a=date_effective {d = a; }
-		|	a=date_expires {d = a; }
-		|	a=enabled {d=a;}
-		|	a=ruleflow_group { d = a; }
-		|	a=lock_on_active{ d = a; }
-		|	a=dialect {d = a; }
-		
-	;
-	
-date_effective returns [AttributeDescr d]
-	@init {
-		d = null;
-	}	
-	:
-		loc=DATE_EFFECTIVE val=STRING  
-		{
-			d = new AttributeDescr( "date-effective", getString( val ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
-		}
-
-	;
-
-date_expires returns [AttributeDescr d]
-	@init {
-		d = null;
-	}	
-	:
-		loc=DATE_EXPIRES val=STRING  
-		{
-			d = new AttributeDescr( "date-expires", getString( val ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
-		}
-
-	;
-
-	
-enabled returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-			loc=ENABLED t=BOOL   
-			{
-				d = new AttributeDescr( "enabled", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-			}
-		
-		
-	;	
-	
-	
-
-salience returns [AttributeDescr d ]
-	@init {
-		d = null;
-	}
-	:	
-		loc=SALIENCE 
-		{
-			d = new AttributeDescr( "salience" );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		}
-		( i=INT   
-		{
-			d.setValue( i.getText() );
-			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
-		}
-		| txt=paren_chunk[d]
-		{
-			d.setValue( txt );
-		}
-		)
-	;
-	
-no_loop returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		(
-			loc=NO_LOOP   
-			{
-				d = new AttributeDescr( "no-loop", "true" );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-			}
-		) 
-		|
-		(
-			loc=NO_LOOP t=BOOL   
-			{
-				d = new AttributeDescr( "no-loop", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-			}
-		
-		)
-		
-	;
-	
-auto_focus returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		(
-			loc=AUTO_FOCUS   
-			{
-				d = new AttributeDescr( "auto-focus", "true" );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-			}
-		) 
-		|
-		(
-			loc=AUTO_FOCUS t=BOOL   
-			{
-				d = new AttributeDescr( "auto-focus", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-			}
-		
-		)
-		
-	;	
-	
-activation_group returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc=ACTIVATION_GROUP n=STRING   
-		{
-			d = new AttributeDescr( "activation-group", getString( n ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-		}
-	;
-
-ruleflow_group returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc=RULEFLOW_GROUP n=STRING   
-		{
-			d = new AttributeDescr( "ruleflow-group", getString( n ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-		}
-	;
-
-agenda_group returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc=AGENDA_GROUP n=STRING   
-		{
-			d = new AttributeDescr( "agenda-group", getString( n ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-		}
-	;
-	
-
-duration returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc=DURATION i=INT 
-		{
-			d = new AttributeDescr( "duration", i.getText() );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
-		}
-	;	
-	
-dialect returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc=DIALECT n=STRING   
-		{
-			d = new AttributeDescr( "dialect", getString( n ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
-		}
-	;			
-
-
-	
-	
-	
-	
-lock_on_active returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		(
-			loc=LOCK_ON_ACTIVE   
-			{
-				d = new AttributeDescr( "lock-on-active", "true" );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-			}
-		) 
-		|
-		(
-			loc=LOCK_ON_ACTIVE t=BOOL   
-			{
-				d = new AttributeDescr( "lock-on-active", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
-			}
-		
-		)
-		
-	;		
-
-normal_lhs_block[AndDescr descr]
-	:
-		(	d=lhs[descr]
-			{ if(d != null) descr.addDescr( d ); }
-		)*
-	;
-
-	
-lhs[ConditionalElementDescr ce] returns [BaseDescr d]
-	@init {
-		d=null;
-	}
-	:	l=lhs_or { d = l; } 
-	;
-
-	
-lhs_pattern returns [BaseDescr d]
-	@init {
-		d=null;
-	}
-	:	f=fact_binding	{ d = f; }
-	|	f=fact		{ d = f; }
-	;
-
-from_statement returns [FromDescr d]
-	@init {
-		d=factory.createFrom();
-	}
-	:
-	ds=from_source[d]
-		{
-			d.setDataSource(ds);
-		
-		}
-		
-		
-		
-	;
-	
-from_source[FromDescr from] returns [DeclarativeInvokerDescr ds]
-	@init {
-		ds = null;
-		AccessorDescr ad = null;
-	}
-	:	
-		ident=identifier
-		{
-			ad = new AccessorDescr(ident.getText());	
-			ad.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );
-			ad.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-			ad.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-			ds = ad;
-			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.getText());
-		}
-		(args=paren_chunk[from]
-		{
-			if( args != null ) {
-				ad.setVariableName( null );
-				FunctionCallDescr fc = new FunctionCallDescr(ident.getText());
-				fc.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );			
-				fc.setArguments(args);
-				fc.setStartCharacter( ((CommonToken)ident).getStartIndex() );
-				fc.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-				ad.addInvoker(fc);
-				location.setProperty(Location.LOCATION_FROM_CONTENT, args);
-			}
-		}
-		)?
-		expression_chain[from, ad]?
-		{
-			if( ad != null ) {
-				location.setProperty(Location.LOCATION_FROM_CONTENT, ad.toString() );
-			}
-		}
-	;	
-	
-expression_chain[FromDescr from, AccessorDescr as]
-	@init {
-  		FieldAccessDescr fa = null;
-	    	MethodAccessDescr ma = null;	
-	}
-	:
-	( '.' field=identifier  
-	    {
-	        fa = new FieldAccessDescr(field.getText());	
-		fa.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-		fa.setStartCharacter( ((CommonToken)field).getStartIndex() );
-		fa.setEndCharacter( ((CommonToken)field).getStopIndex() );
-	    }
-	  (
-	    ( LEFT_SQUARE ) => sqarg=square_chunk[from]
-	      {
-	          fa.setArgument( sqarg );	
-	      }
-	    |
-	    ( LEFT_PAREN ) => paarg=paren_chunk[from]
-		{
-	    	  ma = new MethodAccessDescr( field.getText(), paarg );	
-		  ma.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
-		  ma.setStartCharacter( ((CommonToken)field).getStartIndex() );
-		}
-	  )?
-	  {
-	      if( ma != null ) {
-	          as.addInvoker( ma );
-	      } else {
-	          as.addInvoker( fa );
-	      }
-	  }
-	  expression_chain[from, as]?
-	)  
-	;	
-	
-accumulate_statement returns [AccumulateDescr d]
-	@init {
-		d = factory.createAccumulate();
-	}
-	:
-	        loc=ACCUMULATE 
-		{ 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
-		}	
-		LEFT_PAREN pattern=lhs_pattern COMMA? 
-		{
-		        d.setSourcePattern( (PatternDescr)pattern );
-		}
-		INIT 
-		{
-			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
-		}
-		text=paren_chunk[null] COMMA?
-		{
-			if( text != null ) {
-			        d.setInitCode( text.substring(1, text.length()-1) );
-				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT, d.getInitCode());
-				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION );
-			}
-		}
-		ACTION text=paren_chunk[null] COMMA?
-		{
-			if( text != null ) {
-			        d.setActionCode( text.substring(1, text.length()-1) );
-	       			location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT, d.getActionCode());
-				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT );
-			}
-		}
-		RESULT text=paren_chunk[null] 
-		{
-			if( text != null ) {
-			        d.setResultCode( text.substring(1, text.length()-1) );
-				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT, d.getResultCode());
-			}
-		}
-		loc=RIGHT_PAREN
-		{
-			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		} 
-	; 		
- 		
-collect_statement returns [CollectDescr d]
-	@init {
-		d = factory.createCollect();
-	}
-	:
-	        loc=COLLECT 
-		{ 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
-		}	
-		LEFT_PAREN pattern=lhs_pattern loc=RIGHT_PAREN
-		{
-		        d.setSourcePattern( (PatternDescr)pattern );
-			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-		}
-	; 		
-
-fact_binding returns [BaseDescr d]
-	@init {
-		d=null;
-		boolean multi=false;
-	}
- 	:
- 		id=ID ':' 
- 		{
- 		        // handling incomplete parsing
- 		        d = new PatternDescr( );
- 		        ((PatternDescr) d).setIdentifier( id.getText() );
- 		}
- 		fe=fact_expression[id.getText()]
- 		{
- 		        // override previously instantiated pattern
- 			d=fe;
- 			if( d != null ) {
-   			    d.setStartCharacter( ((CommonToken)id).getStartIndex() );
-   			}
- 		}
-	;
- 
- fact_expression[String id] returns [BaseDescr pd]
- 	@init {
- 		pd = null;
- 		boolean multi = false;
- 	}
- 	:	LEFT_PAREN fe=fact_expression[id] RIGHT_PAREN { pd=fe; }
- 	| 	f=fact
- 		{
- 			((PatternDescr)f).setIdentifier( id );
- 			pd = f;
- 		}
- 		( (OR|DOUBLE_PIPE)
- 			{	if ( ! multi ) {
- 					BaseDescr first = pd;
- 					pd = new OrDescr();
- 					((OrDescr)pd).addDescr( first );
- 					multi=true;
- 				}
- 			}
- 			f=fact
- 			{
- 				((PatternDescr)f).setIdentifier( id );
- 				((OrDescr)pd).addDescr( f );
- 			}
- 		)*	
-	;
-
-fact returns [BaseDescr d] 
-	@init {
-		d=null;
-		PatternDescr pattern = null;
-	}
- 	:	
- 	        {
- 			pattern = new PatternDescr( );
- 			d = pattern; 
- 	        }
- 	        id=dotted_name[d] 
- 		{ 
- 		        pattern.setObjectType( id );
- 		        pattern.setEndCharacter( -1 );
- 		}
- 		loc=LEFT_PAREN {
-		                location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
-            			location.setProperty( Location.LOCATION_PROPERTY_CLASS_NAME, id );
- 				
- 				pattern.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
- 			        pattern.setLeftParentCharacter( ((CommonToken)loc).getStartIndex() );
- 			} 
- 		( constraints[pattern]  )? 
- 		endLoc=RIGHT_PAREN
-		{
-		        if( endLoc.getType() == RIGHT_PAREN ) {
-				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-				pattern.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
-				pattern.setEndCharacter( ((CommonToken)endLoc).getStopIndex() );
- 			        pattern.setRightParentCharacter( ((CommonToken)endLoc).getStartIndex() );
-			}
- 		}
- 	;
-	
-	
-constraints[PatternDescr pattern]
-	:	constraint[pattern]
-		( ',' { location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); } 
-		  constraint[pattern] 
-		)* 
-	;
-	
-constraint[PatternDescr pattern]
-	@init {
-		ConditionalElementDescr top = null;
-	}
-	:
-		{
-			top = pattern.getConstraint();
-		}
-		or_constr[top]
-	;	
-	
-or_constr[ConditionalElementDescr base]
-	@init {
-		OrDescr or = new OrDescr();
-	}
-	:
-		and_constr[or] 
-		( t=DOUBLE_PIPE 
-			{
-				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
-			}
-		and_constr[or] 
-		)*
-		{
-		        if( or.getDescrs().size() == 1 ) {
-		                base.addOrMerge( (BaseDescr) or.getDescrs().get(0) );
-		        } else if ( or.getDescrs().size() > 1 ) {
-		        	base.addDescr( or );
-		        }
-		}
-	;
-	
-and_constr[ConditionalElementDescr base]
-	@init {
-		AndDescr and = new AndDescr();
-	}
-	:
-		unary_constr[and] 
-		( t=DOUBLE_AMPER 
-			{
-				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
-			}
-		unary_constr[and] 
-		)*
-		{
-		        if( and.getDescrs().size() == 1) {
-		                base.addOrMerge( (BaseDescr) and.getDescrs().get(0) );
-		        } else if( and.getDescrs().size() > 1) {
-		        	base.addDescr( and );
-		        }
-		}
-	;
-	
-unary_constr[ConditionalElementDescr base]
-	:
-		( field_constraint[base] 
-		| LEFT_PAREN or_constr[base] RIGHT_PAREN
-		| EVAL predicate[base]
-		)
-	;	
-		
-field_constraint[ConditionalElementDescr base]
-	@init {
-		FieldBindingDescr fbd = null;
-		FieldConstraintDescr fc = null;
-		RestrictionConnectiveDescr top = null;
-	}
-	:
-		( fb=ID ':' 
-		    { 
-			fbd = new FieldBindingDescr();
-			fbd.setIdentifier( fb.getText() );
-			fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
-			fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
-			base.addDescr( fbd );
-
-		    }
-		)? 
-		f=identifier	
-		{
-		    if( f != null ) {
-			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
-			location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, f.getText());
-		    
-			if ( fbd != null ) {
-			    fbd.setFieldName( f.getText() );
- 			    fbd.setEndCharacter( ((CommonToken)f).getStopIndex() );
-			} 
-			fc = new FieldConstraintDescr(f.getText());
-			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-			fc.setStartCharacter( ((CommonToken)f).getStartIndex() );
-			top = fc.getRestriction();
-			
-			// it must be a field constraint, as it is not a binding
-			if( fb == null ) {
-			    base.addDescr( fc );
-			}
-		    }
-		}
-		(
-			or_restr_connective[top]
-			{
-				// we must add now as we didn't before
-				if( fb != null) {
-				    base.addDescr( fc );
-				}
-			}
-		|
-			'->' predicate[base] 
-		)?
-	;
-	
-
-or_restr_connective[ RestrictionConnectiveDescr base ]
-	@init {
-		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
-	}
-	:
-		and_restr_connective[or] 
-		( t=DOUBLE_PIPE 
-			{
-				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
-			}
-		  and_restr_connective[or] 
-		)*
-		{
-		        if( or.getRestrictions().size() == 1 ) {
-		                base.addOrMerge( (RestrictionDescr) or.getRestrictions().get( 0 ) );
-		        } else if ( or.getRestrictions().size() > 1 ) {
-		        	base.addRestriction( or );
-		        }
-		}
-	;	
-
-	
-and_restr_connective[ RestrictionConnectiveDescr base ]
-	@init {
-		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
-	}
-	:
-		constraint_expression[and] 
-		( t=DOUBLE_AMPER 
-			{
-				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
-			}
-		constraint_expression[and] 
-		)*
-		{
-		        if( and.getRestrictions().size() == 1) {
-		                base.addOrMerge( (RestrictionDescr) and.getRestrictions().get( 0 ) );
-		        } else if ( and.getRestrictions().size() > 1 ) {
-		        	base.addRestriction( and );
-		        }
-		}
-	;
-
-constraint_expression[RestrictionConnectiveDescr base]
-        :	
-		( compound_operator[base]
-		| simple_operator[base]
-		| LEFT_PAREN 
-		{
-			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
-		}
-		or_restr_connective[base] 
-		RIGHT_PAREN
- 		)
-	;	
-	
-simple_operator[RestrictionConnectiveDescr base]
-	@init {
-		String op = null;
-	}
-	:
-		(	t='=='
-		|	t='>'
-		|	t='>='
-		|	t='<'
-		|	t='<='
-		|	t='!='
-		|	t=CONTAINS
-		|	n=NOT t=CONTAINS
-		|	t=EXCLUDES
-		|	t=MATCHES
-		|	n=NOT t=MATCHES
-		|	t=MEMBEROF
-		|	n=NOT t=MEMBEROF
-		)
-		{
-  		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                    location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, t.getText());
-		    if( n != null ) {
-		        op = "not "+t.getText();
-		    } else {
-		        op = t.getText();
-		    }
-		}
-		rd=expression_value[op]
-		{
-			    if( rd != null ) {
-				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
-			        base.addRestriction( rd );
-			    } else if ( rd == null && op != null ) {
-			        base.addRestriction( new LiteralRestrictionDescr(op, null) );
-			    }
-		}
-	;	
-	
-compound_operator[RestrictionConnectiveDescr base]
-	@init {
-		String op = null;
-		RestrictionConnectiveDescr group = null;
-	}
-	:
-		( IN 
-			{
-			  op = "==";
-			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
-			  base.addRestriction( group );
-  		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                    	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
-			}
-		| NOT IN 
-			{
-			  op = "!=";
-			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
-			  base.addRestriction( group );
-  		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
-                    	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
-			}	
-		)
-		LEFT_PAREN rd=expression_value[op]
-			{
-			    if( rd != null ) {
-			        group.addRestriction( rd );
-			    }
-			}
-		( COMMA rd=expression_value[op]
-			{
-			    if( rd != null ) {
-		        	group.addRestriction( rd );
-			    }
-			}
-		)* 
-		RIGHT_PAREN 
-		{
-			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
-		}
-	;
-	
-expression_value[String op] returns [RestrictionDescr rd]
-	:
-		(	bvc=ID
-			{
-				rd = new VariableRestrictionDescr(op, bvc.getText());
-			}
-		|	lc=enum_constraint 
-			{ 
-				rd  = new QualifiedIdentifierRestrictionDescr(op, lc);
-			}						
-		|	lc=literal_constraint 
-			{ 
-				rd  = new LiteralRestrictionDescr(op, lc);
-			}
-		|	rvc=retval_constraint 
-			{ 
-				rd = new ReturnValueRestrictionDescr(op, rvc);							
-			} 
-		)	
-		{
-			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
-		}
-	;	
-	
-literal_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	(	t=STRING { text = getString( t ); } 
-		|	t=INT    { text = t.getText(); }
-		|	t=FLOAT	 { text = t.getText(); }
-		|	t=BOOL 	 { text = t.getText(); }
-		|	t=NULL   { text = null; }
-		)
-	;
-	
-enum_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	
-		id=ID { text=id.getText(); } ( '.' ident=identifier { text += "." + ident.getText(); } )+ 
-	;	
-	
-
-predicate[ConditionalElementDescr base]
-        @init {
-		PredicateDescr d = null;
-        }
-	:
-		{
-			d = new PredicateDescr( );
-		}
-		text=paren_chunk[d]
-		{
-		        if( text != null ) {
-			        String body = text.substring(1, text.length()-1);
-			        d.setContent( body );
-				base.addDescr( d );
-		        }
-		}
-	;
-
-paren_chunk[BaseDescr descr] returns [String text]
-        @init {
-           StringBuffer buf = null;
-           Integer channel = null;
-        }
-	:
-	        {
-	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-		    buf = new StringBuffer();
-	        }
-		loc=LEFT_PAREN 
-		{
-		    buf.append( loc.getText());
-		} 
-		( 
-			~(LEFT_PAREN|RIGHT_PAREN)
-			  {
-			    buf.append( input.LT(-1).getText() );
-			  }
-			|
-			chunk=paren_chunk[null]
-			  {
-			    buf.append( chunk );
-			  }
-		)*
-		{
-		    if( channel != null ) {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-		    } else {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-		    }
-		}
-                loc=RIGHT_PAREN
-                {
-                    buf.append( loc.getText() );
-		    text = buf.toString();
-		    if( descr != null ) {
-		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		    }
-                }
-	;
-
-curly_chunk[BaseDescr descr] returns [String text]
-        @init {
-           StringBuffer buf = null;
-           Integer channel = null;
-        }
-	:
-		loc=LEFT_CURLY 
-		{
-	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-		    buf = new StringBuffer();
-		    
-		    buf.append( loc.getText() );
-		} 
-		( 
-			~(LEFT_CURLY|RIGHT_CURLY)
-			  {
-			    buf.append( input.LT(-1).getText() );
-			  }
-			|
-			chunk=curly_chunk[descr]
-			  {
-			    buf.append( chunk );
-			  }
-		)*
-		{
-		    if( channel != null ) {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-		    } else {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-		    }
-		}
-                loc=RIGHT_CURLY
-                {
-                    buf.append( loc.getText() );
-		    text = buf.toString();
-		    if( descr != null ) {
-		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		    }
-                }
-	;
-
-square_chunk[BaseDescr descr]  returns [String text]
-        @init {
-           StringBuffer buf = null;
-           Integer channel = null;
-        }
-	:
-	        {
-	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-		    buf = new StringBuffer();
-	        }
-		loc=LEFT_SQUARE 
-		{
-		    buf.append( loc.getText());
- 
-		} 
-		( 
-			~(LEFT_SQUARE|RIGHT_SQUARE)
-			  {
-			    buf.append( input.LT(-1).getText() );
-			  }
-			|
-			chunk=square_chunk[null]
-			  {
-			    buf.append( chunk );
-			  }
-		)*
-		{
-		    if( channel != null ) {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-		    } else {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-		    }
-		}
-                loc=RIGHT_SQUARE
-                {
-                    buf.append( loc.getText() );
-		    text = buf.toString();
-		    if( descr != null ) {
-		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		    }
-                }
-	;
-	
-retval_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	
-		c=paren_chunk[null] { text = c.substring(1, c.length()-1); }
-	;
-
-lhs_or returns [BaseDescr d]
-	@init{
-		d = null;
-		OrDescr or = null;
-	}
-	:	
-		left=lhs_and {d = left; }
-		( (OR|'||')
-			{
-				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
-			}
-			right=lhs_and 
-			{
-				if ( or == null ) {
-					or = new OrDescr();
-					or.addDescr( left );
-					d = or;
-				}
-				
-				or.addDescr( right );
-			}
-		)*
-	;
-	
-lhs_and returns [BaseDescr d]
-	@init{
-		d = null;
-		AndDescr and = null;
-	}
-	:
-		left=lhs_unary { d = left; }
-		( (AND|DOUBLE_AMPER)
-			{
-				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
-			}
-			right=lhs_unary
-			{
-				if ( and == null ) {
-					and = new AndDescr();
-					and.addDescr( left );
-					d = and;
-				}
-				
-				and.addDescr( right );
-			}
-		)* 
-	;
-	
-lhs_unary returns [BaseDescr d]
-	@init {
-		d = null;
-	}
-	:	(	u=lhs_exist
-		|	u=lhs_not
-		|	u=lhs_eval
-		|	u=lhs_pattern (
-		          FROM 
-		          {
-				location.setType(Location.LOCATION_LHS_FROM);
-				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
-		          }
-		          (
-		           ( ACCUMULATE ) => (ac=accumulate_statement {ac.setResultPattern((PatternDescr) u); u=ac; })
-		          |( COLLECT ) => (cs=collect_statement {cs.setResultPattern((PatternDescr) u); u=cs; }) 
-		          |( ~(ACCUMULATE|COLLECT) ) => (fm=from_statement {fm.setPattern((PatternDescr) u); u=fm; }) 
-		          )
-		        )?
-		|	u=lhs_forall  
-		|	'(' u=lhs_or ')'
-		) { d = u; }
-		opt_semicolon
-	;
-	
-lhs_exist returns [BaseDescr d]
-	@init {
-		d = null;
-	}
-	:	loc=EXISTS 
-		{
-			d = new ExistsDescr( ); 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
-		}
-	        ( ( '(' pattern=lhs_or 
-	           	{ if ( pattern != null ) ((ExistsDescr)d).addDescr( pattern ); }
-	           end=')' 
-	                { if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); }
-	        )    
-	        | pattern=lhs_pattern
-	                {
-	                	if ( pattern != null ) {
-	                		((ExistsDescr)d).addDescr( pattern );
-	                		d.setEndCharacter( pattern.getEndCharacter() );
-	                	}
-	                }
-	        )
-	;
-	
-lhs_not	returns [NotDescr d]
-	@init {
-		d = null;
-	}
-	:	loc=NOT 
-		{
-			d = new NotDescr( ); 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
-		}
-		( ( '(' pattern=lhs_or  
-	           	{ if ( pattern != null ) d.addDescr( pattern ); }
-	           end=')' 
-	                { if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); }
-		  )
-		| 
-		pattern=lhs_pattern
-	                {
-	                	if ( pattern != null ) {
-	                		d.addDescr( pattern );
-	                		d.setEndCharacter( pattern.getEndCharacter() );
-	                	}
-	                }
-		)
-	;
-
-lhs_eval returns [BaseDescr d]
-	@init {
-		d = new EvalDescr( );
-	}
-	:
-		loc=EVAL 
-		{
-			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
-		}
-		c=paren_chunk[d]
-		{ 
-			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		        if( c != null ) {
-	  		    this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-		            String body = c.length() > 1 ? c.substring(1, c.length()-1) : "";
-			    checkTrailingSemicolon( body, offset(loc.getLine()) );
-			    ((EvalDescr) d).setContent( body );
-			    location.setProperty(Location.LOCATION_EVAL_CONTENT, body);
-			}
-		}
-	;
-	
-lhs_forall returns [ForallDescr d]
-	@init {
-		d = factory.createForall();
-	}
-	:	loc=FORALL '(' base=lhs_pattern   
-		{
-			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
-		        // adding the base pattern
-		        d.addDescr( base );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-		( (',')? pattern=lhs_pattern
-		{
-		        // adding additional patterns
-			d.addDescr( pattern );
-		}
-		)+
-		end=')'
-		{
-		        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() );
-		}
-	;
-
-dotted_name[BaseDescr descr] returns [String name]
-	@init {
-		name = null;
-	}
-	:	
-		id=ID 
-		{ 
-		    name=id.getText(); 
-		    if( descr != null ) {
-			descr.setStartCharacter( ((CommonToken)id).getStartIndex() );
-			descr.setEndCharacter( ((CommonToken)id).getStopIndex() );
-		    }
-		} 
-		( '.' ident=identifier 
-		    { 
-		        name = name + "." + ident.getText(); 
-    		        if( descr != null ) {
-			    descr.setEndCharacter( ((CommonToken)ident).getStopIndex() );
-		        }
-		    } 
-		)* 
-		( '[' loc=']'
-		    { 
-		        name = name + "[]";
-    		        if( descr != null ) {
-			    descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
-		        }
-		    }
-		)*
-	;
-	
-argument returns [String name]
-	@init {
-		name = null;
-	}
-	:
-		id=identifier { name=id.getText(); } ( '[' ']' { name = name + "[]";})*
-	;
-
-rhs_chunk[RuleDescr rule]
-        @init {
-           StringBuffer buf = null;
-           Integer channel = null;
-        }
-	:
-	        {
-	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
-		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
-		    buf = new StringBuffer();
-	        }
-		start=THEN
-		{
-			location.setType( Location.LOCATION_RHS );
-		}
-		( 
-			  ~END
-			  {
-			    buf.append( input.LT(-1).getText() );
-			  }
-		)*
-		{
-		    if( channel != null ) {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
-		    } else {
-			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
-		    }
-		}
-                loc=END
-                {
-                    // ignoring first line in the consequence
-                    int index = 0;
-                    while( (index < buf.length() ) && Character.isWhitespace( buf.charAt( index ) ) &&
-                           (buf.charAt( index ) != 10 ) && (buf.charAt( index ) != 13 ))
-                               index++;
-                    if( (index < buf.length() ) && ( buf.charAt( index ) == '\r' ) )
-                        index++;
-                    if( (index < buf.length() ) && ( buf.charAt( index ) == '\n' ) )
-                        index++;
-                    
-		    rule.setConsequence( buf.substring( index ) );
-     		    rule.setConsequenceLocation(offset(start.getLine()), start.getCharPositionInLine());
- 		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
- 		    location.setProperty( Location.LOCATION_RHS_CONTENT, rule.getConsequence() );
-                }
-	;
-
-name returns [String s]
-	:
-	( 
-	    tok=ID
-	    {
-	        s = tok.getText();
-	    }
-	|
-	    str=STRING
-	    {
-	       s = getString( str );
-	    }
-	)
-	;
-	
-identifier returns [Token tok]
-	:	
-	(       t=ID      
-	|	t=PACKAGE
-	|	t=FUNCTION
-	|	t=GLOBAL
-	|	t=IMPORT  
-	|	t=RULE
-	|	t=QUERY 
-        |       t=TEMPLATE        
-        |       t=ATTRIBUTES      
-        |       t=ENABLED         
-        |       t=SALIENCE 	
-        |       t=DURATION 	
-        |       t=FROM	        
-        |       t=ACCUMULATE 	
-        |       t=INIT	        
-        |       t=ACTION	        
-        |       t=RESULT	        
-        |       t=COLLECT         
-        |       t=OR	        
-        |       t=AND	        
-        |       t=CONTAINS 	
-        |       t=EXCLUDES 	
-        |       t=MEMBEROF
-        |       t=MATCHES         
-        |       t=NULL	        
-        |       t=EXISTS	        
-        |       t=NOT	        
-        |       t=EVAL	        
-        |       t=FORALL	            					
-        |       t=WHEN            
-        |       t=THEN	        
-        |       t=END     
-        |	t=IN        
-	) 
-	{
-	    tok = t;
-	}
-	;
-	
-WS      :       (	' '
-                |	'\t'
-                |	'\f'
-                |	EOL
-                )
-                { $channel=HIDDEN; }
-        ;
-
-fragment
-EOL 	:	     
-   		(       ( '\r\n' )=> '\r\n'  // Evil DOS
-                |       '\r'    // Macintosh
-                |       '\n'    // Unix (the right way)
-                )
-        ;  
-        
-INT	
-	:	('-')?('0'..'9')+
-		;
-
-FLOAT
-	:	('-')?('0'..'9')+ '.' ('0'..'9')+
-	;
-
-STRING
-    :  ('"' ( EscapeSequence | ~('\\'|'"') )* '"')
-     | ('\'' ( EscapeSequence | ~('\\'|'\'') )* '\'')
-    ;
-
-fragment
-HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ;
-
-fragment
-EscapeSequence
-    :   '\\' ('b'|'B'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\'|'.'|'o'|
-              'x'|'a'|'e'|'c'|'d'|'D'|'s'|'S'|'w'|'W'|'p'|'A'|
-              'G'|'Z'|'z'|'Q'|'E'|'*'|'['|']'|'('|')'|'$'|'^'|
-              '{'|'}'|'?'|'+'|'-'|'&'|'|')
-    |   UnicodeEscape
-    |   OctalEscape
-    ;
-
-fragment
-OctalEscape
-    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7') ('0'..'7')
-    |   '\\' ('0'..'7')
-    ;
-
-fragment
-UnicodeEscape
-    :   '\\' 'u' HexDigit HexDigit HexDigit HexDigit
-    ;
-
-BOOL
-	:	('true'|'false') 
-	;	
-
-PACKAGE	:	'package';
-
-IMPORT	:	'import';
-
-FUNCTION :	'function';
-
-GLOBAL	:	'global';
-	
-RULE    :	'rule';
-
-QUERY	:	'query';
-
-TEMPLATE :	'template';
-
-ATTRIBUTES :	'attributes';
-	
-DATE_EFFECTIVE 
-	:	'date-effective';
-
-DATE_EXPIRES 
-	:	'date-expires';	
-	
-ENABLED :	'enabled';
-
-SALIENCE 
-	:	'salience';
-	
-NO_LOOP :	'no-loop';
-
-AUTO_FOCUS 
-	:	'auto-focus';
-	
-ACTIVATION_GROUP 
-	:	'activation-group';
-	
-AGENDA_GROUP 
-	:	'agenda-group';
-	
-DIALECT 
-	:	'dialect';	
-	
-RULEFLOW_GROUP 
-	:	'ruleflow-group';
-	
-DURATION 
-	:	'duration';
-	
-LOCK_ON_ACTIVE
-	:	'lock-on-active';	
-	
-FROM	:	'from';
-
-ACCUMULATE 
-	:	'accumulate';
-	
-INIT	:	'init';
-
-ACTION	:	'action';
-
-RESULT	:	'result';
-
-COLLECT :	'collect';
-
-OR	:	'or';
-
-AND	:	'and';
-
-CONTAINS 
-	:	'contains';
-	
-EXCLUDES 
-	:	'excludes';
-	
-MEMBEROF
-	:	'memberOf';
-
-MATCHES :	'matches';
-
-IN	:	'in';
-
-NULL	:	'null';
-
-EXISTS	:	'exists';
-
-NOT	:	'not';
-
-EVAL	:	'eval';
-
-FORALL	:	'forall';							
-
-WHEN    :	'when'; 
-
-THEN	:    	'then';
-
-END     :	'end';
-
-ID	
-	:	('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')* 
-	;
-		
-LEFT_PAREN
-        :	'('
-        ;
-
-RIGHT_PAREN
-        :	')'
-        ;
-        
-LEFT_SQUARE
-        :	'['
-        ;
-
-RIGHT_SQUARE
-        :	']'
-        ;        
-
-LEFT_CURLY
-        :	'{'
-        ;
-
-RIGHT_CURLY
-        :	'}'
-        ;
-        
-COMMA	:	','
-	;
-	
-DOUBLE_AMPER
-	:	'&&'
-	;
-	
-DOUBLE_PIPE
-	:	'||'
-	;				
-	
-SH_STYLE_SINGLE_LINE_COMMENT	
-	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
-                { $channel=HIDDEN; }
-	;
-        
-        
-C_STYLE_SINGLE_LINE_COMMENT	
-	:	'//' ( options{greedy=false;} : .)* EOL // ('\r')? '\n' 
-                { $channel=HIDDEN; }
-	;
-
-MULTI_LINE_COMMENT
-	:	'/*' (options{greedy=false;} : .)* '*/'
-                { $channel=HIDDEN; }
-	;
-
-MISC 	:
-		'!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+'  | '?' | '=' | '/' | '\'' | '\\' | '|' | '&'
-	;
+grammar DRL; 
+options {backtrack=true;}
+
+ at parser::header {
+	package org.drools.lang;
+	import java.util.List;
+	import java.util.ArrayList;
+	import java.util.Iterator;
+	import java.util.HashMap;	
+	import java.util.StringTokenizer;
+	import org.drools.lang.descr.*;
+	import org.drools.compiler.SwitchingCommonTokenStream;
+}
+
+ at parser::members {
+	private PackageDescr packageDescr;
+	private List errors = new ArrayList();
+	private String source = "unknown";
+	private int lineOffset = 0;
+	private DescrFactory factory = new DescrFactory();
+	private boolean parserDebug = false;
+	private Location location = new Location( Location.LOCATION_UNKNOWN );
+	
+	// THE FOLLOWING LINES ARE DUMMY ATTRIBUTES TO WORK AROUND AN ANTLR BUG
+	private BaseDescr from = null;
+	private FieldConstraintDescr fc = null;
+	private RestrictionConnectiveDescr and = null;
+	private RestrictionConnectiveDescr or = null;
+	private ConditionalElementDescr base = null;
+	
+	public void setParserDebug(boolean parserDebug) {
+		this.parserDebug = parserDebug;
+	}
+	
+	public void debug(String message) {
+		if ( parserDebug ) 
+			System.err.println( "drl parser: " + message );
+	}
+	
+	public void setSource(String source) {
+		this.source = source;
+	}
+	public DescrFactory getFactory() {
+		return factory;
+	}	
+
+	public String getSource() {
+		return this.source;
+	}
+	
+	public PackageDescr getPackageDescr() {
+		return packageDescr;
+	}
+	
+	private int offset(int line) {
+		return line + lineOffset;
+	}
+	
+	/**
+	 * This will set the offset to record when reparsing. Normally is zero of course 
+	 */
+	public void setLineOffset(int i) {
+	 	this.lineOffset = i;
+	}
+	
+	private String getString(Token token) {
+		String orig = token.getText();
+		return orig.substring( 1, orig.length() -1 );
+	}
+	
+	public void reportError(RecognitionException ex) {
+	        // if we've already reported an error and have not matched a token
+                // yet successfully, don't report any errors.
+                if ( errorRecovery ) {
+                        return;
+                }
+                errorRecovery = true;
+
+		ex.line = offset(ex.line); //add the offset if there is one
+		errors.add( ex ); 
+	}
+     	
+     	/** return the raw RecognitionException errors */
+     	public List getErrors() {
+     		return errors;
+     	}
+     	
+     	/** Return a list of pretty strings summarising the errors */
+     	public List getErrorMessages() {
+     		List messages = new ArrayList();
+ 		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
+     	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+     	     	}
+     	     	return messages;
+     	}
+     	
+     	/** return true if any parser errors were accumulated */
+     	public boolean hasErrors() {
+  		return ! errors.isEmpty();
+     	}
+     	
+     	/** This will take a RecognitionException, and create a sensible error message out of it */
+     	public String createErrorMessage(RecognitionException e)
+        {
+		StringBuffer message = new StringBuffer();		
+                message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
+                if ( e instanceof MismatchedTokenException ) {
+                        MismatchedTokenException mte = (MismatchedTokenException)e;
+                        message.append("mismatched token: "+
+                                                           e.token+
+                                                           "; expecting type "+
+                                                           tokenNames[mte.expecting]);
+                }
+                else if ( e instanceof MismatchedTreeNodeException ) {
+                        MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+                        message.append("mismatched tree node: "+
+                                                           mtne.toString() +
+                                                           "; expecting type "+
+                                                           tokenNames[mtne.expecting]);
+                }
+                else if ( e instanceof NoViableAltException ) {
+                        NoViableAltException nvae = (NoViableAltException)e;
+			message.append( "Unexpected token '" + e.token.getText() + "'" );
+                        /*
+                        message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+                                                           " state "+nvae.stateNumber+
+                                                           " (decision="+nvae.decisionNumber+
+                                                           ") no viable alt; token="+
+                                                           e.token);
+                                                           */
+                }
+                else if ( e instanceof EarlyExitException ) {
+                        EarlyExitException eee = (EarlyExitException)e;
+                        message.append("required (...)+ loop (decision="+
+                                                           eee.decisionNumber+
+                                                           ") did not match anything; token="+
+                                                           e.token);
+                }
+                else if ( e instanceof MismatchedSetException ) {
+                        MismatchedSetException mse = (MismatchedSetException)e;
+                        message.append("mismatched token '"+
+                                                           e.token+
+                                                           "' expecting set "+mse.expecting);
+                }
+                else if ( e instanceof MismatchedNotSetException ) {
+                        MismatchedNotSetException mse = (MismatchedNotSetException)e;
+                        message.append("mismatched token '"+
+                                                           e.token+
+                                                           "' expecting set "+mse.expecting);
+                }
+                else if ( e instanceof FailedPredicateException ) {
+                        FailedPredicateException fpe = (FailedPredicateException)e;
+                        message.append("rule "+fpe.ruleName+" failed predicate: {"+
+                                                           fpe.predicateText+"}?");
+                } else if (e instanceof GeneralParseException) {
+			message.append(" " + e.getMessage());
+		}
+               	return message.toString();
+        }   
+        
+        void checkTrailingSemicolon(String text, int line) {
+        	if (text.trim().endsWith( ";" ) ) {
+        		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
+        	}
+        }
+        
+        public Location getLocation() {
+                return this.location;
+        }
+      
+}
+
+ at lexer::header {
+	package org.drools.lang;
+}
+
+opt_semicolon
+	: ';'?
+	;
+
+compilation_unit
+	@init {
+		// reset Location information
+		this.location = new Location( Location.LOCATION_UNKNOWN );
+	}
+	:	prolog 
+		( statement )+
+	;
+	
+prolog
+	@init {
+		String packageName = "";
+	}
+	:	( n=package_statement { packageName = n; } )?
+		{ 
+			this.packageDescr = factory.createPackage( packageName ); 
+		}
+			(ATTRIBUTES ':')?
+			(	','? a=rule_attribute
+				{
+					this.packageDescr.addAttribute( a );
+				}
+			)*		
+	;
+	
+statement
+	:
+	(	function_import_statement 
+	|	import_statement 
+	|	global 
+	|	function 
+	|       t=template {this.packageDescr.addFactTemplate( t ); }
+	|	r=rule { if( r != null ) this.packageDescr.addRule( r ); }			
+	|	q=query	{ if( q != null ) this.packageDescr.addRule( q ); }
+	) 
+	;
+
+package_statement returns [String packageName]
+	@init{
+		packageName = null;
+	}
+	:	
+		PACKAGE n=dotted_name[null] opt_semicolon
+		{
+			packageName = n;
+		}
+	;
+	
+
+import_statement
+        @init {
+        	ImportDescr importDecl = null;
+        }
+	:	imp=IMPORT 
+	        {
+	            importDecl = factory.createImport( );
+	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
+		    if (packageDescr != null) {
+			packageDescr.addImport( importDecl );
+		    }
+	        }
+	        import_name[importDecl] opt_semicolon
+	;
+
+function_import_statement
+        @init {
+        	FunctionImportDescr importDecl = null;
+        }
+	:	imp=IMPORT FUNCTION 
+	        {
+	            importDecl = factory.createFunctionImport();
+	            importDecl.setStartCharacter( ((CommonToken)imp).getStartIndex() );
+		    if (packageDescr != null) {
+			packageDescr.addFunctionImport( importDecl );
+		    }
+	        }
+	        import_name[importDecl] opt_semicolon
+	;
+
+
+import_name[ImportDescr importDecl] returns [String name]
+	@init {
+		name = null;
+	}
+	:	
+		id=identifier 
+		{ 
+		    name=id.getText(); 
+		    importDecl.setTarget( name );
+		    importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
+		} 
+		( '.' id=identifier 
+		    { 
+		        name = name + "." + id.getText(); 
+			importDecl.setTarget( name );
+		        importDecl.setEndCharacter( ((CommonToken)id).getStopIndex() );
+		    } 
+		)* 
+		( star='.*' 
+		    { 
+		        name = name + star.getText(); 
+			importDecl.setTarget( name );
+		        importDecl.setEndCharacter( ((CommonToken)star).getStopIndex() );
+		    }
+		)?
+	;
+
+
+global
+	@init {
+	    GlobalDescr global = null;
+	}
+	:
+		loc=GLOBAL 
+		{
+		    global = factory.createGlobal();
+	            global.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		    packageDescr.addGlobal( global );
+		}
+		type=dotted_name[null] 
+		{
+		    global.setType( type );
+		}
+		id=identifier opt_semicolon
+		{
+		    global.setIdentifier( id.getText() );
+		    global.setEndCharacter( ((CommonToken)id).getStopIndex() );
+		}
+	;
+	
+
+function
+	@init {
+		FunctionDescr f = null;
+	}
+	:
+		loc=FUNCTION (retType=dotted_name[null])? n=identifier
+		{
+			//System.err.println( "function :: " + n.getText() );
+			f = factory.createFunction( n.getText(), retType );
+			f.setLocation(offset(loc.getLine()), loc.getCharPositionInLine());
+	        	f.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			packageDescr.addFunction( f );
+		} 
+		'('
+			(	(paramType=dotted_name[null])? paramName=argument
+				{
+					f.addParameter( paramType, paramName );
+				}
+				(	',' (paramType=dotted_name[null])? paramName=argument
+					{
+						f.addParameter( paramType, paramName );
+					}
+				)*
+			)?
+		')'
+		body=curly_chunk[f]
+		{
+			//strip out '{','}'
+			f.setText( body.substring( 1, body.length()-1 ) );
+		}
+	;
+
+
+
+query returns [QueryDescr query]
+	@init {
+		query = null;
+		AndDescr lhs = null;
+		List params = null;
+	}
+	:
+		loc=QUERY queryName=name
+		{ 
+			query = factory.createQuery( queryName ); 
+			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			query.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			lhs = new AndDescr(); query.setLhs( lhs ); 
+			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+		(
+			LEFT_PAREN
+			(
+				{ params = new ArrayList(); }
+				
+				paramName=ID { params.add( paramName.getText() ); }				
+				(',' paramName=ID { params.add( paramName.getText() ); } )*
+								
+				{ query.setParameters( (String[]) params.toArray( new String[params.size()] ) ); }
+		    )?
+	    	RIGHT_PAREN
+	    )?
+		(
+			normal_lhs_block[lhs]
+		)
+					
+		loc=END
+		{
+			query.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		}
+	;
+
+
+template returns [FactTemplateDescr template]
+	@init {
+		template = null;		
+	}
+	:
+		loc=TEMPLATE templateName=identifier opt_semicolon
+		{
+			template = new FactTemplateDescr(templateName.getText());
+			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
+			template.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		}
+		(
+			slot=template_slot 
+			{
+				template.addFieldTemplate(slot);
+			}
+		)+
+		loc=END opt_semicolon 
+		{
+			template.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		}		
+	;
+	
+template_slot returns [FieldTemplateDescr field]
+	@init {
+		field = null;
+	}
+	:
+	         {
+			field = factory.createFieldTemplate();
+	         }
+		 fieldType=dotted_name[field] 
+		 {
+		        field.setClassType( fieldType );
+		 }
+		 
+		 n=identifier opt_semicolon
+		 {
+		        field.setName( n.getText() );
+			field.setLocation( offset(n.getLine()), n.getCharPositionInLine() );
+			field.setEndCharacter( ((CommonToken)n).getStopIndex() );
+		 } 
+	;	
+	
+rule returns [RuleDescr rule]
+	@init {
+		rule = null;
+		String consequence = "";
+		AndDescr lhs = null;
+	}
+	:
+		loc=RULE ruleName=name 
+		{ 
+			location.setType( Location.LOCATION_RULE_HEADER );
+			debug( "start rule: " + ruleName );
+			rule = new RuleDescr( ruleName, null ); 
+			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			rule.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		}
+		rule_attributes[rule]
+		(	loc=WHEN ':'?
+			{ 
+				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+				lhs = new AndDescr(); rule.setLhs( lhs ); 
+				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				lhs.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			}
+			(
+//				{ expander != null }? expander_lhs_block[lhs] |
+				normal_lhs_block[lhs]
+			)
+					
+		)?
+		rhs_chunk[rule]
+	;
+	
+
+
+rule_attributes[RuleDescr rule]
+	: 
+			(ATTRIBUTES ':')?
+			(	','? a=rule_attribute
+				{
+					rule.addAttribute( a );
+				}
+			)*
+	;
+
+
+	
+rule_attribute returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+			a=salience { d = a; }
+		|	a=no_loop  { d = a; }
+		|	a=agenda_group  { d = a; }		
+		|	a=duration  { d = a; }			
+		|	a=activation_group { d = a; }	
+		|	a=auto_focus { d = a; }	
+		|	a=date_effective {d = a; }
+		|	a=date_expires {d = a; }
+		|	a=enabled {d=a;}
+		|	a=ruleflow_group { d = a; }
+		|	a=lock_on_active{ d = a; }
+		|	a=dialect {d = a; }
+		
+	;
+	
+date_effective returns [AttributeDescr d]
+	@init {
+		d = null;
+	}	
+	:
+		loc=DATE_EFFECTIVE val=STRING  
+		{
+			d = new AttributeDescr( "date-effective", getString( val ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
+		}
+
+	;
+
+date_expires returns [AttributeDescr d]
+	@init {
+		d = null;
+	}	
+	:
+		loc=DATE_EXPIRES val=STRING  
+		{
+			d = new AttributeDescr( "date-expires", getString( val ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)val).getStopIndex() );
+		}
+
+	;
+
+	
+enabled returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+			loc=ENABLED t=BOOL   
+			{
+				d = new AttributeDescr( "enabled", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+			}
+		
+		
+	;	
+	
+	
+
+salience returns [AttributeDescr d ]
+	@init {
+		d = null;
+	}
+	:	
+		loc=SALIENCE 
+		{
+			d = new AttributeDescr( "salience" );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		}
+		( i=INT   
+		{
+			d.setValue( i.getText() );
+			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
+		}
+		| txt=paren_chunk[d]
+		{
+			d.setValue( txt );
+		}
+		)
+	;
+	
+no_loop returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		(
+			loc=NO_LOOP   
+			{
+				d = new AttributeDescr( "no-loop", "true" );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+			}
+		) 
+		|
+		(
+			loc=NO_LOOP t=BOOL   
+			{
+				d = new AttributeDescr( "no-loop", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+			}
+		
+		)
+		
+	;
+	
+auto_focus returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		(
+			loc=AUTO_FOCUS   
+			{
+				d = new AttributeDescr( "auto-focus", "true" );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+			}
+		) 
+		|
+		(
+			loc=AUTO_FOCUS t=BOOL   
+			{
+				d = new AttributeDescr( "auto-focus", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+			}
+		
+		)
+		
+	;	
+	
+activation_group returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc=ACTIVATION_GROUP n=STRING   
+		{
+			d = new AttributeDescr( "activation-group", getString( n ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+		}
+	;
+
+ruleflow_group returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc=RULEFLOW_GROUP n=STRING   
+		{
+			d = new AttributeDescr( "ruleflow-group", getString( n ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+		}
+	;
+
+agenda_group returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc=AGENDA_GROUP n=STRING   
+		{
+			d = new AttributeDescr( "agenda-group", getString( n ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+		}
+	;
+	
+
+duration returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc=DURATION i=INT 
+		{
+			d = new AttributeDescr( "duration", i.getText() );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)i).getStopIndex() );
+		}
+	;	
+	
+dialect returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc=DIALECT n=STRING   
+		{
+			d = new AttributeDescr( "dialect", getString( n ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			d.setEndCharacter( ((CommonToken)n).getStopIndex() );
+		}
+	;			
+
+
+	
+	
+	
+	
+lock_on_active returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		(
+			loc=LOCK_ON_ACTIVE   
+			{
+				d = new AttributeDescr( "lock-on-active", "true" );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+			}
+		) 
+		|
+		(
+			loc=LOCK_ON_ACTIVE t=BOOL   
+			{
+				d = new AttributeDescr( "lock-on-active", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+				d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+				d.setEndCharacter( ((CommonToken)t).getStopIndex() );
+			}
+		
+		)
+		
+	;		
+
+normal_lhs_block[AndDescr descr]
+	:
+		(	d=lhs[descr]
+			{ if(d != null) descr.addDescr( d ); }
+		)*
+	;
+
+	
+lhs[ConditionalElementDescr ce] returns [BaseDescr d]
+	@init {
+		d=null;
+	}
+	:	l=lhs_or { d = l; } 
+	;
+
+	
+lhs_pattern returns [BaseDescr d]
+	@init {
+		d=null;
+	}
+	:	f=fact_binding	{ d = f; }
+	|	f=fact		{ d = f; }
+	;
+
+from_statement returns [FromDescr d]
+	@init {
+		d=factory.createFrom();
+	}
+	:
+	ds=from_source[d]
+		{
+			d.setDataSource(ds);
+		
+		}
+		
+		
+		
+	;
+	
+from_source[FromDescr from] returns [DeclarativeInvokerDescr ds]
+	@init {
+		ds = null;
+		AccessorDescr ad = null;
+	}
+	:	
+		ident=identifier
+		{
+			ad = new AccessorDescr(ident.getText());	
+			ad.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );
+			ad.setStartCharacter( ((CommonToken)ident).getStartIndex() );
+			ad.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+			ds = ad;
+			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.getText());
+		}
+		(args=paren_chunk[from]
+		{
+			if( args != null ) {
+				ad.setVariableName( null );
+				FunctionCallDescr fc = new FunctionCallDescr(ident.getText());
+				fc.setLocation( offset(ident.getLine()), ident.getCharPositionInLine() );			
+				fc.setArguments(args);
+				fc.setStartCharacter( ((CommonToken)ident).getStartIndex() );
+				fc.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+				ad.addInvoker(fc);
+				location.setProperty(Location.LOCATION_FROM_CONTENT, args);
+			}
+		}
+		)?
+		expression_chain[from, ad]?
+		{
+			if( ad != null ) {
+				location.setProperty(Location.LOCATION_FROM_CONTENT, ad.toString() );
+			}
+		}
+	;	
+	
+expression_chain[FromDescr from, AccessorDescr as]
+	@init {
+  		FieldAccessDescr fa = null;
+	    	MethodAccessDescr ma = null;	
+	}
+	:
+	( '.' field=identifier  
+	    {
+	        fa = new FieldAccessDescr(field.getText());	
+		fa.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
+		fa.setStartCharacter( ((CommonToken)field).getStartIndex() );
+		fa.setEndCharacter( ((CommonToken)field).getStopIndex() );
+	    }
+	  (
+	    ( LEFT_SQUARE ) => sqarg=square_chunk[from]
+	      {
+	          fa.setArgument( sqarg );	
+	      }
+	    |
+	    ( LEFT_PAREN ) => paarg=paren_chunk[from]
+		{
+	    	  ma = new MethodAccessDescr( field.getText(), paarg );	
+		  ma.setLocation( offset(field.getLine()), field.getCharPositionInLine() );
+		  ma.setStartCharacter( ((CommonToken)field).getStartIndex() );
+		}
+	  )?
+	  {
+	      if( ma != null ) {
+	          as.addInvoker( ma );
+	      } else {
+	          as.addInvoker( fa );
+	      }
+	  }
+	  expression_chain[from, as]?
+	)  
+	;	
+	
+accumulate_statement returns [AccumulateDescr d]
+	@init {
+		d = factory.createAccumulate();
+	}
+	:
+	        loc=ACCUMULATE 
+		{ 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
+		}	
+		LEFT_PAREN pattern=lhs_pattern COMMA? 
+		{
+		        d.setSourcePattern( (PatternDescr)pattern );
+		}
+		INIT 
+		{
+			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
+		}
+		text=paren_chunk[null] COMMA?
+		{
+			if( text != null ) {
+			        d.setInitCode( text.substring(1, text.length()-1) );
+				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_INIT_CONTENT, d.getInitCode());
+				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION );
+			}
+		}
+		ACTION text=paren_chunk[null] COMMA?
+		{
+			if( text != null ) {
+			        d.setActionCode( text.substring(1, text.length()-1) );
+	       			location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_ACTION_CONTENT, d.getActionCode());
+				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT );
+			}
+		}
+		RESULT text=paren_chunk[null] 
+		{
+			if( text != null ) {
+			        d.setResultCode( text.substring(1, text.length()-1) );
+				location.setProperty(Location.LOCATION_PROPERTY_FROM_ACCUMULATE_RESULT_CONTENT, d.getResultCode());
+			}
+		}
+		loc=RIGHT_PAREN
+		{
+			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		} 
+	; 		
+ 		
+collect_statement returns [CollectDescr d]
+	@init {
+		d = factory.createCollect();
+	}
+	:
+	        loc=COLLECT 
+		{ 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
+		}	
+		LEFT_PAREN pattern=lhs_pattern loc=RIGHT_PAREN
+		{
+		        d.setSourcePattern( (PatternDescr)pattern );
+			d.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+		}
+	; 		
+
+fact_binding returns [BaseDescr d]
+	@init {
+		d=null;
+		boolean multi=false;
+	}
+ 	:
+ 		id=ID ':' 
+ 		{
+ 		        // handling incomplete parsing
+ 		        d = new PatternDescr( );
+ 		        ((PatternDescr) d).setIdentifier( id.getText() );
+ 		}
+ 		fe=fact_expression[id.getText()]
+ 		{
+ 		        // override previously instantiated pattern
+ 			d=fe;
+ 			if( d != null ) {
+   			    d.setStartCharacter( ((CommonToken)id).getStartIndex() );
+   			}
+ 		}
+	;
+ 
+ fact_expression[String id] returns [BaseDescr pd]
+ 	@init {
+ 		pd = null;
+ 		boolean multi = false;
+ 	}
+ 	:	LEFT_PAREN fe=fact_expression[id] RIGHT_PAREN { pd=fe; }
+ 	| 	f=fact
+ 		{
+ 			((PatternDescr)f).setIdentifier( id );
+ 			pd = f;
+ 		}
+ 		( (OR|DOUBLE_PIPE)
+ 			{	if ( ! multi ) {
+ 					BaseDescr first = pd;
+ 					pd = new OrDescr();
+ 					((OrDescr)pd).addDescr( first );
+ 					multi=true;
+ 				}
+ 			}
+ 			f=fact
+ 			{
+ 				((PatternDescr)f).setIdentifier( id );
+ 				((OrDescr)pd).addDescr( f );
+ 			}
+ 		)*	
+	;
+
+fact returns [BaseDescr d] 
+	@init {
+		d=null;
+		PatternDescr pattern = null;
+	}
+ 	:	
+ 	        {
+ 			pattern = new PatternDescr( );
+ 			d = pattern; 
+ 	        }
+ 	        id=dotted_name[d] 
+ 		{ 
+ 		        pattern.setObjectType( id );
+ 		        pattern.setEndCharacter( -1 );
+ 		}
+ 		loc=LEFT_PAREN {
+		                location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
+            			location.setProperty( Location.LOCATION_PROPERTY_CLASS_NAME, id );
+ 				
+ 				pattern.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+ 			        pattern.setLeftParentCharacter( ((CommonToken)loc).getStartIndex() );
+ 			} 
+ 		( constraints[pattern]  )? 
+ 		endLoc=RIGHT_PAREN
+		{
+		        if( endLoc.getType() == RIGHT_PAREN ) {
+				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+				pattern.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
+				pattern.setEndCharacter( ((CommonToken)endLoc).getStopIndex() );
+ 			        pattern.setRightParentCharacter( ((CommonToken)endLoc).getStartIndex() );
+			}
+ 		}
+ 	;
+	
+	
+constraints[PatternDescr pattern]
+	:	constraint[pattern]
+		( ',' { location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); } 
+		  constraint[pattern] 
+		)* 
+	;
+	
+constraint[PatternDescr pattern]
+	@init {
+		ConditionalElementDescr top = null;
+	}
+	:
+		{
+			top = pattern.getConstraint();
+		}
+		or_constr[top]
+	;	
+	
+or_constr[ConditionalElementDescr base]
+	@init {
+		OrDescr or = new OrDescr();
+	}
+	:
+		and_constr[or] 
+		( t=DOUBLE_PIPE 
+			{
+				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
+			}
+		and_constr[or] 
+		)*
+		{
+		        if( or.getDescrs().size() == 1 ) {
+		                base.addOrMerge( (BaseDescr) or.getDescrs().get(0) );
+		        } else if ( or.getDescrs().size() > 1 ) {
+		        	base.addDescr( or );
+		        }
+		}
+	;
+	
+and_constr[ConditionalElementDescr base]
+	@init {
+		AndDescr and = new AndDescr();
+	}
+	:
+		unary_constr[and] 
+		( t=DOUBLE_AMPER 
+			{
+				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
+			}
+		unary_constr[and] 
+		)*
+		{
+		        if( and.getDescrs().size() == 1) {
+		                base.addOrMerge( (BaseDescr) and.getDescrs().get(0) );
+		        } else if( and.getDescrs().size() > 1) {
+		        	base.addDescr( and );
+		        }
+		}
+	;
+	
+unary_constr[ConditionalElementDescr base]
+	:
+		( field_constraint[base] 
+		| LEFT_PAREN or_constr[base] RIGHT_PAREN
+		| EVAL predicate[base]
+		)
+	;	
+		
+field_constraint[ConditionalElementDescr base]
+	@init {
+		FieldBindingDescr fbd = null;
+		FieldConstraintDescr fc = null;
+		RestrictionConnectiveDescr top = null;
+	}
+	:
+		( fb=ID ':' 
+		    { 
+			fbd = new FieldBindingDescr();
+			fbd.setIdentifier( fb.getText() );
+			fbd.setLocation( offset(fb.getLine()), fb.getCharPositionInLine() );
+			fbd.setStartCharacter( ((CommonToken)fb).getStartIndex() );
+			base.addDescr( fbd );
+
+		    }
+		)? 
+		f=identifier	
+		{
+		    if( f != null ) {
+			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+			location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, f.getText());
+		    
+			if ( fbd != null ) {
+			    fbd.setFieldName( f.getText() );
+ 			    fbd.setEndCharacter( ((CommonToken)f).getStopIndex() );
+			} 
+			fc = new FieldConstraintDescr(f.getText());
+			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+			fc.setStartCharacter( ((CommonToken)f).getStartIndex() );
+			top = fc.getRestriction();
+			
+			// it must be a field constraint, as it is not a binding
+			if( fb == null ) {
+			    base.addDescr( fc );
+			}
+		    }
+		}
+		(
+			or_restr_connective[top]
+			{
+				// we must add now as we didn't before
+				if( fb != null) {
+				    base.addDescr( fc );
+				}
+			}
+		|
+			'->' predicate[base] 
+		)?
+	;
+	
+
+or_restr_connective[ RestrictionConnectiveDescr base ]
+	@init {
+		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
+	}
+	:
+		and_restr_connective[or] 
+		( t=DOUBLE_PIPE 
+			{
+				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+			}
+		  and_restr_connective[or] 
+		)*
+		{
+		        if( or.getRestrictions().size() == 1 ) {
+		                base.addOrMerge( (RestrictionDescr) or.getRestrictions().get( 0 ) );
+		        } else if ( or.getRestrictions().size() > 1 ) {
+		        	base.addRestriction( or );
+		        }
+		}
+	;	
+
+	
+and_restr_connective[ RestrictionConnectiveDescr base ]
+	@init {
+		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
+	}
+	:
+		constraint_expression[and] 
+		( t=DOUBLE_AMPER 
+			{
+				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+			}
+		constraint_expression[and] 
+		)*
+		{
+		        if( and.getRestrictions().size() == 1) {
+		                base.addOrMerge( (RestrictionDescr) and.getRestrictions().get( 0 ) );
+		        } else if ( and.getRestrictions().size() > 1 ) {
+		        	base.addRestriction( and );
+		        }
+		}
+	;
+
+constraint_expression[RestrictionConnectiveDescr base]
+        :	
+		( compound_operator[base]
+		| simple_operator[base]
+		| LEFT_PAREN 
+		{
+			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+		}
+		or_restr_connective[base] 
+		RIGHT_PAREN
+ 		)
+	;	
+	
+simple_operator[RestrictionConnectiveDescr base]
+	@init {
+		String op = null;
+	}
+	:
+		(	t='=='
+		|	t='>'
+		|	t='>='
+		|	t='<'
+		|	t='<='
+		|	t='!='
+		|	t=CONTAINS
+		|	n=NOT t=CONTAINS
+		|	t=EXCLUDES
+		|	t=MATCHES
+		|	n=NOT t=MATCHES
+		|	t=MEMBEROF
+		|	n=NOT t=MEMBEROF
+		)
+		{
+  		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                    location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, t.getText());
+		    if( n != null ) {
+		        op = "not "+t.getText();
+		    } else {
+		        op = t.getText();
+		    }
+		}
+		rd=expression_value[op]
+		{
+			    if( rd != null ) {
+				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+			        base.addRestriction( rd );
+			    } else if ( rd == null && op != null ) {
+			        base.addRestriction( new LiteralRestrictionDescr(op, null) );
+			    }
+		}
+	;	
+	
+compound_operator[RestrictionConnectiveDescr base]
+	@init {
+		String op = null;
+		RestrictionConnectiveDescr group = null;
+	}
+	:
+		( IN 
+			{
+			  op = "==";
+			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
+			  base.addRestriction( group );
+  		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                    	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
+			}
+		| NOT IN 
+			{
+			  op = "!=";
+			  group = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
+			  base.addRestriction( group );
+  		    	  location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+                    	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
+			}	
+		)
+		LEFT_PAREN rd=expression_value[op]
+			{
+			    if( rd != null ) {
+			        group.addRestriction( rd );
+			    }
+			}
+		( COMMA rd=expression_value[op]
+			{
+			    if( rd != null ) {
+		        	group.addRestriction( rd );
+			    }
+			}
+		)* 
+		RIGHT_PAREN 
+		{
+			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+		}
+	;
+	
+expression_value[String op] returns [RestrictionDescr rd]
+	:
+		(	bvc=ID
+			{
+				rd = new VariableRestrictionDescr(op, bvc.getText());
+			}
+		|	lc=enum_constraint 
+			{ 
+				rd  = new QualifiedIdentifierRestrictionDescr(op, lc);
+			}						
+		|	lc=literal_constraint 
+			{ 
+				rd  = new LiteralRestrictionDescr(op, lc);
+			}
+		|	rvc=retval_constraint 
+			{ 
+				rd = new ReturnValueRestrictionDescr(op, rvc);							
+			} 
+		)	
+		{
+			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
+		}
+	;	
+	
+literal_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	(	t=STRING { text = getString( t ); } 
+		|	t=INT    { text = t.getText(); }
+		|	t=FLOAT	 { text = t.getText(); }
+		|	t=BOOL 	 { text = t.getText(); }
+		|	t=NULL   { text = null; }
+		)
+	;
+	
+enum_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	
+		id=ID { text=id.getText(); } ( '.' ident=identifier { text += "." + ident.getText(); } )+ 
+	;	
+	
+
+predicate[ConditionalElementDescr base]
+        @init {
+		PredicateDescr d = null;
+        }
+	:
+		{
+			d = new PredicateDescr( );
+		}
+		text=paren_chunk[d]
+		{
+		        if( text != null ) {
+			        String body = text.substring(1, text.length()-1);
+			        d.setContent( body );
+				base.addDescr( d );
+		        }
+		}
+	;
+
+paren_chunk[BaseDescr descr] returns [String text]
+        @init {
+           StringBuffer buf = null;
+           Integer channel = null;
+        }
+	:
+	        {
+	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+		    buf = new StringBuffer();
+	        }
+		loc=LEFT_PAREN 
+		{
+		    buf.append( loc.getText());
+		} 
+		( 
+			~(LEFT_PAREN|RIGHT_PAREN)
+			  {
+			    buf.append( input.LT(-1).getText() );
+			  }
+			|
+			chunk=paren_chunk[null]
+			  {
+			    buf.append( chunk );
+			  }
+		)*
+		{
+		    if( channel != null ) {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+		    } else {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+		    }
+		}
+                loc=RIGHT_PAREN
+                {
+                    buf.append( loc.getText() );
+		    text = buf.toString();
+		    if( descr != null ) {
+		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		    }
+                }
+	;
+
+curly_chunk[BaseDescr descr] returns [String text]
+        @init {
+           StringBuffer buf = null;
+           Integer channel = null;
+        }
+	:
+		loc=LEFT_CURLY 
+		{
+	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+		    buf = new StringBuffer();
+		    
+		    buf.append( loc.getText() );
+		} 
+		( 
+			~(LEFT_CURLY|RIGHT_CURLY)
+			  {
+			    buf.append( input.LT(-1).getText() );
+			  }
+			|
+			chunk=curly_chunk[descr]
+			  {
+			    buf.append( chunk );
+			  }
+		)*
+		{
+		    if( channel != null ) {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+		    } else {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+		    }
+		}
+                loc=RIGHT_CURLY
+                {
+                    buf.append( loc.getText() );
+		    text = buf.toString();
+		    if( descr != null ) {
+		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		    }
+                }
+	;
+
+square_chunk[BaseDescr descr]  returns [String text]
+        @init {
+           StringBuffer buf = null;
+           Integer channel = null;
+        }
+	:
+	        {
+	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+		    buf = new StringBuffer();
+	        }
+		loc=LEFT_SQUARE 
+		{
+		    buf.append( loc.getText());
+ 
+		} 
+		( 
+			~(LEFT_SQUARE|RIGHT_SQUARE)
+			  {
+			    buf.append( input.LT(-1).getText() );
+			  }
+			|
+			chunk=square_chunk[null]
+			  {
+			    buf.append( chunk );
+			  }
+		)*
+		{
+		    if( channel != null ) {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+		    } else {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+		    }
+		}
+                loc=RIGHT_SQUARE
+                {
+                    buf.append( loc.getText() );
+		    text = buf.toString();
+		    if( descr != null ) {
+		        descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		    }
+                }
+	;
+	
+retval_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	
+		c=paren_chunk[null] { text = c.substring(1, c.length()-1); }
+	;
+
+lhs_or returns [BaseDescr d]
+	@init{
+		d = null;
+		OrDescr or = null;
+	}
+	:	
+		left=lhs_and {d = left; }
+		( (OR|'||')
+			{
+				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
+			}
+			right=lhs_and 
+			{
+				if ( or == null ) {
+					or = new OrDescr();
+					or.addDescr( left );
+					d = or;
+				}
+				
+				or.addDescr( right );
+			}
+		)*
+	;
+	
+lhs_and returns [BaseDescr d]
+	@init{
+		d = null;
+		AndDescr and = null;
+	}
+	:
+		left=lhs_unary { d = left; }
+		( (AND|DOUBLE_AMPER)
+			{
+				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
+			}
+			right=lhs_unary
+			{
+				if ( and == null ) {
+					and = new AndDescr();
+					and.addDescr( left );
+					d = and;
+				}
+				
+				and.addDescr( right );
+			}
+		)* 
+	;
+	
+lhs_unary returns [BaseDescr d]
+	@init {
+		d = null;
+	}
+	:	(	u=lhs_exist
+		|	u=lhs_not
+		|	u=lhs_eval
+		|	u=lhs_pattern (
+		          FROM 
+		          {
+				location.setType(Location.LOCATION_LHS_FROM);
+				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
+		          }
+		          (
+		           ( ACCUMULATE ) => (ac=accumulate_statement {ac.setResultPattern((PatternDescr) u); u=ac; })
+		          |( COLLECT ) => (cs=collect_statement {cs.setResultPattern((PatternDescr) u); u=cs; }) 
+		          |( ~(ACCUMULATE|COLLECT) ) => (fm=from_statement {fm.setPattern((PatternDescr) u); u=fm; }) 
+		          )
+		        )?
+		|	u=lhs_forall  
+		|	'(' u=lhs_or ')'
+		) { d = u; }
+		opt_semicolon
+	;
+	
+lhs_exist returns [BaseDescr d]
+	@init {
+		d = null;
+	}
+	:	loc=EXISTS 
+		{
+			d = new ExistsDescr( ); 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
+		}
+	        ( ( '(' pattern=lhs_or 
+	           	{ if ( pattern != null ) ((ExistsDescr)d).addDescr( pattern ); }
+	           end=')' 
+	                { if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); }
+	        )    
+	        | pattern=lhs_pattern
+	                {
+	                	if ( pattern != null ) {
+	                		((ExistsDescr)d).addDescr( pattern );
+	                		d.setEndCharacter( pattern.getEndCharacter() );
+	                	}
+	                }
+	        )
+	;
+	
+lhs_not	returns [NotDescr d]
+	@init {
+		d = null;
+	}
+	:	loc=NOT 
+		{
+			d = new NotDescr( ); 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
+		}
+		( ( '(' pattern=lhs_or  
+	           	{ if ( pattern != null ) d.addDescr( pattern ); }
+	           end=')' 
+	                { if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() ); }
+		  )
+		| 
+		pattern=lhs_pattern
+	                {
+	                	if ( pattern != null ) {
+	                		d.addDescr( pattern );
+	                		d.setEndCharacter( pattern.getEndCharacter() );
+	                	}
+	                }
+		)
+	;
+
+lhs_eval returns [BaseDescr d]
+	@init {
+		d = new EvalDescr( );
+	}
+	:
+		loc=EVAL 
+		{
+			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
+		}
+		c=paren_chunk[d]
+		{ 
+			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		        if( c != null ) {
+	  		    this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+		            String body = c.length() > 1 ? c.substring(1, c.length()-1) : "";
+			    checkTrailingSemicolon( body, offset(loc.getLine()) );
+			    ((EvalDescr) d).setContent( body );
+			    location.setProperty(Location.LOCATION_EVAL_CONTENT, body);
+			}
+		}
+	;
+	
+lhs_forall returns [ForallDescr d]
+	@init {
+		d = factory.createForall();
+	}
+	:	loc=FORALL '(' base=lhs_pattern   
+		{
+			if ( loc != null ) d.setStartCharacter( ((CommonToken)loc).getStartIndex() );
+		        // adding the base pattern
+		        d.addDescr( base );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+		( (',')? pattern=lhs_pattern
+		{
+		        // adding additional patterns
+			d.addDescr( pattern );
+		}
+		)+
+		end=')'
+		{
+		        if ( end != null ) d.setEndCharacter( ((CommonToken)end).getStopIndex() );
+		}
+	;
+
+dotted_name[BaseDescr descr] returns [String name]
+	@init {
+		name = null;
+	}
+	:	
+		id=ID 
+		{ 
+		    name=id.getText(); 
+		    if( descr != null ) {
+			descr.setStartCharacter( ((CommonToken)id).getStartIndex() );
+			descr.setEndCharacter( ((CommonToken)id).getStopIndex() );
+		    }
+		} 
+		( '.' ident=identifier 
+		    { 
+		        name = name + "." + ident.getText(); 
+    		        if( descr != null ) {
+			    descr.setEndCharacter( ((CommonToken)ident).getStopIndex() );
+		        }
+		    } 
+		)* 
+		( '[' loc=']'
+		    { 
+		        name = name + "[]";
+    		        if( descr != null ) {
+			    descr.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+		        }
+		    }
+		)*
+	;
+	
+argument returns [String name]
+	@init {
+		name = null;
+	}
+	:
+		id=identifier { name=id.getText(); } ( '[' ']' { name = name + "[]";})*
+	;
+
+rhs_chunk[RuleDescr rule]
+        @init {
+           StringBuffer buf = null;
+           Integer channel = null;
+        }
+	:
+	        {
+	            channel = ((SwitchingCommonTokenStream)input).getTokenTypeChannel( WS ); 
+		    ((SwitchingCommonTokenStream)input).setTokenTypeChannel( WS, Token.DEFAULT_CHANNEL );
+		    buf = new StringBuffer();
+	        }
+		start=THEN
+		{
+			location.setType( Location.LOCATION_RHS );
+		}
+		( 
+			  ~END
+			  {
+			    buf.append( input.LT(-1).getText() );
+			  }
+		)*
+		{
+		    if( channel != null ) {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, channel.intValue());
+		    } else {
+			    ((SwitchingCommonTokenStream)input).setTokenTypeChannel(WS, Token.HIDDEN_CHANNEL);
+		    }
+		}
+                loc=END
+                {
+                    // ignoring first line in the consequence
+                    int index = 0;
+                    while( (index < buf.length() ) && Character.isWhitespace( buf.charAt( index ) ) &&
+                           (buf.charAt( index ) != 10 ) && (buf.charAt( index ) != 13 ))
+                               index++;
+                    if( (index < buf.length() ) && ( buf.charAt( index ) == '\r' ) )
+                        index++;
+                    if( (index < buf.length() ) && ( buf.charAt( index ) == '\n' ) )
+                        index++;
+                    
+		    rule.setConsequence( buf.substring( index ) );
+     		    rule.setConsequenceLocation(offset(start.getLine()), start.getCharPositionInLine());
+ 		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
+ 		    location.setProperty( Location.LOCATION_RHS_CONTENT, rule.getConsequence() );
+                }
+	;
+
+name returns [String s]
+	:
+	( 
+	    tok=ID
+	    {
+	        s = tok.getText();
+	    }
+	|
+	    str=STRING
+	    {
+	       s = getString( str );
+	    }
+	)
+	;
+	
+identifier returns [Token tok]
+	:	
+	(       t=ID      
+	|	t=PACKAGE
+	|	t=FUNCTION
+	|	t=GLOBAL
+	|	t=IMPORT  
+	|	t=RULE
+	|	t=QUERY 
+        |       t=TEMPLATE        
+        |       t=ATTRIBUTES      
+        |       t=ENABLED         
+        |       t=SALIENCE 	
+        |       t=DURATION 	
+        |       t=FROM	        
+        |       t=ACCUMULATE 	
+        |       t=INIT	        
+        |       t=ACTION	        
+        |       t=RESULT	        
+        |       t=COLLECT         
+        |       t=OR	        
+        |       t=AND	        
+        |       t=CONTAINS 	
+        |       t=EXCLUDES 	
+        |       t=MEMBEROF
+        |       t=MATCHES         
+        |       t=NULL	        
+        |       t=EXISTS	        
+        |       t=NOT	        
+        |       t=EVAL	        
+        |       t=FORALL	            					
+        |       t=WHEN            
+        |       t=THEN	        
+        |       t=END     
+        |	t=IN        
+	) 
+	{
+	    tok = t;
+	}
+	;
+	
+WS      :       (	' '
+                |	'\t'
+                |	'\f'
+                |	EOL
+                )
+                { $channel=HIDDEN; }
+        ;
+
+fragment
+EOL 	:	     
+   		(       ( '\r\n' )=> '\r\n'  // Evil DOS
+                |       '\r'    // Macintosh
+                |       '\n'    // Unix (the right way)
+                )
+        ;  
+        
+INT	
+	:	('-')?('0'..'9')+
+		;
+
+FLOAT
+	:	('-')?('0'..'9')+ '.' ('0'..'9')+
+	;
+
+STRING
+    :  ('"' ( EscapeSequence | ~('\\'|'"') )* '"')
+     | ('\'' ( EscapeSequence | ~('\\'|'\'') )* '\'')
+    ;
+
+fragment
+HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ;
+
+fragment
+EscapeSequence
+    :   '\\' ('b'|'B'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\'|'.'|'o'|
+              'x'|'a'|'e'|'c'|'d'|'D'|'s'|'S'|'w'|'W'|'p'|'A'|
+              'G'|'Z'|'z'|'Q'|'E'|'*'|'['|']'|'('|')'|'$'|'^'|
+              '{'|'}'|'?'|'+'|'-'|'&'|'|')
+    |   UnicodeEscape
+    |   OctalEscape
+    ;
+
+fragment
+OctalEscape
+    :   '\\' ('0'..'3') ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7') ('0'..'7')
+    |   '\\' ('0'..'7')
+    ;
+
+fragment
+UnicodeEscape
+    :   '\\' 'u' HexDigit HexDigit HexDigit HexDigit
+    ;
+
+BOOL
+	:	('true'|'false') 
+	;	
+
+PACKAGE	:	'package';
+
+IMPORT	:	'import';
+
+FUNCTION :	'function';
+
+GLOBAL	:	'global';
+	
+RULE    :	'rule';
+
+QUERY	:	'query';
+
+TEMPLATE :	'template';
+
+ATTRIBUTES :	'attributes';
+	
+DATE_EFFECTIVE 
+	:	'date-effective';
+
+DATE_EXPIRES 
+	:	'date-expires';	
+	
+ENABLED :	'enabled';
+
+SALIENCE 
+	:	'salience';
+	
+NO_LOOP :	'no-loop';
+
+AUTO_FOCUS 
+	:	'auto-focus';
+	
+ACTIVATION_GROUP 
+	:	'activation-group';
+	
+AGENDA_GROUP 
+	:	'agenda-group';
+	
+DIALECT 
+	:	'dialect';	
+	
+RULEFLOW_GROUP 
+	:	'ruleflow-group';
+	
+DURATION 
+	:	'duration';
+	
+LOCK_ON_ACTIVE
+	:	'lock-on-active';	
+	
+FROM	:	'from';
+
+ACCUMULATE 
+	:	'accumulate';
+	
+INIT	:	'init';
+
+ACTION	:	'action';
+
+RESULT	:	'result';
+
+COLLECT :	'collect';
+
+OR	:	'or';
+
+AND	:	'and';
+
+CONTAINS 
+	:	'contains';
+	
+EXCLUDES 
+	:	'excludes';
+	
+MEMBEROF
+	:	'memberOf';
+
+MATCHES :	'matches';
+
+IN	:	'in';
+
+NULL	:	'null';
+
+EXISTS	:	'exists';
+
+NOT	:	'not';
+
+EVAL	:	'eval';
+
+FORALL	:	'forall';							
+
+WHEN    :	'when'; 
+
+THEN	:    	'then';
+
+END     :	'end';
+
+ID	
+	:	('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')* 
+	;
+		
+LEFT_PAREN
+        :	'('
+        ;
+
+RIGHT_PAREN
+        :	')'
+        ;
+        
+LEFT_SQUARE
+        :	'['
+        ;
+
+RIGHT_SQUARE
+        :	']'
+        ;        
+
+LEFT_CURLY
+        :	'{'
+        ;
+
+RIGHT_CURLY
+        :	'}'
+        ;
+        
+COMMA	:	','
+	;
+	
+DOUBLE_AMPER
+	:	'&&'
+	;
+	
+DOUBLE_PIPE
+	:	'||'
+	;				
+	
+SH_STYLE_SINGLE_LINE_COMMENT	
+	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
+                { $channel=HIDDEN; }
+	;
+        
+        
+C_STYLE_SINGLE_LINE_COMMENT	
+	:	'//' ( options{greedy=false;} : .)* EOL // ('\r')? '\n' 
+                { $channel=HIDDEN; }
+	;
+
+MULTI_LINE_COMMENT
+	:	'/*' (options{greedy=false;} : .)* '*/'
+                { $channel=HIDDEN; }
+	;
+
+MISC 	:
+		'!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+'  | '?' | '=' | '/' | '\'' | '\\' | '|' | '&'
+	;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/AssertedObject.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -18,4 +18,24 @@
     public AssertedObject() {
     }
 
+    public int hashCode() {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + ((value == null) ? 0 : value.hashCode());
+        return result;
+    }
+    
+    public boolean equals(Object obj) {
+        if ( this == obj ) return true;
+        if ( obj == null ) return false;
+        if ( getClass() != obj.getClass() ) return false;
+        final AssertedObject other = (AssertedObject) obj;
+        if ( value == null ) {
+            if ( other.value != null ) return false;
+        } else if ( !value.equals( other.value ) ) return false;
+        return true;
+    }
+    
+    
+
 }
\ No newline at end of file

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-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -38,8 +38,11 @@
 import org.drools.DroolsTestCase;
 import org.drools.FactHandle;
 import org.drools.Primitives;
+import org.drools.QueryResult;
+import org.drools.QueryResults;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
 import org.drools.WorkingMemory;
 import org.drools.common.ActivationGroupNode;
 import org.drools.common.InternalFactHandle;
@@ -62,8 +65,10 @@
 import org.drools.lang.descr.OrDescr;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.lang.descr.PredicateDescr;
+import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
 import org.drools.lang.descr.RuleDescr;
+import org.drools.lang.descr.VariableRestrictionDescr;
 import org.drools.reteoo.ReteooRuleBase;
 import org.drools.rule.Pattern;
 import org.drools.rule.Declaration;
@@ -840,7 +845,50 @@
         assertLength( 0,
                       builder.getErrors().getErrors() );
     }
+    
+    public void testQuery() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
 
+        final PackageDescr packageDescr = new PackageDescr( "p1" );
+        final QueryDescr queryDescr = new QueryDescr( "query1", new String[] { "$type" } );
+        
+        packageDescr.addRule( queryDescr );
+
+        final AndDescr lhs = new AndDescr();
+        queryDescr.setLhs( lhs );        
+
+        final PatternDescr pattern = new PatternDescr( Cheese.class.getName(),
+                                                       "stilton" );
+        lhs.addDescr( pattern );
+
+        final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
+        literalDescr.addRestriction( new VariableRestrictionDescr( "==",
+                                                                   "$type" ) );
+
+        pattern.addConstraint( literalDescr );
+
+        queryDescr.setConsequence( "modify(stilton);" );
+
+        builder.addPackage( packageDescr );
+
+        assertLength( 0,
+                      builder.getErrors().getErrors() );
+        
+        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        ruleBase.addPackage( builder.getPackage() );
+        
+        StatefulSession session = ruleBase.newStatefulSession();
+        
+        session.assertObject( new Cheese( "stilton", 15) );
+        
+        QueryResults results = session.getQueryResults( "query1", new Object[] { "stilton" } );
+        assertEquals( 1, results.size() );
+        Object object = results.get( 0 ).get( 0 );
+        assertEquals( new Cheese( "stilton", 15),  object);
+        
+        results = session.getQueryResults( "query1", new Object[] { "cheddar" } );                       
+    }    
+
     public void testDuplicateRuleNames() throws Exception {
 
         final PackageBuilder builder = new PackageBuilder();

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-06-03 01:41:53 UTC (rev 12298)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-06-03 01:43:29 UTC (rev 12299)
@@ -1652,24 +1652,36 @@
         workingMemory.fireAllRules();
 
         final QueryResults results = workingMemory.getQueryResults( "assertedobjquery" );
-
-        if ( results == null || !results.iterator().hasNext() ) {
-            Assert.fail( "The stated query should return a result" );
-        } else {
-            int counter = 0;
-            for ( final Iterator it = results.iterator(); it.hasNext(); ) {
-                final QueryResult result = (QueryResult) it.next();;
-                final AssertedObject assertedObject = (AssertedObject) result.get( "assertedobj" );
-                Assert.assertNotNull( "Query result is not expected to be null",
-                                      assertedObject );
-                counter++;
-            }
-            Assert.assertEquals( "Expecting a single result from the query",
-                                 1,
-                                 counter );
-        }
+        assertEquals( 1, results.size() );
+        assertEquals( new AssertedObject( "value1"), results.get( 0 ).get( 0 ) );        
     }
 
+    public void testQueryWithParams() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_QueryWithParams.drl" ) ) );
+
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( builder.getPackage() );
+
+        final WorkingMemory workingMemory = ruleBase.newStatefulSession();
+        workingMemory.fireAllRules();
+
+        QueryResults results = workingMemory.getQueryResults( "assertedobjquery", new String[] { "value1" } );
+        assertEquals( 1, results.size() );
+        assertEquals( new AssertedObject( "value1"), results.get( 0 ).get( 0 ) );
+        
+        results = workingMemory.getQueryResults( "assertedobjquery", new String[] { "value3" } );
+        assertEquals( 0, results.size() );       
+        
+        results = workingMemory.getQueryResults( "assertedobjquery2", new String[] { null, "value2" } );
+        assertEquals( 1, results.size() );
+        assertEquals( new AssertedObject( "value2"), results.get( 0 ).get( 0 ) );
+        
+        results = workingMemory.getQueryResults( "assertedobjquery2", new String[] { "value3", "value2" } );
+        assertEquals( 1, results.size() );
+        assertEquals( new AssertedObject( "value2"), results.get( 0 ).get( 0 ) );        
+    }    
+    
     public void testTwoQuerries() throws Exception {
         // @see JBRULES-410 More than one Query definition causes an incorrect
         // Rete network to be built.
@@ -1898,7 +1910,7 @@
         queryResults = workingMemory.getQueryResults( "2 persons with the same status" );
         assertEquals( 2,
                       queryResults.size() );
-    }
+    }    
 
     public void testFunctionWithPrimitives() throws Exception {
         final PackageBuilder builder = new PackageBuilder();

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_QueryWithParams.drl	2007-06-03 01:43:29 UTC (rev 12299)
@@ -0,0 +1,18 @@
+package org.drools.integrationtests;
+
+import org.drools.AssertedObject;
+
+rule rule1
+  when
+  then
+    assert( new AssertedObject( "value1") );
+    assert( new AssertedObject( "value2") );
+end
+
+query "assertedobjquery" ( $value )
+    assertedobj : AssertedObject( value == $value )
+end 
+
+query "assertedobjquery2" ( $value1, $value2 )
+    assertedobj : AssertedObject( value == $value2 )
+end 
\ No newline at end of file




More information about the jboss-svn-commits mailing list