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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Oct 17 15:12:31 EDT 2008


Author: tirelli
Date: 2008-10-17 15:12:30 -0400 (Fri, 17 Oct 2008)
New Revision: 23500

Added:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/EnabledBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_enabled_expression.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/Dialect.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/DescrBuilderTree.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.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/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/TemporalDistanceTest.java
Log:
JBRULES-1805: adding support to 'enabled' expressions

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/Dialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/Dialect.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/Dialect.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -4,16 +4,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.base.ClassFieldAccessorCache;
 import org.drools.base.TypeResolver;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.FunctionDescr;
 import org.drools.lang.descr.ProcessDescr;
 import org.drools.lang.descr.RuleDescr;
-import org.drools.rule.Package;
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.ActionBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EnabledBuilder;
 import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.PackageBuildContext;
@@ -50,6 +49,8 @@
 
     SalienceBuilder getSalienceBuilder();
 
+    EnabledBuilder getEnabledBuilder();
+
     PatternBuilder getPatternBuilder();
 
     QueryBuilder getQueryBuilder();

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-16 18:53:59
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-17 12:12:28
 
 	package org.drools.lang;
 
@@ -10,134 +10,134 @@
 import java.util.Map;
 import java.util.HashMap;
 public class DRLLexer extends Lexer {
-    public static final int VT_ACCESSOR_ELEMENT=37;
-    public static final int ACCUMULATE=101;
-    public static final int VT_DATA_TYPE=38;
-    public static final int DOT_STAR=85;
+    public static final int COMMA=89;
+    public static final int VT_PATTERN_TYPE=39;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_DIALECT=54;
     public static final int VK_FUNCTION=64;
-    public static final int VK_GLOBAL=65;
-    public static final int VK_AND=76;
-    public static final int EQUALS=93;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int END=86;
+    public static final int HexDigit=123;
+    public static final int VK_ATTRIBUTES=57;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int MISC=119;
+    public static final int VT_AND_PREFIX=23;
+    public static final int VK_QUERY=62;
+    public static final int THEN=116;
     public static final int VK_AUTO_FOCUS=49;
-    public static final int VK_SALIENCE=55;
-    public static final int EOF=-1;
-    public static final int VT_PATTERN_TYPE=39;
-    public static final int VT_FUNCTION_IMPORT=5;
-    public static final int VT_OR_INFIX=26;
-    public static final int DOUBLE_AMPER=98;
-    public static final int EOL=120;
-    public static final int GREATER=106;
+    public static final int DOT=84;
     public static final int VK_IMPORT=59;
-    public static final int NOT_EQUAL=110;
-    public static final int VK_ACTION=79;
-    public static final int VK_RULE=58;
-    public static final int VK_MEMBEROF=71;
-    public static final int LESS=108;
-    public static final int GRAVE_ACCENT=111;
     public static final int VT_SLOT=15;
-    public static final int VK_OR=75;
-    public static final int VT_AND_PREFIX=23;
-    public static final int NULL=113;
-    public static final int BOOL=95;
-    public static final int VK_QUERY=62;
-    public static final int SEMICOLON=82;
-    public static final int INT=96;
-    public static final int VT_FUNCTION_ID=43;
-    public static final int VT_RHS_CHUNK=17;
-    public static final int VT_FACT_BINDING=32;
-    public static final int VK_ENTRY_POINT=72;
-    public static final int VK_RULEFLOW_GROUP=52;
-    public static final int VK_RESULT=81;
     public static final int VT_PACKAGE_ID=40;
+    public static final int LEFT_SQUARE=114;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int VT_DATA_TYPE=38;
+    public static final int VK_MATCHES=68;
+    public static final int VT_FACT=6;
+    public static final int LEFT_CURLY=117;
+    public static final int AT=91;
+    public static final int LEFT_PAREN=88;
+    public static final int DOUBLE_AMPER=98;
+    public static final int VT_QUERY_ID=9;
+    public static final int VT_ACCESSOR_PATH=36;
     public static final int VT_LABEL=8;
+    public static final int WHEN=94;
+    public static final int VT_ENTRYPOINT_ID=13;
+    public static final int VK_SOUNDSLIKE=70;
+    public static final int VK_SALIENCE=55;
+    public static final int VT_FIELD=35;
     public static final int WS=121;
-    public static final int VK_NO_LOOP=48;
-    public static final int LEFT_CURLY=117;
-    public static final int VT_FACT=6;
-    public static final int VT_PATTERN=31;
-    public static final int VK_IN=74;
-    public static final int LEFT_PAREN=88;
-    public static final int LESS_EQUAL=109;
-    public static final int VT_IMPORT_ID=41;
-    public static final int VT_RULE_ID=12;
-    public static final int MISC=119;
-    public static final int FROM=99;
-    public static final int END=86;
+    public static final int OVER=100;
+    public static final int STRING=87;
+    public static final int VK_AND=76;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
+    public static final int VT_BEHAVIOR=21;
+    public static final int GRAVE_ACCENT=111;
+    public static final int VK_DURATION=53;
+    public static final int VT_SQUARE_CHUNK=19;
+    public static final int VK_FORALL=78;
+    public static final int VT_PAREN_CHUNK=20;
+    public static final int VT_COMPILATION_UNIT=4;
     public static final int COLLECT=103;
-    public static final int INIT=102;
-    public static final int EscapeSequence=122;
-    public static final int VK_ACTIVATION_GROUP=50;
     public static final int VK_ENABLED=56;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    public static final int EQUALS=93;
+    public static final int VK_RESULT=81;
+    public static final int UnicodeEscape=124;
     public static final int VK_PACKAGE=60;
-    public static final int OVER=100;
+    public static final int VT_RULE_ID=12;
+    public static final int EQUAL=105;
+    public static final int VK_NO_LOOP=48;
+    public static final int SEMICOLON=82;
+    public static final int VK_TEMPLATE=61;
+    public static final int VT_AND_IMPLICIT=22;
+    public static final int NULL=113;
+    public static final int COLON=92;
+    public static final int MULTI_LINE_COMMENT=128;
+    public static final int VT_RULE_ATTRIBUTES=16;
     public static final int RIGHT_SQUARE=115;
-    public static final int RIGHT_CURLY=118;
-    public static final int VK_MATCHES=68;
+    public static final int VK_AGENDA_GROUP=51;
     public static final int VT_FACT_OR=33;
-    public static final int VT_FIELD=35;
+    public static final int VK_NOT=73;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ARROW=104;
     public static final int FLOAT=112;
-    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int INIT=102;
+    public static final int VT_SLOT_ID=14;
+    public static final int VT_CURLY_CHUNK=18;
+    public static final int VT_OR_PREFIX=24;
+    public static final int DOUBLE_PIPE=97;
+    public static final int LESS=108;
+    public static final int VT_TYPE_DECLARE_ID=11;
+    public static final int VT_PATTERN=31;
+    public static final int VK_DATE_EFFECTIVE=45;
+    public static final int EscapeSequence=122;
     public static final int VK_EXISTS=77;
-    public static final int VK_DATE_EXPIRES=46;
+    public static final int INT=96;
+    public static final int VT_BIND_FIELD=34;
+    public static final int VK_RULE=58;
+    public static final int VK_EVAL=66;
+    public static final int GREATER=106;
+    public static final int VT_FACT_BINDING=32;
     public static final int ID=83;
-    public static final int HexDigit=123;
-    public static final int VT_OR_PREFIX=24;
-    public static final int VK_EVAL=66;
-    public static final int DOUBLE_PIPE=97;
-    public static final int AT=91;
-    public static final int RIGHT_PAREN=90;
-    public static final int THEN=116;
-    public static final int VT_COMPILATION_UNIT=4;
-    public static final int VT_EXPRESSION_CHAIN=30;
-    public static final int COMMA=89;
-    public static final int EQUAL=105;
-    public static final int VT_BEHAVIOR=21;
-    public static final int VT_QUERY_ID=9;
-    public static final int VK_DIALECT=54;
-    public static final int DOT=84;
-    public static final int VT_GLOBAL_ID=42;
-    public static final int VK_NOT=73;
+    public static final int FROM=99;
+    public static final int NOT_EQUAL=110;
+    public static final int RIGHT_CURLY=118;
+    public static final int VK_ENTRY_POINT=72;
+    public static final int VT_PARAM_LIST=44;
+    public static final int VT_AND_INFIX=25;
+    public static final int BOOL=95;
     public static final int VT_FROM_SOURCE=29;
-    public static final int VK_DECLARE=63;
-    public static final int VT_ENTRYPOINT_ID=13;
-    public static final int VT_PAREN_CHUNK=20;
     public static final int VK_CONTAINS=67;
-    public static final int VT_TYPE_DECLARE_ID=11;
-    public static final int VK_REVERSE=80;
     public static final int VK_LOCK_ON_ACTIVE=47;
-    public static final int VK_TEMPLATE=61;
-    public static final int VK_DURATION=53;
-    public static final int VT_RULE_ATTRIBUTES=16;
-    public static final int VT_AND_INFIX=25;
+    public static final int VT_FUNCTION_IMPORT=5;
+    public static final int VK_IN=74;
+    public static final int VT_RHS_CHUNK=17;
+    public static final int VK_MEMBEROF=71;
+    public static final int GREATER_EQUAL=107;
+    public static final int VT_OR_INFIX=26;
+    public static final int DOT_STAR=85;
+    public static final int VK_OR=75;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int LESS_EQUAL=109;
+    public static final int ACCUMULATE=101;
+    public static final int VK_RULEFLOW_GROUP=52;
+    public static final int VT_FUNCTION_ID=43;
+    public static final int EOF=-1;
+    public static final int VT_CONSTRAINTS=7;
+    public static final int VT_IMPORT_ID=41;
+    public static final int EOL=120;
+    public static final int VK_ACTIVATION_GROUP=50;
     public static final int Tokens=129;
-    public static final int VT_ACCESSOR_PATH=36;
-    public static final int MULTI_LINE_COMMENT=128;
-    public static final int VK_FORALL=78;
-    public static final int COLON=92;
+    public static final int OctalEscape=125;
+    public static final int VK_ACTION=79;
     public static final int VK_EXCLUDES=69;
-    public static final int VK_SOUNDSLIKE=70;
-    public static final int VT_AND_IMPLICIT=22;
-    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
-    public static final int VT_CURLY_CHUNK=18;
-    public static final int VT_SLOT_ID=14;
-    public static final int VK_ATTRIBUTES=57;
-    public static final int WHEN=94;
-    public static final int UnicodeEscape=124;
-    public static final int VT_SQUARE_CHUNK=19;
-    public static final int VK_DATE_EFFECTIVE=45;
+    public static final int RIGHT_PAREN=90;
     public static final int VT_TEMPLATE_ID=10;
-    public static final int VT_PARAM_LIST=44;
-    public static final int ARROW=104;
-    public static final int VT_BIND_FIELD=34;
-    public static final int VK_AGENDA_GROUP=51;
-    public static final int VT_CONSTRAINTS=7;
-    public static final int LEFT_SQUARE=114;
-    public static final int GREATER_EQUAL=107;
-    public static final int OctalEscape=125;
-    public static final int STRING=87;
-
+    public static final int VK_DECLARE=63;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    
     	/** The standard method called to automatically emit a token at the
     	 *  outermost lexical rule.  The token object should point into the
     	 *  char buffer start..stop.  If there is a text override in 'text',
@@ -152,7 +152,7 @@
     		emit(t);
     		return t;
     	}
-
+    
     	/** Overrided this method to not output mesages */
     	public void emitErrorMessage(String msg) {
     	}
@@ -168,10 +168,10 @@
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // src/main/resources/org/drools/lang/DRL.g:1684:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-            // src/main/resources/org/drools/lang/DRL.g:1684:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // src/main/resources/org/drools/lang/DRL.g:1686:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1686:17: ( ' ' | '\\t' | '\\f' | EOL )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1684:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // src/main/resources/org/drools/lang/DRL.g:1686:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -203,28 +203,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1684:19: ' '
+            	    // src/main/resources/org/drools/lang/DRL.g:1686:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1685:19: '\\t'
+            	    // src/main/resources/org/drools/lang/DRL.g:1687:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1686:19: '\\f'
+            	    // src/main/resources/org/drools/lang/DRL.g:1688:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1687:19: EOL
+            	    // src/main/resources/org/drools/lang/DRL.g:1689:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -257,10 +257,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1693:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // src/main/resources/org/drools/lang/DRL.g:1694:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // src/main/resources/org/drools/lang/DRL.g:1695:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1696:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // src/main/resources/org/drools/lang/DRL.g:1694:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // src/main/resources/org/drools/lang/DRL.g:1696:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -279,13 +279,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1694:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1696:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1694:14: ( '\\r\\n' )=> '\\r\\n'
+                    // src/main/resources/org/drools/lang/DRL.g:1696:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -293,14 +293,14 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1695:25: '\\r'
+                    // src/main/resources/org/drools/lang/DRL.g:1697:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1696:25: '\\n'
+                    // src/main/resources/org/drools/lang/DRL.g:1698:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -322,10 +322,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // src/main/resources/org/drools/lang/DRL.g:1701:2: ( ( '-' )? ( '0' .. '9' )+ )
-            // src/main/resources/org/drools/lang/DRL.g:1701:4: ( '-' )? ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1703:2: ( ( '-' )? ( '0' .. '9' )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1703:4: ( '-' )? ( '0' .. '9' )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1701:4: ( '-' )?
+            // src/main/resources/org/drools/lang/DRL.g:1703:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -334,7 +334,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1701:5: '-'
+                    // src/main/resources/org/drools/lang/DRL.g:1703:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -343,7 +343,7 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1701:10: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1703:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -357,7 +357,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1701:11: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1703:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -388,10 +388,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // src/main/resources/org/drools/lang/DRL.g:1705:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // src/main/resources/org/drools/lang/DRL.g:1705:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1707:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1707:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1705:4: ( '-' )?
+            // src/main/resources/org/drools/lang/DRL.g:1707:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -400,7 +400,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1705:5: '-'
+                    // src/main/resources/org/drools/lang/DRL.g:1707:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -409,7 +409,7 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1705:10: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1707:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -423,7 +423,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1705:11: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1707:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -441,7 +441,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // src/main/resources/org/drools/lang/DRL.g:1705:26: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1707:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -455,7 +455,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1705:27: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1707:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -486,7 +486,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // src/main/resources/org/drools/lang/DRL.g:1709:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1711:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -499,19 +499,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1708:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1710:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1709:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // src/main/resources/org/drools/lang/DRL.g:1711:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:1709:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // src/main/resources/org/drools/lang/DRL.g:1709:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // src/main/resources/org/drools/lang/DRL.g:1711:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // src/main/resources/org/drools/lang/DRL.g:1711:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1709:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:1711:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -527,14 +527,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1709:15: EscapeSequence
+                    	    // src/main/resources/org/drools/lang/DRL.g:1711:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1709:32: ~ ( '\\\\' | '\"' )
+                    	    // src/main/resources/org/drools/lang/DRL.g:1711:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -564,13 +564,13 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1710:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // src/main/resources/org/drools/lang/DRL.g:1712:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:1710:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // src/main/resources/org/drools/lang/DRL.g:1710:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // src/main/resources/org/drools/lang/DRL.g:1712:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // src/main/resources/org/drools/lang/DRL.g:1712:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1710:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:1712:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -586,14 +586,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1710:16: EscapeSequence
+                    	    // src/main/resources/org/drools/lang/DRL.g:1712:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1710:33: ~ ( '\\\\' | '\\'' )
+                    	    // src/main/resources/org/drools/lang/DRL.g:1712:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -634,8 +634,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1714:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // src/main/resources/org/drools/lang/DRL.g:1714:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // src/main/resources/org/drools/lang/DRL.g:1716:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1716: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();
@@ -660,17 +660,12 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1718:5: ( '\\\\' ( '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 )
+            // src/main/resources/org/drools/lang/DRL.g:1720:5: ( '\\\\' ( '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 '&':
@@ -717,6 +712,11 @@
                     alt11=1;
                     }
                     break;
+                case 'u':
+                    {
+                    alt11=2;
+                    }
+                    break;
                 case '0':
                 case '1':
                 case '2':
@@ -732,7 +732,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1716: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("1718: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;
                 }
@@ -741,13 +741,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1716: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("1718: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 :
-                    // src/main/resources/org/drools/lang/DRL.g:1718: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' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+                    // src/main/resources/org/drools/lang/DRL.g:1720: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)<='}') ) {
@@ -765,14 +765,14 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1722:9: UnicodeEscape
+                    // src/main/resources/org/drools/lang/DRL.g:1724:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1723:9: OctalEscape
+                    // src/main/resources/org/drools/lang/DRL.g:1725:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -789,7 +789,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1728:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1730:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -800,9 +800,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 {
@@ -823,7 +823,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1726:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1728:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -831,31 +831,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1726:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1728:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
 
                 throw nvae;
             }
             switch (alt12) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1728:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1730:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1728:14: ( '0' .. '3' )
-                    // src/main/resources/org/drools/lang/DRL.g:1728:15: '0' .. '3'
+                    // src/main/resources/org/drools/lang/DRL.g:1730:14: ( '0' .. '3' )
+                    // src/main/resources/org/drools/lang/DRL.g:1730:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1728:25: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1728:26: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1730:25: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1730:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1728:36: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1728:37: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1730:36: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1730:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -865,18 +865,18 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1729:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1731:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1729:14: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1729:15: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1731:14: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1731:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1729:25: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1729:26: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1731:25: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1731:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -886,11 +886,11 @@
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1730:9: '\\\\' ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1732:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1730:14: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1730:15: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1732:14: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1732:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -910,8 +910,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1735:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // src/main/resources/org/drools/lang/DRL.g:1735:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // src/main/resources/org/drools/lang/DRL.g:1737:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // src/main/resources/org/drools/lang/DRL.g:1737:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -932,10 +932,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // src/main/resources/org/drools/lang/DRL.g:1739:2: ( ( 'true' | 'false' ) )
-            // src/main/resources/org/drools/lang/DRL.g:1739:4: ( 'true' | 'false' )
+            // src/main/resources/org/drools/lang/DRL.g:1741:2: ( ( 'true' | 'false' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1741:4: ( 'true' | 'false' )
             {
-            // src/main/resources/org/drools/lang/DRL.g:1739:4: ( 'true' | 'false' )
+            // src/main/resources/org/drools/lang/DRL.g:1741:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -948,13 +948,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1739:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1741:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1739:5: 'true'
+                    // src/main/resources/org/drools/lang/DRL.g:1741:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -962,7 +962,7 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1739:12: 'false'
+                    // src/main/resources/org/drools/lang/DRL.g:1741:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -986,8 +986,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // src/main/resources/org/drools/lang/DRL.g:1743:2: ( 'accumulate' )
-            // src/main/resources/org/drools/lang/DRL.g:1743:4: 'accumulate'
+            // src/main/resources/org/drools/lang/DRL.g:1745:2: ( 'accumulate' )
+            // src/main/resources/org/drools/lang/DRL.g:1745:4: 'accumulate'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1005,8 +1005,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // src/main/resources/org/drools/lang/DRL.g:1747:2: ( 'collect' )
-            // src/main/resources/org/drools/lang/DRL.g:1747:4: 'collect'
+            // src/main/resources/org/drools/lang/DRL.g:1749:2: ( 'collect' )
+            // src/main/resources/org/drools/lang/DRL.g:1749:4: 'collect'
             {
             match("collect"); if (failed) return ;
 
@@ -1024,8 +1024,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // src/main/resources/org/drools/lang/DRL.g:1750:5: ( 'end' )
-            // src/main/resources/org/drools/lang/DRL.g:1750:7: 'end'
+            // src/main/resources/org/drools/lang/DRL.g:1752:5: ( 'end' )
+            // src/main/resources/org/drools/lang/DRL.g:1752:7: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -1043,8 +1043,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // src/main/resources/org/drools/lang/DRL.g:1754:2: ( 'from' )
-            // src/main/resources/org/drools/lang/DRL.g:1754:4: 'from'
+            // src/main/resources/org/drools/lang/DRL.g:1756:2: ( 'from' )
+            // src/main/resources/org/drools/lang/DRL.g:1756:4: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -1062,8 +1062,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // src/main/resources/org/drools/lang/DRL.g:1758:2: ( 'init' )
-            // src/main/resources/org/drools/lang/DRL.g:1758:4: 'init'
+            // src/main/resources/org/drools/lang/DRL.g:1760:2: ( 'init' )
+            // src/main/resources/org/drools/lang/DRL.g:1760:4: 'init'
             {
             match("init"); if (failed) return ;
 
@@ -1081,8 +1081,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // src/main/resources/org/drools/lang/DRL.g:1762:2: ( 'null' )
-            // src/main/resources/org/drools/lang/DRL.g:1762:4: 'null'
+            // src/main/resources/org/drools/lang/DRL.g:1764:2: ( 'null' )
+            // src/main/resources/org/drools/lang/DRL.g:1764:4: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1100,8 +1100,8 @@
     public final void mOVER() throws RecognitionException {
         try {
             int _type = OVER;
-            // src/main/resources/org/drools/lang/DRL.g:1766:2: ( 'over' )
-            // src/main/resources/org/drools/lang/DRL.g:1766:4: 'over'
+            // src/main/resources/org/drools/lang/DRL.g:1768:2: ( 'over' )
+            // src/main/resources/org/drools/lang/DRL.g:1768:4: 'over'
             {
             match("over"); if (failed) return ;
 
@@ -1119,8 +1119,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // src/main/resources/org/drools/lang/DRL.g:1770:2: ( 'then' )
-            // src/main/resources/org/drools/lang/DRL.g:1770:4: 'then'
+            // src/main/resources/org/drools/lang/DRL.g:1772:2: ( 'then' )
+            // src/main/resources/org/drools/lang/DRL.g:1772:4: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1138,8 +1138,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // src/main/resources/org/drools/lang/DRL.g:1774:2: ( 'when' )
-            // src/main/resources/org/drools/lang/DRL.g:1774:4: 'when'
+            // src/main/resources/org/drools/lang/DRL.g:1776:2: ( 'when' )
+            // src/main/resources/org/drools/lang/DRL.g:1776:4: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -1157,8 +1157,8 @@
     public final void mGRAVE_ACCENT() throws RecognitionException {
         try {
             int _type = GRAVE_ACCENT;
-            // src/main/resources/org/drools/lang/DRL.g:1778:2: ( '`' )
-            // src/main/resources/org/drools/lang/DRL.g:1778:4: '`'
+            // src/main/resources/org/drools/lang/DRL.g:1780:2: ( '`' )
+            // src/main/resources/org/drools/lang/DRL.g:1780:4: '`'
             {
             match('`'); if (failed) return ;
 
@@ -1175,8 +1175,8 @@
     public final void mAT() throws RecognitionException {
         try {
             int _type = AT;
-            // src/main/resources/org/drools/lang/DRL.g:1781:4: ( '@' )
-            // src/main/resources/org/drools/lang/DRL.g:1781:6: '@'
+            // src/main/resources/org/drools/lang/DRL.g:1783:4: ( '@' )
+            // src/main/resources/org/drools/lang/DRL.g:1783:6: '@'
             {
             match('@'); if (failed) return ;
 
@@ -1193,8 +1193,8 @@
     public final void mEQUALS() throws RecognitionException {
         try {
             int _type = EQUALS;
-            // src/main/resources/org/drools/lang/DRL.g:1785:2: ( '=' )
-            // src/main/resources/org/drools/lang/DRL.g:1785:4: '='
+            // src/main/resources/org/drools/lang/DRL.g:1787:2: ( '=' )
+            // src/main/resources/org/drools/lang/DRL.g:1787:4: '='
             {
             match('='); if (failed) return ;
 
@@ -1211,8 +1211,8 @@
     public final void mSEMICOLON() throws RecognitionException {
         try {
             int _type = SEMICOLON;
-            // src/main/resources/org/drools/lang/DRL.g:1789:2: ( ';' )
-            // src/main/resources/org/drools/lang/DRL.g:1789:4: ';'
+            // src/main/resources/org/drools/lang/DRL.g:1791:2: ( ';' )
+            // src/main/resources/org/drools/lang/DRL.g:1791:4: ';'
             {
             match(';'); if (failed) return ;
 
@@ -1229,8 +1229,8 @@
     public final void mDOT_STAR() throws RecognitionException {
         try {
             int _type = DOT_STAR;
-            // src/main/resources/org/drools/lang/DRL.g:1793:2: ( '.*' )
-            // src/main/resources/org/drools/lang/DRL.g:1793:4: '.*'
+            // src/main/resources/org/drools/lang/DRL.g:1795:2: ( '.*' )
+            // src/main/resources/org/drools/lang/DRL.g:1795:4: '.*'
             {
             match(".*"); if (failed) return ;
 
@@ -1248,8 +1248,8 @@
     public final void mCOLON() throws RecognitionException {
         try {
             int _type = COLON;
-            // src/main/resources/org/drools/lang/DRL.g:1797:2: ( ':' )
-            // src/main/resources/org/drools/lang/DRL.g:1797:4: ':'
+            // src/main/resources/org/drools/lang/DRL.g:1799:2: ( ':' )
+            // src/main/resources/org/drools/lang/DRL.g:1799:4: ':'
             {
             match(':'); if (failed) return ;
 
@@ -1266,8 +1266,8 @@
     public final void mEQUAL() throws RecognitionException {
         try {
             int _type = EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1801:2: ( '==' )
-            // src/main/resources/org/drools/lang/DRL.g:1801:4: '=='
+            // src/main/resources/org/drools/lang/DRL.g:1803:2: ( '==' )
+            // src/main/resources/org/drools/lang/DRL.g:1803:4: '=='
             {
             match("=="); if (failed) return ;
 
@@ -1285,8 +1285,8 @@
     public final void mNOT_EQUAL() throws RecognitionException {
         try {
             int _type = NOT_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1805:2: ( '!=' )
-            // src/main/resources/org/drools/lang/DRL.g:1805:4: '!='
+            // src/main/resources/org/drools/lang/DRL.g:1807:2: ( '!=' )
+            // src/main/resources/org/drools/lang/DRL.g:1807:4: '!='
             {
             match("!="); if (failed) return ;
 
@@ -1304,8 +1304,8 @@
     public final void mGREATER() throws RecognitionException {
         try {
             int _type = GREATER;
-            // src/main/resources/org/drools/lang/DRL.g:1809:2: ( '>' )
-            // src/main/resources/org/drools/lang/DRL.g:1809:4: '>'
+            // src/main/resources/org/drools/lang/DRL.g:1811:2: ( '>' )
+            // src/main/resources/org/drools/lang/DRL.g:1811:4: '>'
             {
             match('>'); if (failed) return ;
 
@@ -1322,8 +1322,8 @@
     public final void mGREATER_EQUAL() throws RecognitionException {
         try {
             int _type = GREATER_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1813:2: ( '>=' )
-            // src/main/resources/org/drools/lang/DRL.g:1813:4: '>='
+            // src/main/resources/org/drools/lang/DRL.g:1815:2: ( '>=' )
+            // src/main/resources/org/drools/lang/DRL.g:1815:4: '>='
             {
             match(">="); if (failed) return ;
 
@@ -1341,8 +1341,8 @@
     public final void mLESS() throws RecognitionException {
         try {
             int _type = LESS;
-            // src/main/resources/org/drools/lang/DRL.g:1817:2: ( '<' )
-            // src/main/resources/org/drools/lang/DRL.g:1817:4: '<'
+            // src/main/resources/org/drools/lang/DRL.g:1819:2: ( '<' )
+            // src/main/resources/org/drools/lang/DRL.g:1819:4: '<'
             {
             match('<'); if (failed) return ;
 
@@ -1359,8 +1359,8 @@
     public final void mLESS_EQUAL() throws RecognitionException {
         try {
             int _type = LESS_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1821:2: ( '<=' )
-            // src/main/resources/org/drools/lang/DRL.g:1821:4: '<='
+            // src/main/resources/org/drools/lang/DRL.g:1823:2: ( '<=' )
+            // src/main/resources/org/drools/lang/DRL.g:1823:4: '<='
             {
             match("<="); if (failed) return ;
 
@@ -1378,8 +1378,8 @@
     public final void mARROW() throws RecognitionException {
         try {
             int _type = ARROW;
-            // src/main/resources/org/drools/lang/DRL.g:1825:2: ( '->' )
-            // src/main/resources/org/drools/lang/DRL.g:1825:4: '->'
+            // src/main/resources/org/drools/lang/DRL.g:1827:2: ( '->' )
+            // src/main/resources/org/drools/lang/DRL.g:1827:4: '->'
             {
             match("->"); if (failed) return ;
 
@@ -1397,7 +1397,7 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // src/main/resources/org/drools/lang/DRL.g:1829:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* | '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%' )
+            // src/main/resources/org/drools/lang/DRL.g:1831:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* | '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%' )
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -1410,13 +1410,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1828:1: ID : ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* | '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%' );", 16, 0, input);
+                    new NoViableAltException("1830:1: ID : ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* | '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%' );", 16, 0, input);
 
                 throw nvae;
             }
             switch (alt16) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1829:4: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+                    // src/main/resources/org/drools/lang/DRL.g:1831: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();
@@ -1429,7 +1429,7 @@
                         recover(mse);    throw mse;
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1829:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+                    // src/main/resources/org/drools/lang/DRL.g:1831:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
                     loop14:
                     do {
                         int alt14=2;
@@ -1468,7 +1468,7 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1830:4: '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%'
+                    // src/main/resources/org/drools/lang/DRL.g:1832:4: '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%'
                     {
                     match('%'); if (failed) return ;
                     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') ) {
@@ -1482,7 +1482,7 @@
                         recover(mse);    throw mse;
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1830:54: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+
+                    // src/main/resources/org/drools/lang/DRL.g:1832:54: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+
                     int cnt15=0;
                     loop15:
                     do {
@@ -1543,8 +1543,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // src/main/resources/org/drools/lang/DRL.g:1835:9: ( '(' )
-            // src/main/resources/org/drools/lang/DRL.g:1835:11: '('
+            // src/main/resources/org/drools/lang/DRL.g:1837:9: ( '(' )
+            // src/main/resources/org/drools/lang/DRL.g:1837:11: '('
             {
             match('('); if (failed) return ;
 
@@ -1561,8 +1561,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // src/main/resources/org/drools/lang/DRL.g:1839:9: ( ')' )
-            // src/main/resources/org/drools/lang/DRL.g:1839:11: ')'
+            // src/main/resources/org/drools/lang/DRL.g:1841:9: ( ')' )
+            // src/main/resources/org/drools/lang/DRL.g:1841:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -1579,8 +1579,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // src/main/resources/org/drools/lang/DRL.g:1843:9: ( '[' )
-            // src/main/resources/org/drools/lang/DRL.g:1843:11: '['
+            // src/main/resources/org/drools/lang/DRL.g:1845:9: ( '[' )
+            // src/main/resources/org/drools/lang/DRL.g:1845:11: '['
             {
             match('['); if (failed) return ;
 
@@ -1597,8 +1597,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // src/main/resources/org/drools/lang/DRL.g:1847:9: ( ']' )
-            // src/main/resources/org/drools/lang/DRL.g:1847:11: ']'
+            // src/main/resources/org/drools/lang/DRL.g:1849:9: ( ']' )
+            // src/main/resources/org/drools/lang/DRL.g:1849:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -1615,8 +1615,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // src/main/resources/org/drools/lang/DRL.g:1851:9: ( '{' )
-            // src/main/resources/org/drools/lang/DRL.g:1851:11: '{'
+            // src/main/resources/org/drools/lang/DRL.g:1853:9: ( '{' )
+            // src/main/resources/org/drools/lang/DRL.g:1853:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -1633,8 +1633,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // src/main/resources/org/drools/lang/DRL.g:1855:9: ( '}' )
-            // src/main/resources/org/drools/lang/DRL.g:1855:11: '}'
+            // src/main/resources/org/drools/lang/DRL.g:1857:9: ( '}' )
+            // src/main/resources/org/drools/lang/DRL.g:1857:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -1651,8 +1651,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // src/main/resources/org/drools/lang/DRL.g:1858:7: ( ',' )
-            // src/main/resources/org/drools/lang/DRL.g:1858:9: ','
+            // src/main/resources/org/drools/lang/DRL.g:1860:7: ( ',' )
+            // src/main/resources/org/drools/lang/DRL.g:1860:9: ','
             {
             match(','); if (failed) return ;
 
@@ -1669,8 +1669,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // src/main/resources/org/drools/lang/DRL.g:1861:5: ( '.' )
-            // src/main/resources/org/drools/lang/DRL.g:1861:7: '.'
+            // src/main/resources/org/drools/lang/DRL.g:1863:5: ( '.' )
+            // src/main/resources/org/drools/lang/DRL.g:1863:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -1687,8 +1687,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // src/main/resources/org/drools/lang/DRL.g:1865:2: ( '&&' )
-            // src/main/resources/org/drools/lang/DRL.g:1865:4: '&&'
+            // src/main/resources/org/drools/lang/DRL.g:1867:2: ( '&&' )
+            // src/main/resources/org/drools/lang/DRL.g:1867:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -1706,8 +1706,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // src/main/resources/org/drools/lang/DRL.g:1869:2: ( '||' )
-            // src/main/resources/org/drools/lang/DRL.g:1869:4: '||'
+            // src/main/resources/org/drools/lang/DRL.g:1871:2: ( '||' )
+            // src/main/resources/org/drools/lang/DRL.g:1871:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -1725,11 +1725,11 @@
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // src/main/resources/org/drools/lang/DRL.g:1873:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // src/main/resources/org/drools/lang/DRL.g:1873:4: '#' ( options {greedy=false; } : . )* EOL
+            // src/main/resources/org/drools/lang/DRL.g:1875:2: ( '#' ( options {greedy=false; } : . )* EOL )
+            // src/main/resources/org/drools/lang/DRL.g:1875:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // src/main/resources/org/drools/lang/DRL.g:1873:8: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1875:8: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -1748,7 +1748,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1873:35: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1875:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1778,12 +1778,12 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // src/main/resources/org/drools/lang/DRL.g:1879:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // src/main/resources/org/drools/lang/DRL.g:1879:4: '//' ( options {greedy=false; } : . )* EOL
+            // src/main/resources/org/drools/lang/DRL.g:1881:2: ( '//' ( options {greedy=false; } : . )* EOL )
+            // src/main/resources/org/drools/lang/DRL.g:1881:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // src/main/resources/org/drools/lang/DRL.g:1879:9: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1881:9: ( options {greedy=false; } : . )*
             loop18:
             do {
                 int alt18=2;
@@ -1802,7 +1802,7 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1879:36: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1881:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1832,12 +1832,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // src/main/resources/org/drools/lang/DRL.g:1884:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // src/main/resources/org/drools/lang/DRL.g:1884:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // src/main/resources/org/drools/lang/DRL.g:1886:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // src/main/resources/org/drools/lang/DRL.g:1886:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // src/main/resources/org/drools/lang/DRL.g:1884:9: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1886:9: ( options {greedy=false; } : . )*
             loop19:
             do {
                 int alt19=2;
@@ -1862,7 +1862,7 @@
 
                 switch (alt19) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1884:35: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1886:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1893,7 +1893,7 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // src/main/resources/org/drools/lang/DRL.g:1888:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // src/main/resources/org/drools/lang/DRL.g:1890:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
             // 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)=='|' ) {
@@ -2223,8 +2223,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:1694:14: ( '\\r\\n' )
-        // src/main/resources/org/drools/lang/DRL.g:1694:16: '\\r\\n'
+        // src/main/resources/org/drools/lang/DRL.g:1696:14: ( '\\r\\n' )
+        // src/main/resources/org/drools/lang/DRL.g:1696:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2267,29 +2267,29 @@
         "\1\60\1\155\1\145\1\uffff\4\60\2\uffff\1\60\1\uffff\1\165\1\143"+
         "\4\uffff\1\154\1\164\1\141\1\60\1\164\1\uffff\1\145\1\60\1\uffff";
     static final String DFA20_maxS =
-        "\1\u00ff\1\uffff\1\76\1\71\1\uffff\1\ufffe\2\162\1\143\1\157\2"+
-        "\156\1\165\1\166\1\150\2\uffff\1\75\1\uffff\1\52\1\uffff\3\75\1"+
-        "\uffff\1\u00ff\7\uffff\1\46\1\174\1\uffff\1\57\5\uffff\1\165\1\145"+
-        "\1\154\1\157\1\143\1\154\1\144\1\151\1\154\2\145\15\uffff\1\145"+
-        "\1\156\1\163\1\155\1\165\1\154\1\u00ff\1\164\1\154\1\162\1\156\2"+
-        "\u00ff\1\145\1\u00ff\1\155\1\145\1\uffff\4\u00ff\2\uffff\1\u00ff"+
-        "\1\uffff\1\165\1\143\4\uffff\1\154\1\164\1\141\1\u00ff\1\164\1\uffff"+
-        "\1\145\1\u00ff\1\uffff";
+        "\1\u00ff\1\uffff\1\76\1\71\1\uffff\1\ufffe\2\162\1\143\1\157\2\156"+
+        "\1\165\1\166\1\150\2\uffff\1\75\1\uffff\1\52\1\uffff\3\75\1\uffff"+
+        "\1\u00ff\7\uffff\1\46\1\174\1\uffff\1\57\5\uffff\1\165\1\145\1\154"+
+        "\1\157\1\143\1\154\1\144\1\151\1\154\2\145\15\uffff\1\145\1\156"+
+        "\1\163\1\155\1\165\1\154\1\u00ff\1\164\1\154\1\162\1\156\2\u00ff"+
+        "\1\145\1\u00ff\1\155\1\145\1\uffff\4\u00ff\2\uffff\1\u00ff\1\uffff"+
+        "\1\165\1\143\4\uffff\1\154\1\164\1\141\1\u00ff\1\164\1\uffff\1\145"+
+        "\1\u00ff\1\uffff";
     static final String DFA20_acceptS =
         "\1\uffff\1\1\2\uffff\1\4\12\uffff\1\17\1\20\1\uffff\1\22\1\uffff"+
         "\1\24\3\uffff\1\34\1\uffff\1\35\1\36\1\37\1\40\1\41\1\42\1\43\2"+
         "\uffff\1\47\1\uffff\1\34\1\52\1\33\1\2\1\3\13\uffff\1\25\1\21\1"+
-        "\23\1\44\1\26\1\30\1\27\1\32\1\31\1\45\1\46\1\51\1\50\21\uffff\1"+
+        "\23\1\44\1\26\1\30\1\27\1\32\1\31\1\45\1\46\1\50\1\51\21\uffff\1"+
         "\10\4\uffff\1\5\1\15\1\uffff\1\11\2\uffff\1\12\1\13\1\14\1\16\5"+
         "\uffff\1\7\2\uffff\1\6";
     static final String DFA20_specialS =
         "\153\uffff}>";
     static final String[] DFA20_transitionS = {
-            "\2\1\1\uffff\2\1\22\uffff\1\1\1\25\1\4\1\43\1\30\1\31\1\41"+
-            "\1\5\1\32\1\33\2\46\1\40\1\2\1\23\1\44\12\3\1\24\1\22\1\27\1"+
-            "\21\1\26\1\46\1\20\32\45\1\34\1\46\1\35\1\46\1\30\1\17\1\10"+
-            "\1\45\1\11\1\45\1\12\1\7\2\45\1\13\4\45\1\14\1\15\4\45\1\6\2"+
-            "\45\1\16\3\45\1\36\1\42\1\37\102\uffff\100\45",
+            "\2\1\1\uffff\2\1\22\uffff\1\1\1\25\1\4\1\43\1\30\1\31\1\41\1"+
+            "\5\1\32\1\33\2\46\1\40\1\2\1\23\1\44\12\3\1\24\1\22\1\27\1\21"+
+            "\1\26\1\46\1\20\32\45\1\34\1\46\1\35\1\46\1\30\1\17\1\10\1\45"+
+            "\1\11\1\45\1\12\1\7\2\45\1\13\4\45\1\14\1\15\4\45\1\6\2\45\1"+
+            "\16\3\45\1\36\1\42\1\37\102\uffff\100\45",
             "",
             "\12\3\4\uffff\1\47",
             "\1\51\1\uffff\12\3",
@@ -2314,8 +2314,8 @@
             "\1\72",
             "\1\74",
             "",
-            "\1\45\34\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\1\45\34\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "",
             "",
             "",
@@ -2326,7 +2326,7 @@
             "\1\76",
             "\1\77",
             "",
-            "\1\100\4\uffff\1\101",
+            "\1\101\4\uffff\1\100",
             "",
             "",
             "",
@@ -2362,34 +2362,34 @@
             "\1\120",
             "\1\121",
             "\1\122",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "\1\124",
             "\1\125",
             "\1\126",
             "\1\127",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "\1\132",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "\1\134",
             "\1\135",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "",
             "\1\142",
             "\1\143",
@@ -2400,13 +2400,13 @@
             "\1\144",
             "\1\145",
             "\1\146",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             "\1\150",
             "",
             "\1\151",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff"+
-            "\100\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45\105\uffff\100"+
+            "\45",
             ""
     };
 
@@ -2445,4 +2445,4 @@
     }
  
 
-}
\ No newline at end of file
+}

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-16 18:53:58
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-17 12:12:27
 
 	package org.drools.lang;
 	
@@ -20,132 +20,132 @@
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "VT_COMPILATION_UNIT", "VT_FUNCTION_IMPORT", "VT_FACT", "VT_CONSTRAINTS", "VT_LABEL", "VT_QUERY_ID", "VT_TEMPLATE_ID", "VT_TYPE_DECLARE_ID", "VT_RULE_ID", "VT_ENTRYPOINT_ID", "VT_SLOT_ID", "VT_SLOT", "VT_RULE_ATTRIBUTES", "VT_RHS_CHUNK", "VT_CURLY_CHUNK", "VT_SQUARE_CHUNK", "VT_PAREN_CHUNK", "VT_BEHAVIOR", "VT_AND_IMPLICIT", "VT_AND_PREFIX", "VT_OR_PREFIX", "VT_AND_INFIX", "VT_OR_INFIX", "VT_ACCUMULATE_INIT_CLAUSE", "VT_ACCUMULATE_ID_CLAUSE", "VT_FROM_SOURCE", "VT_EXPRESSION_CHAIN", "VT_PATTERN", "VT_FACT_BINDING", "VT_FACT_OR", "VT_BIND_FIELD", "VT_FIELD", "VT_ACCESSOR_PATH", "VT_ACCESSOR_ELEMENT", "VT_DATA_TYPE", "VT_PATTERN_TYPE", "VT_PACKAGE_ID", "VT_IMPORT_ID", "VT_GLOBAL_ID", "VT_FUNCTION_ID", "VT_PARAM_LIST", "VK_DATE_EFFECTIVE", "VK_DATE_EXPIRES", "VK_LOCK_ON_ACTIVE", "VK_NO_LOOP", "VK_AUTO_FOCUS", "VK_ACTIVATION_GROUP", "VK_AGENDA_GROUP", "VK_RULEFLOW_GROUP", "VK_DURATION", "VK_DIALECT", "VK_SALIENCE", "VK_ENABLED", "!
 VK_ATTRIBUTES", "VK_RULE", "VK_IMPORT", "VK_PACKAGE", "VK_TEMPLATE", "VK_QUERY", "VK_DECLARE", "VK_FUNCTION", "VK_GLOBAL", "VK_EVAL", "VK_CONTAINS", "VK_MATCHES", "VK_EXCLUDES", "VK_SOUNDSLIKE", "VK_MEMBEROF", "VK_ENTRY_POINT", "VK_NOT", "VK_IN", "VK_OR", "VK_AND", "VK_EXISTS", "VK_FORALL", "VK_ACTION", "VK_REVERSE", "VK_RESULT", "SEMICOLON", "ID", "DOT", "DOT_STAR", "END", "STRING", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "AT", "COLON", "EQUALS", "WHEN", "BOOL", "INT", "DOUBLE_PIPE", "DOUBLE_AMPER", "FROM", "OVER", "ACCUMULATE", "INIT", "COLLECT", "ARROW", "EQUAL", "GREATER", "GREATER_EQUAL", "LESS", "LESS_EQUAL", "NOT_EQUAL", "GRAVE_ACCENT", "FLOAT", "NULL", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "LEFT_CURLY", "RIGHT_CURLY", "MISC", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT"
     };
-    public static final int ACCUMULATE=101;
-    public static final int VT_ACCESSOR_ELEMENT=37;
-    public static final int VT_DATA_TYPE=38;
-    public static final int DOT_STAR=85;
+    public static final int COMMA=89;
+    public static final int VT_PATTERN_TYPE=39;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_DIALECT=54;
     public static final int VK_FUNCTION=64;
-    public static final int VK_GLOBAL=65;
-    public static final int VK_AND=76;
-    public static final int EQUALS=93;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int END=86;
+    public static final int HexDigit=123;
+    public static final int VK_ATTRIBUTES=57;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int MISC=119;
+    public static final int VT_AND_PREFIX=23;
+    public static final int VK_QUERY=62;
+    public static final int THEN=116;
     public static final int VK_AUTO_FOCUS=49;
-    public static final int VK_SALIENCE=55;
-    public static final int EOF=-1;
-    public static final int VT_PATTERN_TYPE=39;
-    public static final int VT_FUNCTION_IMPORT=5;
-    public static final int VT_OR_INFIX=26;
-    public static final int EOL=120;
-    public static final int GREATER=106;
-    public static final int DOUBLE_AMPER=98;
+    public static final int DOT=84;
     public static final int VK_IMPORT=59;
-    public static final int NOT_EQUAL=110;
-    public static final int VK_ACTION=79;
-    public static final int VK_RULE=58;
-    public static final int LESS=108;
-    public static final int VK_MEMBEROF=71;
-    public static final int GRAVE_ACCENT=111;
     public static final int VT_SLOT=15;
-    public static final int VK_OR=75;
-    public static final int VT_AND_PREFIX=23;
-    public static final int NULL=113;
-    public static final int BOOL=95;
-    public static final int VK_QUERY=62;
-    public static final int INT=96;
-    public static final int SEMICOLON=82;
-    public static final int VT_FUNCTION_ID=43;
-    public static final int VT_RHS_CHUNK=17;
-    public static final int VT_FACT_BINDING=32;
-    public static final int VK_RULEFLOW_GROUP=52;
-    public static final int VK_ENTRY_POINT=72;
     public static final int VT_PACKAGE_ID=40;
-    public static final int VK_RESULT=81;
+    public static final int LEFT_SQUARE=114;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int VT_DATA_TYPE=38;
+    public static final int VT_FACT=6;
+    public static final int VK_MATCHES=68;
+    public static final int LEFT_CURLY=117;
+    public static final int AT=91;
+    public static final int DOUBLE_AMPER=98;
+    public static final int LEFT_PAREN=88;
+    public static final int VT_QUERY_ID=9;
+    public static final int VT_ACCESSOR_PATH=36;
     public static final int VT_LABEL=8;
+    public static final int WHEN=94;
+    public static final int VT_ENTRYPOINT_ID=13;
     public static final int WS=121;
-    public static final int VK_NO_LOOP=48;
-    public static final int LEFT_CURLY=117;
-    public static final int VT_FACT=6;
-    public static final int VT_PATTERN=31;
-    public static final int VK_IN=74;
-    public static final int LEFT_PAREN=88;
-    public static final int LESS_EQUAL=109;
-    public static final int VT_IMPORT_ID=41;
-    public static final int VT_RULE_ID=12;
-    public static final int MISC=119;
-    public static final int FROM=99;
-    public static final int END=86;
+    public static final int VT_FIELD=35;
+    public static final int VK_SALIENCE=55;
+    public static final int VK_SOUNDSLIKE=70;
+    public static final int OVER=100;
+    public static final int VK_AND=76;
+    public static final int STRING=87;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
+    public static final int VT_BEHAVIOR=21;
+    public static final int GRAVE_ACCENT=111;
+    public static final int VK_DURATION=53;
+    public static final int VT_SQUARE_CHUNK=19;
+    public static final int VK_FORALL=78;
+    public static final int VT_PAREN_CHUNK=20;
+    public static final int VT_COMPILATION_UNIT=4;
     public static final int COLLECT=103;
-    public static final int INIT=102;
-    public static final int EscapeSequence=122;
-    public static final int VK_ACTIVATION_GROUP=50;
     public static final int VK_ENABLED=56;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    public static final int EQUALS=93;
+    public static final int VK_RESULT=81;
+    public static final int UnicodeEscape=124;
     public static final int VK_PACKAGE=60;
-    public static final int OVER=100;
+    public static final int VT_RULE_ID=12;
+    public static final int EQUAL=105;
+    public static final int VK_NO_LOOP=48;
+    public static final int SEMICOLON=82;
+    public static final int VK_TEMPLATE=61;
+    public static final int VT_AND_IMPLICIT=22;
+    public static final int NULL=113;
+    public static final int COLON=92;
+    public static final int MULTI_LINE_COMMENT=128;
+    public static final int VT_RULE_ATTRIBUTES=16;
     public static final int RIGHT_SQUARE=115;
-    public static final int RIGHT_CURLY=118;
-    public static final int VK_MATCHES=68;
+    public static final int VK_AGENDA_GROUP=51;
     public static final int VT_FACT_OR=33;
-    public static final int VT_FIELD=35;
+    public static final int VK_NOT=73;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ARROW=104;
     public static final int FLOAT=112;
-    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
-    public static final int VK_EXISTS=77;
-    public static final int VK_DATE_EXPIRES=46;
-    public static final int ID=83;
-    public static final int HexDigit=123;
+    public static final int INIT=102;
+    public static final int VT_SLOT_ID=14;
+    public static final int VT_CURLY_CHUNK=18;
     public static final int VT_OR_PREFIX=24;
-    public static final int VK_EVAL=66;
     public static final int DOUBLE_PIPE=97;
-    public static final int AT=91;
-    public static final int RIGHT_PAREN=90;
-    public static final int THEN=116;
-    public static final int VT_COMPILATION_UNIT=4;
-    public static final int VT_EXPRESSION_CHAIN=30;
-    public static final int COMMA=89;
-    public static final int EQUAL=105;
-    public static final int VT_BEHAVIOR=21;
-    public static final int VT_QUERY_ID=9;
-    public static final int VK_DIALECT=54;
-    public static final int DOT=84;
-    public static final int VT_GLOBAL_ID=42;
-    public static final int VK_NOT=73;
-    public static final int VT_FROM_SOURCE=29;
-    public static final int VT_ENTRYPOINT_ID=13;
-    public static final int VK_DECLARE=63;
-    public static final int VT_PAREN_CHUNK=20;
-    public static final int VK_CONTAINS=67;
+    public static final int LESS=108;
     public static final int VT_TYPE_DECLARE_ID=11;
-    public static final int VK_REVERSE=80;
-    public static final int VK_LOCK_ON_ACTIVE=47;
-    public static final int VK_TEMPLATE=61;
+    public static final int VT_PATTERN=31;
+    public static final int VK_DATE_EFFECTIVE=45;
+    public static final int EscapeSequence=122;
+    public static final int VK_EXISTS=77;
+    public static final int INT=96;
+    public static final int VT_BIND_FIELD=34;
+    public static final int VK_RULE=58;
+    public static final int VK_EVAL=66;
+    public static final int GREATER=106;
+    public static final int VT_FACT_BINDING=32;
+    public static final int FROM=99;
+    public static final int ID=83;
+    public static final int NOT_EQUAL=110;
+    public static final int RIGHT_CURLY=118;
+    public static final int BOOL=95;
     public static final int VT_AND_INFIX=25;
-    public static final int VT_RULE_ATTRIBUTES=16;
-    public static final int VK_DURATION=53;
-    public static final int VT_ACCESSOR_PATH=36;
-    public static final int MULTI_LINE_COMMENT=128;
-    public static final int VK_FORALL=78;
-    public static final int COLON=92;
-    public static final int VK_EXCLUDES=69;
-    public static final int VT_AND_IMPLICIT=22;
-    public static final int VK_SOUNDSLIKE=70;
-    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
-    public static final int VT_CURLY_CHUNK=18;
-    public static final int VT_SLOT_ID=14;
-    public static final int VK_ATTRIBUTES=57;
-    public static final int WHEN=94;
-    public static final int UnicodeEscape=124;
-    public static final int VT_SQUARE_CHUNK=19;
-    public static final int VT_TEMPLATE_ID=10;
-    public static final int VK_DATE_EFFECTIVE=45;
     public static final int VT_PARAM_LIST=44;
-    public static final int ARROW=104;
-    public static final int VT_BIND_FIELD=34;
+    public static final int VK_ENTRY_POINT=72;
+    public static final int VT_FROM_SOURCE=29;
+    public static final int VK_LOCK_ON_ACTIVE=47;
+    public static final int VK_CONTAINS=67;
+    public static final int VT_FUNCTION_IMPORT=5;
+    public static final int VK_IN=74;
+    public static final int VT_RHS_CHUNK=17;
+    public static final int GREATER_EQUAL=107;
+    public static final int VK_MEMBEROF=71;
+    public static final int VT_OR_INFIX=26;
+    public static final int DOT_STAR=85;
+    public static final int VK_OR=75;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int LESS_EQUAL=109;
+    public static final int ACCUMULATE=101;
+    public static final int VK_RULEFLOW_GROUP=52;
+    public static final int VT_FUNCTION_ID=43;
+    public static final int EOF=-1;
     public static final int VT_CONSTRAINTS=7;
-    public static final int VK_AGENDA_GROUP=51;
-    public static final int LEFT_SQUARE=114;
+    public static final int EOL=120;
+    public static final int VT_IMPORT_ID=41;
+    public static final int VK_ACTIVATION_GROUP=50;
     public static final int OctalEscape=125;
-    public static final int GREATER_EQUAL=107;
-    public static final int STRING=87;
+    public static final int VK_ACTION=79;
+    public static final int VK_EXCLUDES=69;
+    public static final int RIGHT_PAREN=90;
+    public static final int VT_TEMPLATE_ID=10;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    public static final int VK_DECLARE=63;
 
         public DRLParser(TokenStream input) {
             super(input);
@@ -164,7 +164,7 @@
     public String[] getTokenNames() { return tokenNames; }
     public String getGrammarFileName() { return "src/main/resources/org/drools/lang/DRL.g"; }
 
-
+    
     	private Stack<Map<DroolsParaphraseTypes, String>> paraphrases = new Stack<Map<DroolsParaphraseTypes, String>>();
     	private List<DroolsParserException> errors = new ArrayList<DroolsParserException>();
     	private DroolsParserExceptionFactory errorMessageFactory = new DroolsParserExceptionFactory(tokenNames, paraphrases);
@@ -172,19 +172,19 @@
     	private boolean lookaheadTest = false;
     	private LinkedList<DroolsSentence> editorInterface = null;
     	private boolean isEditorInterfaceEnabled = false;
-
+    
     	public LinkedList<DroolsSentence> getEditorInterface(){
     		return editorInterface;
     	}
-
+    
     	public void enableEditorInterface(){
     		isEditorInterfaceEnabled = true;
     	}
-
+    
     	public void disableEditorInterface(){
     		isEditorInterfaceEnabled = false;
     	}
-
+    
     	private void beginSentence(DroolsSentenceType sentenceType){
     		if (isEditorInterfaceEnabled) {
     			if (null == editorInterface) {
@@ -195,11 +195,11 @@
     			editorInterface.add(sentence);
     		}
     	}
-
+    
     	private DroolsSentence getActiveSentence(){
     		return editorInterface.getLast();
     	}
-
+    
     	private void emit(List tokens, DroolsEditorType editorType){
     		if (isEditorInterfaceEnabled && tokens != null) {		
     			for (Object activeObject : tokens){
@@ -207,14 +207,14 @@
     			}
     		}
     	}
-
+    
     	private void emit(Token token, DroolsEditorType editorType){
     		if (isEditorInterfaceEnabled && token != null) {
     			((DroolsToken)token).setEditorType(editorType);
     			getActiveSentence().addContent((DroolsToken) token);
     		}
     	}
-
+    
     	private void emit(boolean forceEmit, int activeContext){
     		if (isEditorInterfaceEnabled) {
     				getActiveSentence().addContent(activeContext);
@@ -226,7 +226,7 @@
     			emit(false, activeContext);
     		}
     	}
-
+    
     	private DroolsToken getLastTokenOnList(LinkedList list){
     		DroolsToken lastToken = null;
     		for (Object object : list) {
@@ -236,7 +236,7 @@
     		}
     		return lastToken;
     	}
-
+    
     	private int getLastIntegerValue(LinkedList list) {
     		int lastIntergerValue = -1;
     		for (Object object : list) {
@@ -246,7 +246,7 @@
     		}
     		return lastIntergerValue;
     	}
-
+    
     	private boolean validateLT(int LTNumber, String text) {
     		if (null == input)
     			return false;
@@ -279,11 +279,11 @@
     		}
     		return false;
     	}
-
+    
     	private boolean validateRestr() {
     		int lookahead = 2;
     		int countParen = 1;
-
+    
     		while (true) {
     			if (input.LA(lookahead) == COMMA) {
     				break;
@@ -312,7 +312,7 @@
     			input.seek(activeIndex);
     		}
     		lookaheadTest = false;
-
+    
     		return returnValue;
     	}
     	
@@ -352,7 +352,7 @@
     	public boolean hasErrors() {
     		return !errors.isEmpty();
     	}
-
+    
     	/**
     	 * Method that adds a paraphrase type into paraphrases stack.
     	 * 
@@ -364,7 +364,7 @@
     		activeMap.put(type, "");
     		paraphrases.push(activeMap);
     	}
-
+    
     	/**
     	 * Method that sets paraphrase value for a type into paraphrases stack.
     	 * 
@@ -376,7 +376,7 @@
     	private void setParaphrasesValue(DroolsParaphraseTypes type, String value) {
     		paraphrases.peek().put(type, value);
     	}
-
+    
     	/**
     	 * Helper method that creates a string from a token list.
     	 * 
@@ -448,8 +448,8 @@
 
         Object EOF3_tree=null;
         RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
+        RewriteRuleSubtreeStream stream_package_statement=new RewriteRuleSubtreeStream(adaptor,"rule package_statement");
         RewriteRuleSubtreeStream stream_statement=new RewriteRuleSubtreeStream(adaptor,"rule statement");
-        RewriteRuleSubtreeStream stream_package_statement=new RewriteRuleSubtreeStream(adaptor,"rule package_statement");
         try {
             // src/main/resources/org/drools/lang/DRL.g:396:2: ( ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) )
             // src/main/resources/org/drools/lang/DRL.g:396:4: ( package_statement )? ( statement )* EOF
@@ -458,11 +458,11 @@
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==ID) && ((((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT!
 (1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, D!
 roolsSoftKeywords.GROUP))||((validateLT(1, DroolsSoftKeywords.TEMPLATE
))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(Drool!
 sSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
+            if ( (LA1_0==ID) && ((((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "f!
 unction") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validate!
 IdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && valida
teLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.T!
 EMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
                 int LA1_1 = input.LA(2);
 
-                if ( (LA1_1==ID) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2,!
  "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMP!
 LATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((valid
ateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(valida!
 teIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, Droo!
 lsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DE
CLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
-                    int LA1_5 = input.LA(3);
+                if ( (LA1_1==ID) && ((((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey!
 (DroolsSoftKeywords.PACKAGE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE!
 ))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT
(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, !
 DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE!
 ))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIde
ntifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))))) {
+                    int LA1_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.PACKAGE))) ) {
                         alt1=1;
@@ -490,7 +490,7 @@
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( (LA2_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.L!
 OOP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
+                if ( (LA2_0==ID) && ((((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-!
 ") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
                     alt2=1;
                 }
 
@@ -519,7 +519,7 @@
 
 
             // AST REWRITE
-            // elements: statement, package_statement
+            // elements: package_statement, statement
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -566,16 +566,16 @@
             }
         }
         catch ( RecognitionException e ) {
-
+            
             		reportError( e );
             	
         }
         catch ( RewriteEmptyStreamException e ) {
-
+            
             	
         }
         finally {
-
+            
             	if (isEditorInterfaceEnabled && retval.tree == null) {
             		retval.tree = root_0;
             		root_0 = (Object) adaptor.nil();
@@ -676,7 +676,7 @@
             }
 
             // AST REWRITE
-            // elements: package_key, package_id
+            // elements: package_id, package_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -889,13 +889,13 @@
             int alt5=9;
             int LA5_0 = input.LA(1);
 
-            if ( (LA5_0==ID) && ((((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT!
 (1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA)!
  && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(v
alidateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && valida!
 teLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+            if ( (LA5_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, Drools!
 SoftKeywords.EXPIRES))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) &&!
  validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((val
idateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeyw!
 ords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))))) {
                 int LA5_1 = input.LA(2);
 
-                if ( (LA5_1==MISC) && (((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-")!
  && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
+                if ( (LA5_1==MISC) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-")!
  && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
                     alt5=1;
                 }
-                else if ( (LA5_1==ID) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSof!
 tKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.Q!
 UERY))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentif
ierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifie!
 rKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftK!
 eywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE))
)||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
+                else if ( (LA5_1==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1!
 , DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.!
 DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(vali
dateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(Dr!
 oolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "fun!
 ction") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((vali
dateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))))) {
                     int LA5_3 = input.LA(3);
 
                     if ( (((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))) ) {
@@ -930,7 +930,7 @@
                         throw nvae;
                     }
                 }
-                else if ( (LA5_1==STRING) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(Drool!
 sSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
+                else if ( (LA5_1==STRING) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKe!
 y(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
                     int LA5_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.DIALECT))) ) {
@@ -953,13 +953,13 @@
                         throw nvae;
                     }
                 }
-                else if ( (LA5_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+                else if ( (LA5_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
                     alt5=1;
                 }
-                else if ( (LA5_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
+                else if ( (LA5_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {
                     alt5=1;
                 }
-                else if ( (LA5_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
+                else if ( (LA5_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
                     alt5=1;
                 }
                 else {
@@ -1196,7 +1196,7 @@
             }
 
             // AST REWRITE
-            // elements: import_key, import_name
+            // elements: import_name, import_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1267,8 +1267,8 @@
 
         Object SEMICOLON21_tree=null;
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
+        RewriteRuleSubtreeStream stream_import_key=new RewriteRuleSubtreeStream(adaptor,"rule import_key");
         RewriteRuleSubtreeStream stream_function_key=new RewriteRuleSubtreeStream(adaptor,"rule function_key");
-        RewriteRuleSubtreeStream stream_import_key=new RewriteRuleSubtreeStream(adaptor,"rule import_key");
         RewriteRuleSubtreeStream stream_import_name=new RewriteRuleSubtreeStream(adaptor,"rule import_name");
          pushParaphrases(DroolsParaphraseTypes.FUNCTION_IMPORT); 
         try {
@@ -1319,7 +1319,7 @@
             }
 
             // AST REWRITE
-            // elements: function_key, import_name
+            // elements: import_name, function_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1385,9 +1385,9 @@
         List list_id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_DOT_STAR=new RewriteRuleTokenStream(adaptor,"token DOT_STAR");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
-        RewriteRuleTokenStream stream_DOT_STAR=new RewriteRuleTokenStream(adaptor,"token DOT_STAR");
 
         try {
             // src/main/resources/org/drools/lang/DRL.g:491:2: (id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) )
@@ -1549,9 +1549,9 @@
 
         Object SEMICOLON25_tree=null;
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
-        RewriteRuleSubtreeStream stream_global_key=new RewriteRuleSubtreeStream(adaptor,"rule global_key");
         RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
         RewriteRuleSubtreeStream stream_global_id=new RewriteRuleSubtreeStream(adaptor,"rule global_id");
+        RewriteRuleSubtreeStream stream_global_key=new RewriteRuleSubtreeStream(adaptor,"rule global_key");
          pushParaphrases(DroolsParaphraseTypes.GLOBAL); 
         try {
             // src/main/resources/org/drools/lang/DRL.g:500:2: ( global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) )
@@ -1601,7 +1601,7 @@
             }
 
             // AST REWRITE
-            // elements: global_key, global_id, data_type
+            // elements: data_type, global_key, global_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1743,11 +1743,11 @@
         curly_chunk_return curly_chunk30 = null;
 
 
+        RewriteRuleSubtreeStream stream_parameters=new RewriteRuleSubtreeStream(adaptor,"rule parameters");
         RewriteRuleSubtreeStream stream_function_key=new RewriteRuleSubtreeStream(adaptor,"rule function_key");
+        RewriteRuleSubtreeStream stream_curly_chunk=new RewriteRuleSubtreeStream(adaptor,"rule curly_chunk");
+        RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
         RewriteRuleSubtreeStream stream_function_id=new RewriteRuleSubtreeStream(adaptor,"rule function_id");
-        RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
-        RewriteRuleSubtreeStream stream_parameters=new RewriteRuleSubtreeStream(adaptor,"rule parameters");
-        RewriteRuleSubtreeStream stream_curly_chunk=new RewriteRuleSubtreeStream(adaptor,"rule curly_chunk");
          pushParaphrases(DroolsParaphraseTypes.FUNCTION); 
         try {
             // src/main/resources/org/drools/lang/DRL.g:517:2: ( function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) )
@@ -1804,7 +1804,7 @@
             if ( backtracking==0 ) stream_curly_chunk.add(curly_chunk30.getTree());
 
             // AST REWRITE
-            // elements: data_type, function_key, parameters, function_id, curly_chunk
+            // elements: function_id, parameters, data_type, function_key, curly_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1955,11 +1955,11 @@
 
         Object END35_tree=null;
         Object SEMICOLON36_tree=null;
+        RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
-        RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
+        RewriteRuleSubtreeStream stream_parameters=new RewriteRuleSubtreeStream(adaptor,"rule parameters");
         RewriteRuleSubtreeStream stream_query_key=new RewriteRuleSubtreeStream(adaptor,"rule query_key");
         RewriteRuleSubtreeStream stream_normal_lhs_block=new RewriteRuleSubtreeStream(adaptor,"rule normal_lhs_block");
-        RewriteRuleSubtreeStream stream_parameters=new RewriteRuleSubtreeStream(adaptor,"rule parameters");
         RewriteRuleSubtreeStream stream_query_id=new RewriteRuleSubtreeStream(adaptor,"rule query_id");
          pushParaphrases(DroolsParaphraseTypes.QUERY); 
         try {
@@ -2039,7 +2039,7 @@
             }
 
             // AST REWRITE
-            // elements: query_id, END, normal_lhs_block, parameters, query_key
+            // elements: END, normal_lhs_block, query_id, query_key, parameters
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2111,8 +2111,8 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
 
         try {
             // src/main/resources/org/drools/lang/DRL.g:547:2: (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] )
@@ -2242,9 +2242,9 @@
         Object LEFT_PAREN37_tree=null;
         Object COMMA39_tree=null;
         Object RIGHT_PAREN41_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleSubtreeStream stream_param_definition=new RewriteRuleSubtreeStream(adaptor,"rule param_definition");
         try {
             // src/main/resources/org/drools/lang/DRL.g:556:2: ( LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) )
@@ -2552,9 +2552,9 @@
         Object END50_tree=null;
         RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
         RewriteRuleSubtreeStream stream_decl_field=new RewriteRuleSubtreeStream(adaptor,"rule decl_field");
+        RewriteRuleSubtreeStream stream_declare_key=new RewriteRuleSubtreeStream(adaptor,"rule declare_key");
+        RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
         RewriteRuleSubtreeStream stream_type_declare_id=new RewriteRuleSubtreeStream(adaptor,"rule type_declare_id");
-        RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
-        RewriteRuleSubtreeStream stream_declare_key=new RewriteRuleSubtreeStream(adaptor,"rule declare_key");
          pushParaphrases(DroolsParaphraseTypes.TYPE_DECLARE); 
         try {
             // src/main/resources/org/drools/lang/DRL.g:574:2: ( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) )
@@ -2640,7 +2640,7 @@
             }
 
             // AST REWRITE
-            // elements: decl_metadata, type_declare_id, decl_field, END, declare_key
+            // elements: decl_field, decl_metadata, END, declare_key, type_declare_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2818,7 +2818,7 @@
             if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk53.getTree());
 
             // AST REWRITE
-            // elements: AT, ID, paren_chunk
+            // elements: paren_chunk, AT, ID
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2890,9 +2890,9 @@
         Object COLON56_tree=null;
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
+        RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
         RewriteRuleSubtreeStream stream_decl_field_initialization=new RewriteRuleSubtreeStream(adaptor,"rule decl_field_initialization");
         RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
-        RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
         try {
             // src/main/resources/org/drools/lang/DRL.g:600:2: ( ID ( decl_field_initialization )? COLON data_type ( decl_metadata )* -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* ) )
             // src/main/resources/org/drools/lang/DRL.g:600:4: ID ( decl_field_initialization )? COLON data_type ( decl_metadata )*
@@ -2969,7 +2969,7 @@
 
 
             // AST REWRITE
-            // elements: decl_metadata, data_type, decl_field_initialization, ID
+            // elements: ID, data_type, decl_metadata, decl_field_initialization
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3064,7 +3064,7 @@
             if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk60.getTree());
 
             // AST REWRITE
-            // elements: paren_chunk, EQUALS
+            // elements: EQUALS, paren_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3135,10 +3135,10 @@
         Object semi1_tree=null;
         Object semi2_tree=null;
         Object END64_tree=null;
+        RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
-        RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
+        RewriteRuleSubtreeStream stream_template_id=new RewriteRuleSubtreeStream(adaptor,"rule template_id");
         RewriteRuleSubtreeStream stream_template_slot=new RewriteRuleSubtreeStream(adaptor,"rule template_slot");
-        RewriteRuleSubtreeStream stream_template_id=new RewriteRuleSubtreeStream(adaptor,"rule template_id");
         RewriteRuleSubtreeStream stream_template_key=new RewriteRuleSubtreeStream(adaptor,"rule template_key");
          pushParaphrases(DroolsParaphraseTypes.TEMPLATE); 
         try {
@@ -3248,7 +3248,7 @@
             }
 
             // AST REWRITE
-            // elements: template_slot, template_key, template_id, END
+            // elements: template_key, template_id, template_slot, END
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3321,8 +3321,8 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
 
         try {
             // src/main/resources/org/drools/lang/DRL.g:630:2: (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] )
@@ -3491,7 +3491,7 @@
             }
 
             // AST REWRITE
-            // elements: slot_id, data_type
+            // elements: data_type, slot_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3631,12 +3631,12 @@
         rhs_chunk_return rhs_chunk73 = null;
 
 
+        RewriteRuleSubtreeStream stream_rule_key=new RewriteRuleSubtreeStream(adaptor,"rule rule_key");
         RewriteRuleSubtreeStream stream_rule_id=new RewriteRuleSubtreeStream(adaptor,"rule rule_id");
+        RewriteRuleSubtreeStream stream_when_part=new RewriteRuleSubtreeStream(adaptor,"rule when_part");
+        RewriteRuleSubtreeStream stream_rule_attributes=new RewriteRuleSubtreeStream(adaptor,"rule rule_attributes");
         RewriteRuleSubtreeStream stream_rhs_chunk=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk");
-        RewriteRuleSubtreeStream stream_rule_attributes=new RewriteRuleSubtreeStream(adaptor,"rule rule_attributes");
-        RewriteRuleSubtreeStream stream_rule_key=new RewriteRuleSubtreeStream(adaptor,"rule rule_key");
         RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
-        RewriteRuleSubtreeStream stream_when_part=new RewriteRuleSubtreeStream(adaptor,"rule when_part");
          pushParaphrases(DroolsParaphraseTypes.RULE); 
         try {
             // src/main/resources/org/drools/lang/DRL.g:653:2: ( rule_key rule_id ( rule_attributes )? ( decl_metadata )* ( when_part )? rhs_chunk -> ^( rule_key rule_id ( rule_attributes )? ( decl_metadata )* ( when_part )? rhs_chunk ) )
@@ -3662,7 +3662,7 @@
             int alt28=2;
             int LA28_0 = input.LA(1);
 
-            if ( (LA28_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(Drool!
 sSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+            if ( (LA28_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(Drool!
 sSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
                 alt28=1;
             }
             switch (alt28) {
@@ -3738,7 +3738,7 @@
             if ( backtracking==0 ) stream_rhs_chunk.add(rhs_chunk73.getTree());
 
             // AST REWRITE
-            // elements: rule_id, rule_key, when_part, rhs_chunk, decl_metadata, rule_attributes
+            // elements: rule_attributes, rhs_chunk, decl_metadata, rule_id, rule_key, when_part
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3873,7 +3873,7 @@
             if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block76.getTree());
 
             // AST REWRITE
-            // elements: normal_lhs_block, WHEN
+            // elements: WHEN, normal_lhs_block
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3927,8 +3927,8 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
 
         try {
             // src/main/resources/org/drools/lang/DRL.g:670:2: (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] )
@@ -4058,10 +4058,10 @@
 
         Object COLON78_tree=null;
         Object COMMA80_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleSubtreeStream stream_attributes_key=new RewriteRuleSubtreeStream(adaptor,"rule attributes_key");
         RewriteRuleSubtreeStream stream_rule_attribute=new RewriteRuleSubtreeStream(adaptor,"rule rule_attribute");
-        RewriteRuleSubtreeStream stream_attributes_key=new RewriteRuleSubtreeStream(adaptor,"rule attributes_key");
         try {
             // src/main/resources/org/drools/lang/DRL.g:679:2: ( ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )* -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ ) )
             // src/main/resources/org/drools/lang/DRL.g:679:4: ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )*
@@ -4070,7 +4070,7 @@
             int alt33=2;
             int LA33_0 = input.LA(1);
 
-            if ( (LA33_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(Drool!
 sSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+            if ( (LA33_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(Drool!
 sSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
                 int LA33_1 = input.LA(2);
 
                 if ( (LA33_1==COLON) && ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES)))) {
@@ -4113,7 +4113,7 @@
                 if ( (LA35_0==COMMA) ) {
                     alt35=1;
                 }
-                else if ( (LA35_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(Drools!
 SoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
+                else if ( (LA35_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierK!
 ey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
                     alt35=1;
                 }
 
@@ -4162,7 +4162,7 @@
 
 
             // AST REWRITE
-            // elements: rule_attribute, attributes_key
+            // elements: attributes_key, rule_attribute
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4263,109 +4263,7 @@
         try {
             // src/main/resources/org/drools/lang/DRL.g:687:2: ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect )
             int alt36=12;
-            int LA36_0 = input.LA(1);
-
-            if ( (LA36_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywo!
 rds.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
-                int LA36_1 = input.LA(2);
-
-                if ( (LA36_1==MISC) && (((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-"!
 ) && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
-                    int LA36_2 = input.LA(3);
-
-                    if ( (LA36_2==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "!
 -") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
-                        int LA36_7 = input.LA(4);
-
-                        if ( (LA36_7==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE)))) {
-                            alt36=11;
-                        }
-                        else if ( (LA36_7==STRING) && (((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
-                            int LA36_10 = input.LA(5);
-
-                            if ( ((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt36=3;
-                            }
-                            else if ( ((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt36=5;
-                            }
-                            else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {
-                                alt36=7;
-                            }
-                            else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {
-                                alt36=8;
-                            }
-                            else if ( ((validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt36=10;
-                            }
-                            else {
-                                if (backtracking>0) {failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 10, input);
-
-                                throw nvae;
-                            }
-                        }
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))) ) {
-                            alt36=2;
-                        }
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))) ) {
-                            alt36=6;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 7, input);
-
-                            throw nvae;
-                        }
-                    }
-                    else {
-                        if (backtracking>0) {failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 2, input);
-
-                        throw nvae;
-                    }
-                }
-                else if ( (LA36_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
-                    int LA36_3 = input.LA(3);
-
-                    if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {
-                        alt36=1;
-                    }
-                    else if ( ((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {
-                        alt36=4;
-                    }
-                    else {
-                        if (backtracking>0) {failed=true; return retval;}
-                        NoViableAltException nvae =
-                            new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 3, input);
-
-                        throw nvae;
-                    }
-                }
-                else if ( (LA36_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
-                    alt36=1;
-                }
-                else if ( (LA36_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {
-                    alt36=12;
-                }
-                else if ( (LA36_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
-                    alt36=9;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return retval;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 1, input);
-
-                    throw nvae;
-                }
-            }
-            else {
-                if (backtracking>0) {failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 36, 0, input);
-
-                throw nvae;
-            }
+            alt36 = dfa36.predict(input);
             switch (alt36) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DRL.g:687:4: salience
@@ -4540,7 +4438,7 @@
             recover(input,re);
         }
         finally {
-
+            
             	if (isEditorInterfaceEnabled && isFailed) {
             		if (input.LA(6) == EOF && input.LA(1) == ID && input.LA(2) == MISC && input.LA(3) == ID && 
             			input.LA(5) == MISC && input.LA(6) == ID && 
@@ -4717,7 +4615,7 @@
     };
 
     // $ANTLR start enabled
-    // src/main/resources/org/drools/lang/DRL.g:753:1: enabled : enabled_key BOOL ;
+    // src/main/resources/org/drools/lang/DRL.g:753:1: enabled : enabled_key ( BOOL | paren_chunk ) ;
     public final enabled_return enabled() throws RecognitionException {
         enabled_return retval = new enabled_return();
         retval.start = input.LT(1);
@@ -4727,12 +4625,14 @@
         Token BOOL98=null;
         enabled_key_return enabled_key97 = null;
 
+        paren_chunk_return paren_chunk99 = null;
 
+
         Object BOOL98_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:754:2: ( enabled_key BOOL )
-            // src/main/resources/org/drools/lang/DRL.g:754:4: enabled_key BOOL
+            // src/main/resources/org/drools/lang/DRL.g:754:2: ( enabled_key ( BOOL | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:754:4: enabled_key ( BOOL | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
@@ -4744,18 +4644,56 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            BOOL98=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1798); if (failed) return retval;
-            if ( backtracking==0 ) {
-            BOOL98_tree = (Object)adaptor.create(BOOL98);
-            adaptor.addChild(root_0, BOOL98_tree);
+            // src/main/resources/org/drools/lang/DRL.g:755:6: ( BOOL | paren_chunk )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
+
+            if ( (LA37_0==BOOL) ) {
+                alt37=1;
             }
-            if ( backtracking==0 ) {
-              	emit(BOOL98, DroolsEditorType.BOOLEAN_CONST );	
+            else if ( (LA37_0==LEFT_PAREN) ) {
+                alt37=2;
             }
+            else {
+                if (backtracking>0) {failed=true; return retval;}
+                NoViableAltException nvae =
+                    new NoViableAltException("755:6: ( BOOL | paren_chunk )", 37, 0, input);
 
+                throw nvae;
             }
+            switch (alt37) {
+                case 1 :
+                    // src/main/resources/org/drools/lang/DRL.g:755:8: BOOL
+                    {
+                    BOOL98=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_enabled1806); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    BOOL98_tree = (Object)adaptor.create(BOOL98);
+                    adaptor.addChild(root_0, BOOL98_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(BOOL98, DroolsEditorType.BOOLEAN_CONST );	
+                    }
 
+                    }
+                    break;
+                case 2 :
+                    // src/main/resources/org/drools/lang/DRL.g:756:8: paren_chunk
+                    {
+                    pushFollow(FOLLOW_paren_chunk_in_enabled1817);
+                    paren_chunk99=paren_chunk();
+                    _fsp--;
+                    if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk99.getTree());
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
             retval.stop = input.LT(-1);
 
             if ( backtracking==0 ) {
@@ -4779,76 +4717,76 @@
     };
 
     // $ANTLR start salience
-    // src/main/resources/org/drools/lang/DRL.g:758:1: salience : salience_key ( INT | paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:760:1: salience : salience_key ( INT | paren_chunk ) ;
     public final salience_return salience() throws RecognitionException {
         salience_return retval = new salience_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token INT100=null;
-        salience_key_return salience_key99 = null;
+        Token INT101=null;
+        salience_key_return salience_key100 = null;
 
-        paren_chunk_return paren_chunk101 = null;
+        paren_chunk_return paren_chunk102 = null;
 
 
-        Object INT100_tree=null;
+        Object INT101_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:759:2: ( salience_key ( INT | paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:759:4: salience_key ( INT | paren_chunk )
+            // src/main/resources/org/drools/lang/DRL.g:761:2: ( salience_key ( INT | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:761:4: salience_key ( INT | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_salience_key_in_salience1813);
-            salience_key99=salience_key();
+            pushFollow(FOLLOW_salience_key_in_salience1837);
+            salience_key100=salience_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key99.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key100.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:760:3: ( INT | paren_chunk )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:762:3: ( INT | paren_chunk )
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA37_0==INT) ) {
-                alt37=1;
+            if ( (LA38_0==INT) ) {
+                alt38=1;
             }
-            else if ( (LA37_0==LEFT_PAREN) ) {
-                alt37=2;
+            else if ( (LA38_0==LEFT_PAREN) ) {
+                alt38=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("760:3: ( INT | paren_chunk )", 37, 0, input);
+                    new NoViableAltException("762:3: ( INT | paren_chunk )", 38, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt38) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:760:5: INT
+                    // src/main/resources/org/drools/lang/DRL.g:762:5: INT
                     {
-                    INT100=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1822); if (failed) return retval;
+                    INT101=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_salience1846); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    INT100_tree = (Object)adaptor.create(INT100);
-                    adaptor.addChild(root_0, INT100_tree);
+                    INT101_tree = (Object)adaptor.create(INT101);
+                    adaptor.addChild(root_0, INT101_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(INT100, DroolsEditorType.NUMERIC_CONST );	
+                      	emit(INT101, DroolsEditorType.NUMERIC_CONST );	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:761:5: paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:763:5: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1831);
-                    paren_chunk101=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_salience1855);
+                    paren_chunk102=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk101.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk102.getTree());
 
                     }
                     break;
@@ -4881,49 +4819,49 @@
     };
 
     // $ANTLR start no_loop
-    // src/main/resources/org/drools/lang/DRL.g:765:1: no_loop : no_loop_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:767:1: no_loop : no_loop_key ( BOOL )? ;
     public final no_loop_return no_loop() throws RecognitionException {
         no_loop_return retval = new no_loop_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token BOOL103=null;
-        no_loop_key_return no_loop_key102 = null;
+        Token BOOL104=null;
+        no_loop_key_return no_loop_key103 = null;
 
 
-        Object BOOL103_tree=null;
+        Object BOOL104_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:766:2: ( no_loop_key ( BOOL )? )
-            // src/main/resources/org/drools/lang/DRL.g:766:4: no_loop_key ( BOOL )?
+            // src/main/resources/org/drools/lang/DRL.g:768:2: ( no_loop_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:768:4: no_loop_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_no_loop_key_in_no_loop1846);
-            no_loop_key102=no_loop_key();
+            pushFollow(FOLLOW_no_loop_key_in_no_loop1870);
+            no_loop_key103=no_loop_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key102.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key103.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:766:66: ( BOOL )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:768:66: ( BOOL )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA38_0==BOOL) ) {
-                alt38=1;
+            if ( (LA39_0==BOOL) ) {
+                alt39=1;
             }
-            switch (alt38) {
+            switch (alt39) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:766:66: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:768:66: BOOL
                     {
-                    BOOL103=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1851); if (failed) return retval;
+                    BOOL104=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1875); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL103_tree = (Object)adaptor.create(BOOL103);
-                    adaptor.addChild(root_0, BOOL103_tree);
+                    BOOL104_tree = (Object)adaptor.create(BOOL104);
+                    adaptor.addChild(root_0, BOOL104_tree);
                     }
 
                     }
@@ -4932,7 +4870,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL103, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL104, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -4960,49 +4898,49 @@
     };
 
     // $ANTLR start auto_focus
-    // src/main/resources/org/drools/lang/DRL.g:770:1: auto_focus : auto_focus_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:772:1: auto_focus : auto_focus_key ( BOOL )? ;
     public final auto_focus_return auto_focus() throws RecognitionException {
         auto_focus_return retval = new auto_focus_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token BOOL105=null;
-        auto_focus_key_return auto_focus_key104 = null;
+        Token BOOL106=null;
+        auto_focus_key_return auto_focus_key105 = null;
 
 
-        Object BOOL105_tree=null;
+        Object BOOL106_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:771:2: ( auto_focus_key ( BOOL )? )
-            // src/main/resources/org/drools/lang/DRL.g:771:4: auto_focus_key ( BOOL )?
+            // src/main/resources/org/drools/lang/DRL.g:773:2: ( auto_focus_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:773:4: auto_focus_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1866);
-            auto_focus_key104=auto_focus_key();
+            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1890);
+            auto_focus_key105=auto_focus_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key104.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key105.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:771:69: ( BOOL )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:773:69: ( BOOL )?
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA39_0==BOOL) ) {
-                alt39=1;
+            if ( (LA40_0==BOOL) ) {
+                alt40=1;
             }
-            switch (alt39) {
+            switch (alt40) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:771:69: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:773:69: BOOL
                     {
-                    BOOL105=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1871); if (failed) return retval;
+                    BOOL106=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1895); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL105_tree = (Object)adaptor.create(BOOL105);
-                    adaptor.addChild(root_0, BOOL105_tree);
+                    BOOL106_tree = (Object)adaptor.create(BOOL106);
+                    adaptor.addChild(root_0, BOOL106_tree);
                     }
 
                     }
@@ -5011,7 +4949,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL105, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL106, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -5039,41 +4977,41 @@
     };
 
     // $ANTLR start activation_group
-    // src/main/resources/org/drools/lang/DRL.g:775:1: activation_group : activation_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:777:1: activation_group : activation_group_key STRING ;
     public final activation_group_return activation_group() throws RecognitionException {
         activation_group_return retval = new activation_group_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING107=null;
-        activation_group_key_return activation_group_key106 = null;
+        Token STRING108=null;
+        activation_group_key_return activation_group_key107 = null;
 
 
-        Object STRING107_tree=null;
+        Object STRING108_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:776:2: ( activation_group_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:776:4: activation_group_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:778:2: ( activation_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:778:4: activation_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_activation_group_key_in_activation_group1888);
-            activation_group_key106=activation_group_key();
+            pushFollow(FOLLOW_activation_group_key_in_activation_group1912);
+            activation_group_key107=activation_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key106.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key107.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING107=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1893); if (failed) return retval;
+            STRING108=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_activation_group1917); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING107_tree = (Object)adaptor.create(STRING107);
-            adaptor.addChild(root_0, STRING107_tree);
+            STRING108_tree = (Object)adaptor.create(STRING108);
+            adaptor.addChild(root_0, STRING108_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING107, DroolsEditorType.STRING_CONST );	
+              	emit(STRING108, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5101,41 +5039,41 @@
     };
 
     // $ANTLR start ruleflow_group
-    // src/main/resources/org/drools/lang/DRL.g:780:1: ruleflow_group : ruleflow_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:782:1: ruleflow_group : ruleflow_group_key STRING ;
     public final ruleflow_group_return ruleflow_group() throws RecognitionException {
         ruleflow_group_return retval = new ruleflow_group_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING109=null;
-        ruleflow_group_key_return ruleflow_group_key108 = null;
+        Token STRING110=null;
+        ruleflow_group_key_return ruleflow_group_key109 = null;
 
 
-        Object STRING109_tree=null;
+        Object STRING110_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:781:2: ( ruleflow_group_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:781:4: ruleflow_group_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:783:2: ( ruleflow_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:783:4: ruleflow_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1907);
-            ruleflow_group_key108=ruleflow_group_key();
+            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1931);
+            ruleflow_group_key109=ruleflow_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key108.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key109.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING109=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1912); if (failed) return retval;
+            STRING110=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1936); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING109_tree = (Object)adaptor.create(STRING109);
-            adaptor.addChild(root_0, STRING109_tree);
+            STRING110_tree = (Object)adaptor.create(STRING110);
+            adaptor.addChild(root_0, STRING110_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING109, DroolsEditorType.STRING_CONST );	
+              	emit(STRING110, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5163,41 +5101,41 @@
     };
 
     // $ANTLR start agenda_group
-    // src/main/resources/org/drools/lang/DRL.g:785:1: agenda_group : agenda_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:787:1: agenda_group : agenda_group_key STRING ;
     public final agenda_group_return agenda_group() throws RecognitionException {
         agenda_group_return retval = new agenda_group_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING111=null;
-        agenda_group_key_return agenda_group_key110 = null;
+        Token STRING112=null;
+        agenda_group_key_return agenda_group_key111 = null;
 
 
-        Object STRING111_tree=null;
+        Object STRING112_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:786:2: ( agenda_group_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:786:4: agenda_group_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:788:2: ( agenda_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:788:4: agenda_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1926);
-            agenda_group_key110=agenda_group_key();
+            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1950);
+            agenda_group_key111=agenda_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key110.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key111.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING111=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1931); if (failed) return retval;
+            STRING112=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1955); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING111_tree = (Object)adaptor.create(STRING111);
-            adaptor.addChild(root_0, STRING111_tree);
+            STRING112_tree = (Object)adaptor.create(STRING112);
+            adaptor.addChild(root_0, STRING112_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING111, DroolsEditorType.STRING_CONST );	
+              	emit(STRING112, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5225,41 +5163,41 @@
     };
 
     // $ANTLR start duration
-    // src/main/resources/org/drools/lang/DRL.g:790:1: duration : duration_key INT ;
+    // src/main/resources/org/drools/lang/DRL.g:792:1: duration : duration_key INT ;
     public final duration_return duration() throws RecognitionException {
         duration_return retval = new duration_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token INT113=null;
-        duration_key_return duration_key112 = null;
+        Token INT114=null;
+        duration_key_return duration_key113 = null;
 
 
-        Object INT113_tree=null;
+        Object INT114_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:791:2: ( duration_key INT )
-            // src/main/resources/org/drools/lang/DRL.g:791:4: duration_key INT
+            // src/main/resources/org/drools/lang/DRL.g:793:2: ( duration_key INT )
+            // src/main/resources/org/drools/lang/DRL.g:793:4: duration_key INT
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_duration_key_in_duration1945);
-            duration_key112=duration_key();
+            pushFollow(FOLLOW_duration_key_in_duration1969);
+            duration_key113=duration_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key112.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key113.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            INT113=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1950); if (failed) return retval;
+            INT114=(Token)input.LT(1);
+            match(input,INT,FOLLOW_INT_in_duration1974); if (failed) return retval;
             if ( backtracking==0 ) {
-            INT113_tree = (Object)adaptor.create(INT113);
-            adaptor.addChild(root_0, INT113_tree);
+            INT114_tree = (Object)adaptor.create(INT114);
+            adaptor.addChild(root_0, INT114_tree);
             }
             if ( backtracking==0 ) {
-              	emit(INT113, DroolsEditorType.NUMERIC_CONST );	
+              	emit(INT114, DroolsEditorType.NUMERIC_CONST );	
             }
 
             }
@@ -5287,41 +5225,41 @@
     };
 
     // $ANTLR start dialect
-    // src/main/resources/org/drools/lang/DRL.g:795:1: dialect : dialect_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:797:1: dialect : dialect_key STRING ;
     public final dialect_return dialect() throws RecognitionException {
         dialect_return retval = new dialect_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING115=null;
-        dialect_key_return dialect_key114 = null;
+        Token STRING116=null;
+        dialect_key_return dialect_key115 = null;
 
 
-        Object STRING115_tree=null;
+        Object STRING116_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:796:2: ( dialect_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:796:4: dialect_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:798:2: ( dialect_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:798:4: dialect_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_dialect_key_in_dialect1966);
-            dialect_key114=dialect_key();
+            pushFollow(FOLLOW_dialect_key_in_dialect1990);
+            dialect_key115=dialect_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key114.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key115.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING115=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1971); if (failed) return retval;
+            STRING116=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_dialect1995); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING115_tree = (Object)adaptor.create(STRING115);
-            adaptor.addChild(root_0, STRING115_tree);
+            STRING116_tree = (Object)adaptor.create(STRING116);
+            adaptor.addChild(root_0, STRING116_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING115, DroolsEditorType.STRING_CONST );	
+              	emit(STRING116, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5349,49 +5287,49 @@
     };
 
     // $ANTLR start lock_on_active
-    // src/main/resources/org/drools/lang/DRL.g:800:1: lock_on_active : lock_on_active_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:802:1: lock_on_active : lock_on_active_key ( BOOL )? ;
     public final lock_on_active_return lock_on_active() throws RecognitionException {
         lock_on_active_return retval = new lock_on_active_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token BOOL117=null;
-        lock_on_active_key_return lock_on_active_key116 = null;
+        Token BOOL118=null;
+        lock_on_active_key_return lock_on_active_key117 = null;
 
 
-        Object BOOL117_tree=null;
+        Object BOOL118_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:801:2: ( lock_on_active_key ( BOOL )? )
-            // src/main/resources/org/drools/lang/DRL.g:801:4: lock_on_active_key ( BOOL )?
+            // src/main/resources/org/drools/lang/DRL.g:803:2: ( lock_on_active_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:803:4: lock_on_active_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active1989);
-            lock_on_active_key116=lock_on_active_key();
+            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active2013);
+            lock_on_active_key117=lock_on_active_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key116.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key117.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:801:73: ( BOOL )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:803:73: ( BOOL )?
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA40_0==BOOL) ) {
-                alt40=1;
+            if ( (LA41_0==BOOL) ) {
+                alt41=1;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:801:73: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:803:73: BOOL
                     {
-                    BOOL117=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1994); if (failed) return retval;
+                    BOOL118=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active2018); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL117_tree = (Object)adaptor.create(BOOL117);
-                    adaptor.addChild(root_0, BOOL117_tree);
+                    BOOL118_tree = (Object)adaptor.create(BOOL118);
+                    adaptor.addChild(root_0, BOOL118_tree);
                     }
 
                     }
@@ -5400,7 +5338,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL117, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL118, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -5428,47 +5366,47 @@
     };
 
     // $ANTLR start normal_lhs_block
-    // src/main/resources/org/drools/lang/DRL.g:805:1: normal_lhs_block : ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:807:1: normal_lhs_block : ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) ;
     public final normal_lhs_block_return normal_lhs_block() throws RecognitionException {
         normal_lhs_block_return retval = new normal_lhs_block_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        lhs_return lhs118 = null;
+        lhs_return lhs119 = null;
 
 
         RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:806:2: ( ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) )
-            // src/main/resources/org/drools/lang/DRL.g:806:4: ( lhs )*
+            // src/main/resources/org/drools/lang/DRL.g:808:2: ( ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:808:4: ( lhs )*
             {
-            // src/main/resources/org/drools/lang/DRL.g:806:4: ( lhs )*
-            loop41:
+            // src/main/resources/org/drools/lang/DRL.g:808:4: ( lhs )*
+            loop42:
             do {
-                int alt41=2;
-                int LA41_0 = input.LA(1);
+                int alt42=2;
+                int LA42_0 = input.LA(1);
 
-                if ( (LA41_0==ID||LA41_0==LEFT_PAREN) ) {
-                    alt41=1;
+                if ( (LA42_0==ID||LA42_0==LEFT_PAREN) ) {
+                    alt42=1;
                 }
 
 
-                switch (alt41) {
+                switch (alt42) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:806:4: lhs
+            	    // src/main/resources/org/drools/lang/DRL.g:808:4: lhs
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block2009);
-            	    lhs118=lhs();
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block2033);
+            	    lhs119=lhs();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs.add(lhs118.getTree());
+            	    if ( backtracking==0 ) stream_lhs.add(lhs119.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop41;
+            	    break loop42;
                 }
             } while (true);
 
@@ -5484,14 +5422,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 807:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
+            // 809:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:807:5: ^( VT_AND_IMPLICIT ( lhs )* )
+                // src/main/resources/org/drools/lang/DRL.g:809:5: ^( VT_AND_IMPLICIT ( lhs )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_AND_IMPLICIT, "VT_AND_IMPLICIT"), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:807:23: ( lhs )*
+                // src/main/resources/org/drools/lang/DRL.g:809:23: ( lhs )*
                 while ( stream_lhs.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs.next());
 
@@ -5530,28 +5468,28 @@
     };
 
     // $ANTLR start lhs
-    // src/main/resources/org/drools/lang/DRL.g:810:1: lhs : lhs_or ;
+    // src/main/resources/org/drools/lang/DRL.g:812:1: lhs : lhs_or ;
     public final lhs_return lhs() throws RecognitionException {
         lhs_return retval = new lhs_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        lhs_or_return lhs_or119 = null;
+        lhs_or_return lhs_or120 = null;
 
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:810:5: ( lhs_or )
-            // src/main/resources/org/drools/lang/DRL.g:810:7: lhs_or
+            // src/main/resources/org/drools/lang/DRL.g:812:5: ( lhs_or )
+            // src/main/resources/org/drools/lang/DRL.g:812:7: lhs_or
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lhs_or_in_lhs2030);
-            lhs_or119=lhs_or();
+            pushFollow(FOLLOW_lhs_or_in_lhs2054);
+            lhs_or120=lhs_or();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or119.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or120.getTree());
 
             }
 
@@ -5578,7 +5516,7 @@
     };
 
     // $ANTLR start lhs_or
-    // src/main/resources/org/drools/lang/DRL.g:813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );
+    // src/main/resources/org/drools/lang/DRL.g:815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );
     public final lhs_or_return lhs_or() throws RecognitionException {
         lhs_or_return retval = new lhs_or_return();
         retval.start = input.LT(1);
@@ -5586,64 +5524,64 @@
         Object root_0 = null;
 
         Token pipe=null;
-        Token LEFT_PAREN120=null;
-        Token RIGHT_PAREN122=null;
+        Token LEFT_PAREN121=null;
+        Token RIGHT_PAREN123=null;
         or_key_return or = null;
 
         or_key_return value = null;
 
-        lhs_and_return lhs_and121 = null;
+        lhs_and_return lhs_and122 = null;
 
-        lhs_and_return lhs_and123 = null;
-
         lhs_and_return lhs_and124 = null;
 
+        lhs_and_return lhs_and125 = null;
 
+
         Object pipe_tree=null;
-        Object LEFT_PAREN120_tree=null;
-        Object RIGHT_PAREN122_tree=null;
+        Object LEFT_PAREN121_tree=null;
+        Object RIGHT_PAREN123_tree=null;
         RewriteRuleTokenStream stream_DOUBLE_PIPE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_PIPE");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_or_key=new RewriteRuleSubtreeStream(adaptor,"rule or_key");
         RewriteRuleSubtreeStream stream_lhs_and=new RewriteRuleSubtreeStream(adaptor,"rule lhs_and");
-
+        
         	Token orToken = null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:816:3: ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* )
-            int alt45=2;
-            int LA45_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:818:3: ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* )
+            int alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA45_0==LEFT_PAREN) ) {
-                int LA45_1 = input.LA(2);
+            if ( (LA46_0==LEFT_PAREN) ) {
+                int LA46_1 = input.LA(2);
 
-                if ( (LA45_1==LEFT_PAREN) ) {
-                    alt45=2;
+                if ( (LA46_1==LEFT_PAREN) ) {
+                    alt46=2;
                 }
-                else if ( (LA45_1==ID) ) {
+                else if ( (LA46_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt45=2;
+                        alt46=2;
                         }
                         break;
                     case LEFT_PAREN:
                         {
-                        int LA45_4 = input.LA(4);
+                        int LA46_4 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt45=1;
+                            alt46=1;
                         }
                         else if ( (true) ) {
-                            alt45=2;
+                            alt46=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 45, 4, input);
+                                new NoViableAltException("815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 46, 4, input);
 
                             throw nvae;
                         }
@@ -5651,18 +5589,18 @@
                         break;
                     case ID:
                         {
-                        int LA45_5 = input.LA(4);
+                        int LA46_5 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt45=1;
+                            alt46=1;
                         }
                         else if ( (true) ) {
-                            alt45=2;
+                            alt46=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 45, 5, input);
+                                new NoViableAltException("815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 46, 5, input);
 
                             throw nvae;
                         }
@@ -5671,7 +5609,7 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 45, 3, input);
+                            new NoViableAltException("815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 46, 3, input);
 
                         throw nvae;
                     }
@@ -5680,33 +5618,33 @@
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 45, 1, input);
+                        new NoViableAltException("815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 46, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA45_0==ID) ) {
-                alt45=2;
+            else if ( (LA46_0==ID) ) {
+                alt46=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("813:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 45, 0, input);
+                    new NoViableAltException("815:1: lhs_or : ( ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN ) | ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )* );", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt45) {
+            switch (alt46) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:816:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:818:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
                     {
-                    LEFT_PAREN120=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2054); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN120);
+                    LEFT_PAREN121=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2078); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN121);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN120, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN121, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_key_in_lhs_or2064);
+                    pushFollow(FOLLOW_or_key_in_lhs_or2088);
                     or=or_key();
                     _fsp--;
                     if (failed) return retval;
@@ -5714,51 +5652,51 @@
                     if ( backtracking==0 ) {
                       	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:820:4: ( lhs_and )+
-                    int cnt42=0;
-                    loop42:
+                    // src/main/resources/org/drools/lang/DRL.g:822:4: ( lhs_and )+
+                    int cnt43=0;
+                    loop43:
                     do {
-                        int alt42=2;
-                        int LA42_0 = input.LA(1);
+                        int alt43=2;
+                        int LA43_0 = input.LA(1);
 
-                        if ( (LA42_0==ID||LA42_0==LEFT_PAREN) ) {
-                            alt42=1;
+                        if ( (LA43_0==ID||LA43_0==LEFT_PAREN) ) {
+                            alt43=1;
                         }
 
 
-                        switch (alt42) {
+                        switch (alt43) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:820:4: lhs_and
+                    	    // src/main/resources/org/drools/lang/DRL.g:822:4: lhs_and
                     	    {
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2072);
-                    	    lhs_and121=lhs_and();
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2096);
+                    	    lhs_and122=lhs_and();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and121.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and122.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt42 >= 1 ) break loop42;
+                    	    if ( cnt43 >= 1 ) break loop43;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(42, input);
+                                    new EarlyExitException(43, input);
                                 throw eee;
                         }
-                        cnt42++;
+                        cnt43++;
                     } while (true);
 
-                    RIGHT_PAREN122=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2078); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN122);
+                    RIGHT_PAREN123=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2102); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN123);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN122, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN123, DroolsEditorType.SYMBOL);	
                     }
 
                     // AST REWRITE
-                    // elements: lhs_and, RIGHT_PAREN
+                    // elements: RIGHT_PAREN, lhs_and
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -5768,9 +5706,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 822:3: -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
+                    // 824:3: -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:822:6: ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
+                        // src/main/resources/org/drools/lang/DRL.g:824:6: ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_OR_PREFIX, ((Token)or.start)), root_1);
@@ -5795,16 +5733,16 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:823:4: ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:825:4: ( lhs_and -> lhs_and ) ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:823:4: ( lhs_and -> lhs_and )
-                    // src/main/resources/org/drools/lang/DRL.g:823:5: lhs_and
+                    // src/main/resources/org/drools/lang/DRL.g:825:4: ( lhs_and -> lhs_and )
+                    // src/main/resources/org/drools/lang/DRL.g:825:5: lhs_and
                     {
-                    pushFollow(FOLLOW_lhs_and_in_lhs_or2101);
-                    lhs_and123=lhs_and();
+                    pushFollow(FOLLOW_lhs_and_in_lhs_or2125);
+                    lhs_and124=lhs_and();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_and.add(lhs_and123.getTree());
+                    if ( backtracking==0 ) stream_lhs_and.add(lhs_and124.getTree());
 
                     // AST REWRITE
                     // elements: lhs_and
@@ -5817,7 +5755,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 823:13: -> lhs_and
+                    // 825:13: -> lhs_and
                     {
                         adaptor.addChild(root_0, stream_lhs_and.next());
 
@@ -5827,58 +5765,58 @@
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:824:3: ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
-                    loop44:
+                    // src/main/resources/org/drools/lang/DRL.g:826:3: ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
+                    loop45:
                     do {
-                        int alt44=2;
-                        int LA44_0 = input.LA(1);
+                        int alt45=2;
+                        int LA45_0 = input.LA(1);
 
-                        if ( (LA44_0==ID) ) {
-                            int LA44_2 = input.LA(2);
+                        if ( (LA45_0==ID) ) {
+                            int LA45_2 = input.LA(2);
 
                             if ( ((synpred2()&&(validateIdentifierKey(DroolsSoftKeywords.OR)))) ) {
-                                alt44=1;
+                                alt45=1;
                             }
 
 
                         }
-                        else if ( (LA44_0==DOUBLE_PIPE) ) {
-                            int LA44_3 = input.LA(2);
+                        else if ( (LA45_0==DOUBLE_PIPE) ) {
+                            int LA45_3 = input.LA(2);
 
                             if ( (synpred2()) ) {
-                                alt44=1;
+                                alt45=1;
                             }
 
 
                         }
 
 
-                        switch (alt44) {
+                        switch (alt45) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:824:5: ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and
+                    	    // src/main/resources/org/drools/lang/DRL.g:826:5: ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and
                     	    {
-                    	    // src/main/resources/org/drools/lang/DRL.g:824:28: (value= or_key | pipe= DOUBLE_PIPE )
-                    	    int alt43=2;
-                    	    int LA43_0 = input.LA(1);
+                    	    // src/main/resources/org/drools/lang/DRL.g:826:28: (value= or_key | pipe= DOUBLE_PIPE )
+                    	    int alt44=2;
+                    	    int LA44_0 = input.LA(1);
 
-                    	    if ( (LA43_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    	        alt43=1;
+                    	    if ( (LA44_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    	        alt44=1;
                     	    }
-                    	    else if ( (LA43_0==DOUBLE_PIPE) ) {
-                    	        alt43=2;
+                    	    else if ( (LA44_0==DOUBLE_PIPE) ) {
+                    	        alt44=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("824:28: (value= or_key | pipe= DOUBLE_PIPE )", 43, 0, input);
+                    	            new NoViableAltException("826:28: (value= or_key | pipe= DOUBLE_PIPE )", 44, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt43) {
+                    	    switch (alt44) {
                     	        case 1 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:824:29: value= or_key
+                    	            // src/main/resources/org/drools/lang/DRL.g:826:29: value= or_key
                     	            {
-                    	            pushFollow(FOLLOW_or_key_in_lhs_or2123);
+                    	            pushFollow(FOLLOW_or_key_in_lhs_or2147);
                     	            value=or_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -5890,10 +5828,10 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:824:69: pipe= DOUBLE_PIPE
+                    	            // src/main/resources/org/drools/lang/DRL.g:826:69: pipe= DOUBLE_PIPE
                     	            {
                     	            pipe=(Token)input.LT(1);
-                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or2130); if (failed) return retval;
+                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or2154); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
                     	            if ( backtracking==0 ) {
@@ -5908,14 +5846,14 @@
                     	    if ( backtracking==0 ) {
                     	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     	    }
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2141);
-                    	    lhs_and124=lhs_and();
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2165);
+                    	    lhs_and125=lhs_and();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and124.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and125.getTree());
 
                     	    // AST REWRITE
-                    	    // elements: lhs_or, lhs_and
+                    	    // elements: lhs_and, lhs_or
                     	    // token labels: 
                     	    // rule labels: retval
                     	    // token list labels: 
@@ -5925,9 +5863,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 827:3: -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
+                    	    // 829:3: -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
                     	    {
-                    	        // src/main/resources/org/drools/lang/DRL.g:827:6: ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
+                    	        // src/main/resources/org/drools/lang/DRL.g:829:6: ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
                     	        {
                     	        Object root_1 = (Object)adaptor.nil();
                     	        root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_OR_INFIX, orToken), root_1);
@@ -5946,7 +5884,7 @@
                     	    break;
 
                     	default :
-                    	    break loop44;
+                    	    break loop45;
                         }
                     } while (true);
 
@@ -5978,7 +5916,7 @@
     };
 
     // $ANTLR start lhs_and
-    // src/main/resources/org/drools/lang/DRL.g:830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );
+    // src/main/resources/org/drools/lang/DRL.g:832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );
     public final lhs_and_return lhs_and() throws RecognitionException {
         lhs_and_return retval = new lhs_and_return();
         retval.start = input.LT(1);
@@ -5986,83 +5924,67 @@
         Object root_0 = null;
 
         Token amper=null;
-        Token LEFT_PAREN125=null;
-        Token RIGHT_PAREN127=null;
+        Token LEFT_PAREN126=null;
+        Token RIGHT_PAREN128=null;
         and_key_return and = null;
 
         and_key_return value = null;
 
-        lhs_unary_return lhs_unary126 = null;
+        lhs_unary_return lhs_unary127 = null;
 
-        lhs_unary_return lhs_unary128 = null;
-
         lhs_unary_return lhs_unary129 = null;
 
+        lhs_unary_return lhs_unary130 = null;
 
+
         Object amper_tree=null;
-        Object LEFT_PAREN125_tree=null;
-        Object RIGHT_PAREN127_tree=null;
+        Object LEFT_PAREN126_tree=null;
+        Object RIGHT_PAREN128_tree=null;
+        RewriteRuleTokenStream stream_DOUBLE_AMPER=new RewriteRuleTokenStream(adaptor,"token DOUBLE_AMPER");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
-        RewriteRuleTokenStream stream_DOUBLE_AMPER=new RewriteRuleTokenStream(adaptor,"token DOUBLE_AMPER");
+        RewriteRuleSubtreeStream stream_and_key=new RewriteRuleSubtreeStream(adaptor,"rule and_key");
         RewriteRuleSubtreeStream stream_lhs_unary=new RewriteRuleSubtreeStream(adaptor,"rule lhs_unary");
-        RewriteRuleSubtreeStream stream_and_key=new RewriteRuleSubtreeStream(adaptor,"rule and_key");
-
+        
         	Token andToken = null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:833:3: ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* )
-            int alt49=2;
-            int LA49_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:835:3: ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* )
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            if ( (LA49_0==LEFT_PAREN) ) {
-                int LA49_1 = input.LA(2);
+            if ( (LA50_0==LEFT_PAREN) ) {
+                int LA50_1 = input.LA(2);
 
-                if ( (LA49_1==ID) ) {
+                if ( (LA50_1==LEFT_PAREN) ) {
+                    alt50=2;
+                }
+                else if ( (LA50_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt49=2;
+                        alt50=2;
                         }
                         break;
                     case LEFT_PAREN:
                         {
                         switch ( input.LA(4) ) {
-                        case LEFT_PAREN:
-                            {
-                            int LA49_6 = input.LA(5);
-
-                            if ( (synpred3()) ) {
-                                alt49=1;
-                            }
-                            else if ( (true) ) {
-                                alt49=2;
-                            }
-                            else {
-                                if (backtracking>0) {failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 6, input);
-
-                                throw nvae;
-                            }
-                            }
-                            break;
                         case ID:
                             {
-                            int LA49_7 = input.LA(5);
+                            int LA50_6 = input.LA(5);
 
                             if ( (synpred3()) ) {
-                                alt49=1;
+                                alt50=1;
                             }
                             else if ( (true) ) {
-                                alt49=2;
+                                alt50=2;
                             }
                             else {
                                 if (backtracking>0) {failed=true; return retval;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 7, input);
+                                    new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 6, input);
 
                                 throw nvae;
                             }
@@ -6192,13 +6114,32 @@
                         case C_STYLE_SINGLE_LINE_COMMENT:
                         case MULTI_LINE_COMMENT:
                             {
-                            alt49=2;
+                            alt50=2;
                             }
                             break;
+                        case LEFT_PAREN:
+                            {
+                            int LA50_7 = input.LA(5);
+
+                            if ( (synpred3()) ) {
+                                alt50=1;
+                            }
+                            else if ( (true) ) {
+                                alt50=2;
+                            }
+                            else {
+                                if (backtracking>0) {failed=true; return retval;}
+                                NoViableAltException nvae =
+                                    new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 7, input);
+
+                                throw nvae;
+                            }
+                            }
+                            break;
                         default:
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 4, input);
+                                new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 4, input);
 
                             throw nvae;
                         }
@@ -6207,18 +6148,18 @@
                         break;
                     case ID:
                         {
-                        int LA49_5 = input.LA(4);
+                        int LA50_5 = input.LA(4);
 
                         if ( (synpred3()) ) {
-                            alt49=1;
+                            alt50=1;
                         }
                         else if ( (true) ) {
-                            alt49=2;
+                            alt50=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 5, input);
+                                new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 5, input);
 
                             throw nvae;
                         }
@@ -6227,45 +6168,42 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 3, input);
+                            new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 3, input);
 
                         throw nvae;
                     }
 
                 }
-                else if ( (LA49_1==LEFT_PAREN) ) {
-                    alt49=2;
-                }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 1, input);
+                        new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA49_0==ID) ) {
-                alt49=2;
+            else if ( (LA50_0==ID) ) {
+                alt50=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("830:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 49, 0, input);
+                    new NoViableAltException("832:1: lhs_and : ( ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN ) | ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )* );", 50, 0, input);
 
                 throw nvae;
             }
-            switch (alt49) {
+            switch (alt50) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:833:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:835:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
                     {
-                    LEFT_PAREN125=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2182); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN125);
+                    LEFT_PAREN126=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2206); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN126);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN125, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN126, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_and_key_in_lhs_and2192);
+                    pushFollow(FOLLOW_and_key_in_lhs_and2216);
                     and=and_key();
                     _fsp--;
                     if (failed) return retval;
@@ -6273,47 +6211,47 @@
                     if ( backtracking==0 ) {
                       	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:837:4: ( lhs_unary )+
-                    int cnt46=0;
-                    loop46:
+                    // src/main/resources/org/drools/lang/DRL.g:839:4: ( lhs_unary )+
+                    int cnt47=0;
+                    loop47:
                     do {
-                        int alt46=2;
-                        int LA46_0 = input.LA(1);
+                        int alt47=2;
+                        int LA47_0 = input.LA(1);
 
-                        if ( (LA46_0==ID||LA46_0==LEFT_PAREN) ) {
-                            alt46=1;
+                        if ( (LA47_0==ID||LA47_0==LEFT_PAREN) ) {
+                            alt47=1;
                         }
 
 
-                        switch (alt46) {
+                        switch (alt47) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:837:4: lhs_unary
+                    	    // src/main/resources/org/drools/lang/DRL.g:839:4: lhs_unary
                     	    {
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2200);
-                    	    lhs_unary126=lhs_unary();
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2224);
+                    	    lhs_unary127=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary126.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary127.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt46 >= 1 ) break loop46;
+                    	    if ( cnt47 >= 1 ) break loop47;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(46, input);
+                                    new EarlyExitException(47, input);
                                 throw eee;
                         }
-                        cnt46++;
+                        cnt47++;
                     } while (true);
 
-                    RIGHT_PAREN127=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2206); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN127);
+                    RIGHT_PAREN128=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2230); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN128);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN127, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN128, DroolsEditorType.SYMBOL);	
                     }
 
                     // AST REWRITE
@@ -6327,9 +6265,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 839:3: -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
+                    // 841:3: -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:839:6: ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
+                        // src/main/resources/org/drools/lang/DRL.g:841:6: ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_AND_PREFIX, ((Token)and.start)), root_1);
@@ -6354,16 +6292,16 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:840:4: ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:842:4: ( lhs_unary -> lhs_unary ) ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:840:4: ( lhs_unary -> lhs_unary )
-                    // src/main/resources/org/drools/lang/DRL.g:840:5: lhs_unary
+                    // src/main/resources/org/drools/lang/DRL.g:842:4: ( lhs_unary -> lhs_unary )
+                    // src/main/resources/org/drools/lang/DRL.g:842:5: lhs_unary
                     {
-                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2230);
-                    lhs_unary128=lhs_unary();
+                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2254);
+                    lhs_unary129=lhs_unary();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary128.getTree());
+                    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary129.getTree());
 
                     // AST REWRITE
                     // elements: lhs_unary
@@ -6376,7 +6314,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 840:15: -> lhs_unary
+                    // 842:15: -> lhs_unary
                     {
                         adaptor.addChild(root_0, stream_lhs_unary.next());
 
@@ -6386,58 +6324,58 @@
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:841:3: ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
-                    loop48:
+                    // src/main/resources/org/drools/lang/DRL.g:843:3: ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
+                    loop49:
                     do {
-                        int alt48=2;
-                        int LA48_0 = input.LA(1);
+                        int alt49=2;
+                        int LA49_0 = input.LA(1);
 
-                        if ( (LA48_0==ID) ) {
-                            int LA48_2 = input.LA(2);
+                        if ( (LA49_0==ID) ) {
+                            int LA49_2 = input.LA(2);
 
                             if ( ((synpred4()&&(validateIdentifierKey(DroolsSoftKeywords.AND)))) ) {
-                                alt48=1;
+                                alt49=1;
                             }
 
 
                         }
-                        else if ( (LA48_0==DOUBLE_AMPER) ) {
-                            int LA48_3 = input.LA(2);
+                        else if ( (LA49_0==DOUBLE_AMPER) ) {
+                            int LA49_3 = input.LA(2);
 
                             if ( (synpred4()) ) {
-                                alt48=1;
+                                alt49=1;
                             }
 
 
                         }
 
 
-                        switch (alt48) {
+                        switch (alt49) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:841:5: ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary
+                    	    // src/main/resources/org/drools/lang/DRL.g:843:5: ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary
                     	    {
-                    	    // src/main/resources/org/drools/lang/DRL.g:841:30: (value= and_key | amper= DOUBLE_AMPER )
-                    	    int alt47=2;
-                    	    int LA47_0 = input.LA(1);
+                    	    // src/main/resources/org/drools/lang/DRL.g:843:30: (value= and_key | amper= DOUBLE_AMPER )
+                    	    int alt48=2;
+                    	    int LA48_0 = input.LA(1);
 
-                    	    if ( (LA47_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-                    	        alt47=1;
+                    	    if ( (LA48_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+                    	        alt48=1;
                     	    }
-                    	    else if ( (LA47_0==DOUBLE_AMPER) ) {
-                    	        alt47=2;
+                    	    else if ( (LA48_0==DOUBLE_AMPER) ) {
+                    	        alt48=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("841:30: (value= and_key | amper= DOUBLE_AMPER )", 47, 0, input);
+                    	            new NoViableAltException("843:30: (value= and_key | amper= DOUBLE_AMPER )", 48, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt47) {
+                    	    switch (alt48) {
                     	        case 1 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:841:31: value= and_key
+                    	            // src/main/resources/org/drools/lang/DRL.g:843:31: value= and_key
                     	            {
-                    	            pushFollow(FOLLOW_and_key_in_lhs_and2252);
+                    	            pushFollow(FOLLOW_and_key_in_lhs_and2276);
                     	            value=and_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -6449,10 +6387,10 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:841:73: amper= DOUBLE_AMPER
+                    	            // src/main/resources/org/drools/lang/DRL.g:843:73: amper= DOUBLE_AMPER
                     	            {
                     	            amper=(Token)input.LT(1);
-                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2259); if (failed) return retval;
+                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2283); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_AMPER.add(amper);
 
                     	            if ( backtracking==0 ) {
@@ -6467,14 +6405,14 @@
                     	    if ( backtracking==0 ) {
                     	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     	    }
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2270);
-                    	    lhs_unary129=lhs_unary();
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2294);
+                    	    lhs_unary130=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary129.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary130.getTree());
 
                     	    // AST REWRITE
-                    	    // elements: lhs_and, lhs_unary
+                    	    // elements: lhs_unary, lhs_and
                     	    // token labels: 
                     	    // rule labels: retval
                     	    // token list labels: 
@@ -6484,9 +6422,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 844:3: -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
+                    	    // 846:3: -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
                     	    {
-                    	        // src/main/resources/org/drools/lang/DRL.g:844:6: ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
+                    	        // src/main/resources/org/drools/lang/DRL.g:846:6: ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
                     	        {
                     	        Object root_1 = (Object)adaptor.nil();
                     	        root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_AND_INFIX, andToken), root_1);
@@ -6505,7 +6443,7 @@
                     	    break;
 
                     	default :
-                    	    break loop48;
+                    	    break loop49;
                         }
                     } while (true);
 
@@ -6537,202 +6475,202 @@
     };
 
     // $ANTLR start lhs_unary
-    // src/main/resources/org/drools/lang/DRL.g:847:1: lhs_unary : ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? ;
+    // src/main/resources/org/drools/lang/DRL.g:849:1: lhs_unary : ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? ;
     public final lhs_unary_return lhs_unary() throws RecognitionException {
         lhs_unary_return retval = new lhs_unary_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN135=null;
-        Token RIGHT_PAREN137=null;
-        Token SEMICOLON139=null;
-        lhs_exist_return lhs_exist130 = null;
+        Token LEFT_PAREN136=null;
+        Token RIGHT_PAREN138=null;
+        Token SEMICOLON140=null;
+        lhs_exist_return lhs_exist131 = null;
 
-        lhs_not_binding_return lhs_not_binding131 = null;
+        lhs_not_binding_return lhs_not_binding132 = null;
 
-        lhs_not_return lhs_not132 = null;
+        lhs_not_return lhs_not133 = null;
 
-        lhs_eval_return lhs_eval133 = null;
+        lhs_eval_return lhs_eval134 = null;
 
-        lhs_forall_return lhs_forall134 = null;
+        lhs_forall_return lhs_forall135 = null;
 
-        lhs_or_return lhs_or136 = null;
+        lhs_or_return lhs_or137 = null;
 
-        pattern_source_return pattern_source138 = null;
+        pattern_source_return pattern_source139 = null;
 
 
-        Object LEFT_PAREN135_tree=null;
-        Object RIGHT_PAREN137_tree=null;
-        Object SEMICOLON139_tree=null;
+        Object LEFT_PAREN136_tree=null;
+        Object RIGHT_PAREN138_tree=null;
+        Object SEMICOLON140_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:848:2: ( ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? )
-            // src/main/resources/org/drools/lang/DRL.g:848:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:850:2: ( ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? )
+            // src/main/resources/org/drools/lang/DRL.g:850:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )?
             {
             root_0 = (Object)adaptor.nil();
 
-            // src/main/resources/org/drools/lang/DRL.g:848:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )
-            int alt50=7;
-            int LA50_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:850:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )
+            int alt51=7;
+            int LA51_0 = input.LA(1);
 
-            if ( (LA50_0==ID) ) {
-                int LA50_1 = input.LA(2);
+            if ( (LA51_0==ID) ) {
+                int LA51_1 = input.LA(2);
 
                 if ( ((validateIdentifierKey(DroolsSoftKeywords.EXISTS))) ) {
-                    alt50=1;
+                    alt51=1;
                 }
                 else if ( ((validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))) ) {
-                    alt50=2;
+                    alt51=2;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                    alt50=3;
+                    alt51=3;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                    alt50=4;
+                    alt51=4;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.FORALL))) ) {
-                    alt50=5;
+                    alt51=5;
                 }
                 else if ( (true) ) {
-                    alt50=7;
+                    alt51=7;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("848:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 50, 1, input);
+                        new NoViableAltException("850:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 51, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA50_0==LEFT_PAREN) ) {
-                alt50=6;
+            else if ( (LA51_0==LEFT_PAREN) ) {
+                alt51=6;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("848:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 50, 0, input);
+                    new NoViableAltException("850:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 51, 0, input);
 
                 throw nvae;
             }
-            switch (alt50) {
+            switch (alt51) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:848:6: lhs_exist
+                    // src/main/resources/org/drools/lang/DRL.g:850:6: lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2301);
-                    lhs_exist130=lhs_exist();
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2325);
+                    lhs_exist131=lhs_exist();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist130.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist131.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:849:4: {...}? => lhs_not_binding
+                    // src/main/resources/org/drools/lang/DRL.g:851:4: {...}? => lhs_not_binding
                     {
                     if ( !(validateNotWithBinding()) ) {
                         if (backtracking>0) {failed=true; return retval;}
                         throw new FailedPredicateException(input, "lhs_unary", "validateNotWithBinding()");
                     }
-                    pushFollow(FOLLOW_lhs_not_binding_in_lhs_unary2309);
-                    lhs_not_binding131=lhs_not_binding();
+                    pushFollow(FOLLOW_lhs_not_binding_in_lhs_unary2333);
+                    lhs_not_binding132=lhs_not_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding131.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding132.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:850:5: lhs_not
+                    // src/main/resources/org/drools/lang/DRL.g:852:5: lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2315);
-                    lhs_not132=lhs_not();
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2339);
+                    lhs_not133=lhs_not();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not132.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not133.getTree());
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:851:5: lhs_eval
+                    // src/main/resources/org/drools/lang/DRL.g:853:5: lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2321);
-                    lhs_eval133=lhs_eval();
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2345);
+                    lhs_eval134=lhs_eval();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval133.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval134.getTree());
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:852:5: lhs_forall
+                    // src/main/resources/org/drools/lang/DRL.g:854:5: lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2327);
-                    lhs_forall134=lhs_forall();
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2351);
+                    lhs_forall135=lhs_forall();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall134.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall135.getTree());
 
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:853:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:855:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN135=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2333); if (failed) return retval;
+                    LEFT_PAREN136=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2357); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN135, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                      	emit(LEFT_PAREN136, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2344);
-                    lhs_or136=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2368);
+                    lhs_or137=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or136.getTree());
-                    RIGHT_PAREN137=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2350); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or137.getTree());
+                    RIGHT_PAREN138=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2374); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN137_tree = (Object)adaptor.create(RIGHT_PAREN137);
-                    adaptor.addChild(root_0, RIGHT_PAREN137_tree);
+                    RIGHT_PAREN138_tree = (Object)adaptor.create(RIGHT_PAREN138);
+                    adaptor.addChild(root_0, RIGHT_PAREN138_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN137, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN138, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 7 :
-                    // src/main/resources/org/drools/lang/DRL.g:856:5: pattern_source
+                    // src/main/resources/org/drools/lang/DRL.g:858:5: pattern_source
                     {
-                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2358);
-                    pattern_source138=pattern_source();
+                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2382);
+                    pattern_source139=pattern_source();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source138.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source139.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:858:3: ( ( SEMICOLON )=> SEMICOLON )?
-            int alt51=2;
-            int LA51_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:860:3: ( ( SEMICOLON )=> SEMICOLON )?
+            int alt52=2;
+            int LA52_0 = input.LA(1);
 
-            if ( (LA51_0==SEMICOLON) ) {
-                int LA51_1 = input.LA(2);
+            if ( (LA52_0==SEMICOLON) ) {
+                int LA52_1 = input.LA(2);
 
                 if ( (synpred5()) ) {
-                    alt51=1;
+                    alt52=1;
                 }
             }
-            switch (alt51) {
+            switch (alt52) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:858:4: ( SEMICOLON )=> SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:860:4: ( SEMICOLON )=> SEMICOLON
                     {
-                    SEMICOLON139=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2372); if (failed) return retval;
+                    SEMICOLON140=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2396); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(SEMICOLON139, DroolsEditorType.SYMBOL);	
+                      	emit(SEMICOLON140, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -6766,91 +6704,91 @@
     };
 
     // $ANTLR start lhs_exist
-    // src/main/resources/org/drools/lang/DRL.g:861:1: lhs_exist : exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:863:1: lhs_exist : exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) ;
     public final lhs_exist_return lhs_exist() throws RecognitionException {
         lhs_exist_return retval = new lhs_exist_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN142=null;
-        Token RIGHT_PAREN144=null;
-        exists_key_return exists_key140 = null;
+        Token LEFT_PAREN143=null;
+        Token RIGHT_PAREN145=null;
+        exists_key_return exists_key141 = null;
 
-        lhs_or_return lhs_or141 = null;
+        lhs_or_return lhs_or142 = null;
 
-        lhs_or_return lhs_or143 = null;
+        lhs_or_return lhs_or144 = null;
 
-        lhs_pattern_return lhs_pattern145 = null;
+        lhs_pattern_return lhs_pattern146 = null;
 
 
-        Object LEFT_PAREN142_tree=null;
-        Object RIGHT_PAREN144_tree=null;
+        Object LEFT_PAREN143_tree=null;
+        Object RIGHT_PAREN145_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
-        RewriteRuleSubtreeStream stream_lhs_pattern=new RewriteRuleSubtreeStream(adaptor,"rule lhs_pattern");
         RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         RewriteRuleSubtreeStream stream_exists_key=new RewriteRuleSubtreeStream(adaptor,"rule exists_key");
+        RewriteRuleSubtreeStream stream_lhs_pattern=new RewriteRuleSubtreeStream(adaptor,"rule lhs_pattern");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:862:2: ( exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:862:4: exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            // src/main/resources/org/drools/lang/DRL.g:864:2: ( exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:864:4: exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
             {
-            pushFollow(FOLLOW_exists_key_in_lhs_exist2388);
-            exists_key140=exists_key();
+            pushFollow(FOLLOW_exists_key_in_lhs_exist2412);
+            exists_key141=exists_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_exists_key.add(exists_key140.getTree());
+            if ( backtracking==0 ) stream_exists_key.add(exists_key141.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:864:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
-            int alt52=3;
-            alt52 = dfa52.predict(input);
-            switch (alt52) {
+            // src/main/resources/org/drools/lang/DRL.g:866:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            int alt53=3;
+            alt53 = dfa53.predict(input);
+            switch (alt53) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:864:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // src/main/resources/org/drools/lang/DRL.g:866:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
                     {
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2415);
-                    lhs_or141=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2439);
+                    lhs_or142=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or141.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or142.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:865:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:867:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN142=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2422); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN142);
+                    LEFT_PAREN143=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2446); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN143);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN142, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN143, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2430);
-                    lhs_or143=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2454);
+                    lhs_or144=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or143.getTree());
-                    RIGHT_PAREN144=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2437); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN144);
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or144.getTree());
+                    RIGHT_PAREN145=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2461); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN145);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN144, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN145, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:868:12: lhs_pattern
+                    // src/main/resources/org/drools/lang/DRL.g:870:12: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2452);
-                    lhs_pattern145=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2476);
+                    lhs_pattern146=lhs_pattern();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern145.getTree());
+                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern146.getTree());
 
                     }
                     break;
@@ -6869,26 +6807,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 870:10: -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 872:10: -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:870:13: ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+                // src/main/resources/org/drools/lang/DRL.g:872:13: ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_exists_key.nextNode(), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:870:26: ( lhs_or )?
+                // src/main/resources/org/drools/lang/DRL.g:872:26: ( lhs_or )?
                 if ( stream_lhs_or.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_or.next());
 
                 }
                 stream_lhs_or.reset();
-                // src/main/resources/org/drools/lang/DRL.g:870:34: ( lhs_pattern )?
+                // src/main/resources/org/drools/lang/DRL.g:872:34: ( lhs_pattern )?
                 if ( stream_lhs_pattern.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_pattern.next());
 
                 }
                 stream_lhs_pattern.reset();
-                // src/main/resources/org/drools/lang/DRL.g:870:47: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:872:47: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -6927,37 +6865,37 @@
     };
 
     // $ANTLR start lhs_not_binding
-    // src/main/resources/org/drools/lang/DRL.g:873:1: lhs_not_binding : not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) ;
+    // src/main/resources/org/drools/lang/DRL.g:875:1: lhs_not_binding : not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) ;
     public final lhs_not_binding_return lhs_not_binding() throws RecognitionException {
         lhs_not_binding_return retval = new lhs_not_binding_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        not_key_return not_key146 = null;
+        not_key_return not_key147 = null;
 
-        fact_binding_return fact_binding147 = null;
+        fact_binding_return fact_binding148 = null;
 
 
         RewriteRuleSubtreeStream stream_fact_binding=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding");
         RewriteRuleSubtreeStream stream_not_key=new RewriteRuleSubtreeStream(adaptor,"rule not_key");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:874:2: ( not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) )
-            // src/main/resources/org/drools/lang/DRL.g:874:4: not_key fact_binding
+            // src/main/resources/org/drools/lang/DRL.g:876:2: ( not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) )
+            // src/main/resources/org/drools/lang/DRL.g:876:4: not_key fact_binding
             {
-            pushFollow(FOLLOW_not_key_in_lhs_not_binding2498);
-            not_key146=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not_binding2522);
+            not_key147=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key146.getTree());
-            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2500);
-            fact_binding147=fact_binding();
+            if ( backtracking==0 ) stream_not_key.add(not_key147.getTree());
+            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2524);
+            fact_binding148=fact_binding();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact_binding.add(fact_binding147.getTree());
+            if ( backtracking==0 ) stream_fact_binding.add(fact_binding148.getTree());
 
             // AST REWRITE
-            // elements: fact_binding, not_key
+            // elements: not_key, fact_binding
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6967,14 +6905,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 875:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
+            // 877:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
             {
-                // src/main/resources/org/drools/lang/DRL.g:875:5: ^( not_key ^( VT_PATTERN fact_binding ) )
+                // src/main/resources/org/drools/lang/DRL.g:877:5: ^( not_key ^( VT_PATTERN fact_binding ) )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_not_key.nextNode(), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:875:15: ^( VT_PATTERN fact_binding )
+                // src/main/resources/org/drools/lang/DRL.g:877:15: ^( VT_PATTERN fact_binding )
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_2);
@@ -7016,94 +6954,94 @@
     };
 
     // $ANTLR start lhs_not
-    // src/main/resources/org/drools/lang/DRL.g:878:1: lhs_not : not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:880:1: lhs_not : not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) ;
     public final lhs_not_return lhs_not() throws RecognitionException {
         lhs_not_return retval = new lhs_not_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN150=null;
-        Token RIGHT_PAREN152=null;
-        not_key_return not_key148 = null;
+        Token LEFT_PAREN151=null;
+        Token RIGHT_PAREN153=null;
+        not_key_return not_key149 = null;
 
-        lhs_or_return lhs_or149 = null;
+        lhs_or_return lhs_or150 = null;
 
-        lhs_or_return lhs_or151 = null;
+        lhs_or_return lhs_or152 = null;
 
-        lhs_pattern_return lhs_pattern153 = null;
+        lhs_pattern_return lhs_pattern154 = null;
 
 
-        Object LEFT_PAREN150_tree=null;
-        Object RIGHT_PAREN152_tree=null;
+        Object LEFT_PAREN151_tree=null;
+        Object RIGHT_PAREN153_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
+        RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         RewriteRuleSubtreeStream stream_not_key=new RewriteRuleSubtreeStream(adaptor,"rule not_key");
         RewriteRuleSubtreeStream stream_lhs_pattern=new RewriteRuleSubtreeStream(adaptor,"rule lhs_pattern");
-        RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:878:9: ( not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:878:11: not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            // src/main/resources/org/drools/lang/DRL.g:880:9: ( not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern ) -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:880:11: not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
             {
-            pushFollow(FOLLOW_not_key_in_lhs_not2523);
-            not_key148=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not2547);
+            not_key149=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key148.getTree());
+            if ( backtracking==0 ) stream_not_key.add(not_key149.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:880:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
-            int alt53=3;
-            alt53 = dfa53.predict(input);
-            switch (alt53) {
+            // src/main/resources/org/drools/lang/DRL.g:882:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            int alt54=3;
+            alt54 = dfa54.predict(input);
+            switch (alt54) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:880:5: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // src/main/resources/org/drools/lang/DRL.g:882:5: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
                     {
                     if ( backtracking==0 ) {
                       	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2545);
-                    lhs_or149=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2569);
+                    lhs_or150=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or149.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or150.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:881:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:883:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN150=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2552); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN150);
+                    LEFT_PAREN151=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2576); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN151);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN150, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                      	emit(LEFT_PAREN151, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2561);
-                    lhs_or151=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2585);
+                    lhs_or152=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or151.getTree());
-                    RIGHT_PAREN152=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2567); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN152);
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or152.getTree());
+                    RIGHT_PAREN153=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2591); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN153);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN152, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN153, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:884:6: lhs_pattern
+                    // src/main/resources/org/drools/lang/DRL.g:886:6: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2577);
-                    lhs_pattern153=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2601);
+                    lhs_pattern154=lhs_pattern();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern153.getTree());
+                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern154.getTree());
 
                     }
                     break;
@@ -7112,7 +7050,7 @@
 
 
             // AST REWRITE
-            // elements: not_key, lhs_or, RIGHT_PAREN, lhs_pattern
+            // elements: lhs_pattern, RIGHT_PAREN, lhs_or, not_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7122,26 +7060,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 885:10: -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 887:10: -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:885:13: ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+                // src/main/resources/org/drools/lang/DRL.g:887:13: ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_not_key.nextNode(), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:885:23: ( lhs_or )?
+                // src/main/resources/org/drools/lang/DRL.g:887:23: ( lhs_or )?
                 if ( stream_lhs_or.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_or.next());
 
                 }
                 stream_lhs_or.reset();
-                // src/main/resources/org/drools/lang/DRL.g:885:31: ( lhs_pattern )?
+                // src/main/resources/org/drools/lang/DRL.g:887:31: ( lhs_pattern )?
                 if ( stream_lhs_pattern.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_pattern.next());
 
                 }
                 stream_lhs_pattern.reset();
-                // src/main/resources/org/drools/lang/DRL.g:885:44: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:887:44: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -7180,7 +7118,7 @@
     };
 
     // $ANTLR start lhs_eval
-    // src/main/resources/org/drools/lang/DRL.g:888:1: lhs_eval : ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:890:1: lhs_eval : ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) ;
     public final lhs_eval_return lhs_eval() throws RecognitionException {
         lhs_eval_return retval = new lhs_eval_return();
         retval.start = input.LT(1);
@@ -7192,13 +7130,13 @@
         paren_chunk_return pc = null;
 
 
+        RewriteRuleSubtreeStream stream_eval_key=new RewriteRuleSubtreeStream(adaptor,"rule eval_key");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
-        RewriteRuleSubtreeStream stream_eval_key=new RewriteRuleSubtreeStream(adaptor,"rule eval_key");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:889:2: (ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:889:4: ev= eval_key pc= paren_chunk
+            // src/main/resources/org/drools/lang/DRL.g:891:2: (ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:891:4: ev= eval_key pc= paren_chunk
             {
-            pushFollow(FOLLOW_eval_key_in_lhs_eval2616);
+            pushFollow(FOLLOW_eval_key_in_lhs_eval2640);
             ev=eval_key();
             _fsp--;
             if (failed) return retval;
@@ -7206,7 +7144,7 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_EVAL);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2625);
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2649);
             pc=paren_chunk();
             _fsp--;
             if (failed) return retval;
@@ -7230,9 +7168,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 895:3: -> ^( eval_key paren_chunk )
+            // 897:3: -> ^( eval_key paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:895:6: ^( eval_key paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:897:6: ^( eval_key paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_eval_key.nextNode(), root_1);
@@ -7271,83 +7209,83 @@
     };
 
     // $ANTLR start lhs_forall
-    // src/main/resources/org/drools/lang/DRL.g:898:1: lhs_forall : forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:900:1: lhs_forall : forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) ;
     public final lhs_forall_return lhs_forall() throws RecognitionException {
         lhs_forall_return retval = new lhs_forall_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN155=null;
-        Token RIGHT_PAREN157=null;
-        forall_key_return forall_key154 = null;
+        Token LEFT_PAREN156=null;
+        Token RIGHT_PAREN158=null;
+        forall_key_return forall_key155 = null;
 
-        lhs_pattern_return lhs_pattern156 = null;
+        lhs_pattern_return lhs_pattern157 = null;
 
 
-        Object LEFT_PAREN155_tree=null;
-        Object RIGHT_PAREN157_tree=null;
+        Object LEFT_PAREN156_tree=null;
+        Object RIGHT_PAREN158_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_forall_key=new RewriteRuleSubtreeStream(adaptor,"rule forall_key");
         RewriteRuleSubtreeStream stream_lhs_pattern=new RewriteRuleSubtreeStream(adaptor,"rule lhs_pattern");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:899:2: ( forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) )
-            // src/main/resources/org/drools/lang/DRL.g:899:4: forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:901:2: ( forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:901:4: forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN
             {
-            pushFollow(FOLLOW_forall_key_in_lhs_forall2652);
-            forall_key154=forall_key();
+            pushFollow(FOLLOW_forall_key_in_lhs_forall2676);
+            forall_key155=forall_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_forall_key.add(forall_key154.getTree());
-            LEFT_PAREN155=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2657); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN155);
+            if ( backtracking==0 ) stream_forall_key.add(forall_key155.getTree());
+            LEFT_PAREN156=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2681); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN156);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN155, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN156, DroolsEditorType.SYMBOL);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:901:4: ( lhs_pattern )+
-            int cnt54=0;
-            loop54:
+            // src/main/resources/org/drools/lang/DRL.g:903:4: ( lhs_pattern )+
+            int cnt55=0;
+            loop55:
             do {
-                int alt54=2;
-                int LA54_0 = input.LA(1);
+                int alt55=2;
+                int LA55_0 = input.LA(1);
 
-                if ( (LA54_0==ID) ) {
-                    alt54=1;
+                if ( (LA55_0==ID) ) {
+                    alt55=1;
                 }
 
 
-                switch (alt54) {
+                switch (alt55) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:901:4: lhs_pattern
+            	    // src/main/resources/org/drools/lang/DRL.g:903:4: lhs_pattern
             	    {
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2665);
-            	    lhs_pattern156=lhs_pattern();
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2689);
+            	    lhs_pattern157=lhs_pattern();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern156.getTree());
+            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern157.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    if ( cnt54 >= 1 ) break loop54;
+            	    if ( cnt55 >= 1 ) break loop55;
             	    if (backtracking>0) {failed=true; return retval;}
                         EarlyExitException eee =
-                            new EarlyExitException(54, input);
+                            new EarlyExitException(55, input);
                         throw eee;
                 }
-                cnt54++;
+                cnt55++;
             } while (true);
 
-            RIGHT_PAREN157=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2671); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN157);
+            RIGHT_PAREN158=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2695); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN158);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN157, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN158, DroolsEditorType.SYMBOL);	
             }
 
             // AST REWRITE
@@ -7361,9 +7299,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 903:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+            // 905:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:903:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:905:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_forall_key.nextNode(), root_1);
@@ -7410,111 +7348,111 @@
     };
 
     // $ANTLR start pattern_source
-    // src/main/resources/org/drools/lang/DRL.g:906:1: pattern_source : lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? ;
+    // src/main/resources/org/drools/lang/DRL.g:908:1: pattern_source : lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? ;
     public final pattern_source_return pattern_source() throws RecognitionException {
         pattern_source_return retval = new pattern_source_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token FROM160=null;
-        lhs_pattern_return lhs_pattern158 = null;
+        Token FROM161=null;
+        lhs_pattern_return lhs_pattern159 = null;
 
-        over_clause_return over_clause159 = null;
+        over_clause_return over_clause160 = null;
 
-        accumulate_statement_return accumulate_statement161 = null;
+        accumulate_statement_return accumulate_statement162 = null;
 
-        collect_statement_return collect_statement162 = null;
+        collect_statement_return collect_statement163 = null;
 
-        entrypoint_statement_return entrypoint_statement163 = null;
+        entrypoint_statement_return entrypoint_statement164 = null;
 
-        from_source_return from_source164 = null;
+        from_source_return from_source165 = null;
 
 
-        Object FROM160_tree=null;
+        Object FROM161_tree=null;
 
          boolean isFailed = true;	
         try {
-            // src/main/resources/org/drools/lang/DRL.g:909:2: ( lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? )
-            // src/main/resources/org/drools/lang/DRL.g:909:4: lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
+            // src/main/resources/org/drools/lang/DRL.g:911:2: ( lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? )
+            // src/main/resources/org/drools/lang/DRL.g:911:4: lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2707);
-            lhs_pattern158=lhs_pattern();
+            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2731);
+            lhs_pattern159=lhs_pattern();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_pattern158.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:910:3: ( over_clause )?
-            int alt55=2;
-            int LA55_0 = input.LA(1);
+            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_pattern159.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:912:3: ( over_clause )?
+            int alt56=2;
+            int LA56_0 = input.LA(1);
 
-            if ( (LA55_0==OVER) ) {
-                alt55=1;
+            if ( (LA56_0==OVER) ) {
+                alt56=1;
             }
-            switch (alt55) {
+            switch (alt56) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:910:3: over_clause
+                    // src/main/resources/org/drools/lang/DRL.g:912:3: over_clause
                     {
-                    pushFollow(FOLLOW_over_clause_in_pattern_source2711);
-                    over_clause159=over_clause();
+                    pushFollow(FOLLOW_over_clause_in_pattern_source2735);
+                    over_clause160=over_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause159.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause160.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:911:3: ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
-            int alt57=2;
-            int LA57_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:913:3: ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
+            int alt58=2;
+            int LA58_0 = input.LA(1);
 
-            if ( (LA57_0==FROM) ) {
-                alt57=1;
+            if ( (LA58_0==FROM) ) {
+                alt58=1;
             }
-            switch (alt57) {
+            switch (alt58) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:912:4: FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    // src/main/resources/org/drools/lang/DRL.g:914:4: FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
                     {
-                    FROM160=(Token)input.LT(1);
-                    match(input,FROM,FOLLOW_FROM_in_pattern_source2721); if (failed) return retval;
+                    FROM161=(Token)input.LT(1);
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2745); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    FROM160_tree = (Object)adaptor.create(FROM160);
-                    root_0 = (Object)adaptor.becomeRoot(FROM160_tree, root_0);
+                    FROM161_tree = (Object)adaptor.create(FROM161);
+                    root_0 = (Object)adaptor.becomeRoot(FROM161_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(FROM160, DroolsEditorType.KEYWORD);
+                      	emit(FROM161, DroolsEditorType.KEYWORD);
                       			emit(Location.LOCATION_LHS_FROM);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:915:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
-                    int alt56=4;
+                    // src/main/resources/org/drools/lang/DRL.g:917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    int alt57=4;
                     switch ( input.LA(1) ) {
                     case ACCUMULATE:
                         {
-                        alt56=1;
+                        alt57=1;
                         }
                         break;
                     case COLLECT:
                         {
-                        alt56=2;
+                        alt57=2;
                         }
                         break;
                     case ID:
                         {
-                        int LA56_3 = input.LA(2);
+                        int LA57_3 = input.LA(2);
 
-                        if ( (LA56_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
-                            alt56=3;
+                        if ( (LA57_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
+                            alt57=3;
                         }
-                        else if ( ((LA56_3>=SEMICOLON && LA56_3<=DOT)||LA56_3==END||(LA56_3>=LEFT_PAREN && LA56_3<=RIGHT_PAREN)||(LA56_3>=DOUBLE_PIPE && LA56_3<=DOUBLE_AMPER)||LA56_3==INIT||LA56_3==THEN) ) {
-                            alt56=4;
+                        else if ( ((LA57_3>=SEMICOLON && LA57_3<=DOT)||LA57_3==END||(LA57_3>=LEFT_PAREN && LA57_3<=RIGHT_PAREN)||(LA57_3>=DOUBLE_PIPE && LA57_3<=DOUBLE_AMPER)||LA57_3==INIT||LA57_3==THEN) ) {
+                            alt57=4;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("915:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 56, 3, input);
+                                new NoViableAltException("917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 3, input);
 
                             throw nvae;
                         }
@@ -7523,53 +7461,53 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("915:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 56, 0, input);
+                            new NoViableAltException("917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 0, input);
 
                         throw nvae;
                     }
 
-                    switch (alt56) {
+                    switch (alt57) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:915:14: accumulate_statement
+                            // src/main/resources/org/drools/lang/DRL.g:917:14: accumulate_statement
                             {
-                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2741);
-                            accumulate_statement161=accumulate_statement();
+                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2765);
+                            accumulate_statement162=accumulate_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement161.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement162.getTree());
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:916:15: collect_statement
+                            // src/main/resources/org/drools/lang/DRL.g:918:15: collect_statement
                             {
-                            pushFollow(FOLLOW_collect_statement_in_pattern_source2757);
-                            collect_statement162=collect_statement();
+                            pushFollow(FOLLOW_collect_statement_in_pattern_source2781);
+                            collect_statement163=collect_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement162.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement163.getTree());
 
                             }
                             break;
                         case 3 :
-                            // src/main/resources/org/drools/lang/DRL.g:917:15: entrypoint_statement
+                            // src/main/resources/org/drools/lang/DRL.g:919:15: entrypoint_statement
                             {
-                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2774);
-                            entrypoint_statement163=entrypoint_statement();
+                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2798);
+                            entrypoint_statement164=entrypoint_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement163.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement164.getTree());
 
                             }
                             break;
                         case 4 :
-                            // src/main/resources/org/drools/lang/DRL.g:918:15: from_source
+                            // src/main/resources/org/drools/lang/DRL.g:920:15: from_source
                             {
-                            pushFollow(FOLLOW_from_source_in_pattern_source2790);
-                            from_source164=from_source();
+                            pushFollow(FOLLOW_from_source_in_pattern_source2814);
+                            from_source165=from_source();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source164.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source165.getTree());
 
                             }
                             break;
@@ -7600,7 +7538,7 @@
             recover(input,re);
         }
         finally {
-
+            
             	if (isEditorInterfaceEnabled && input.LA(3) == EOF && input.LA(1) == ACCUMULATE) {
             			emit(input.LT(1), DroolsEditorType.KEYWORD);
             			emit(input.LT(2), DroolsEditorType.SYMBOL);
@@ -7624,57 +7562,57 @@
     };
 
     // $ANTLR start over_clause
-    // src/main/resources/org/drools/lang/DRL.g:936:1: over_clause : OVER over_elements ( COMMA over_elements )* ;
+    // src/main/resources/org/drools/lang/DRL.g:938:1: over_clause : OVER over_elements ( COMMA over_elements )* ;
     public final over_clause_return over_clause() throws RecognitionException {
         over_clause_return retval = new over_clause_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token OVER165=null;
-        Token COMMA167=null;
-        over_elements_return over_elements166 = null;
+        Token OVER166=null;
+        Token COMMA168=null;
+        over_elements_return over_elements167 = null;
 
-        over_elements_return over_elements168 = null;
+        over_elements_return over_elements169 = null;
 
 
-        Object OVER165_tree=null;
-        Object COMMA167_tree=null;
+        Object OVER166_tree=null;
+        Object COMMA168_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:937:2: ( OVER over_elements ( COMMA over_elements )* )
-            // src/main/resources/org/drools/lang/DRL.g:937:4: OVER over_elements ( COMMA over_elements )*
+            // src/main/resources/org/drools/lang/DRL.g:939:2: ( OVER over_elements ( COMMA over_elements )* )
+            // src/main/resources/org/drools/lang/DRL.g:939:4: OVER over_elements ( COMMA over_elements )*
             {
             root_0 = (Object)adaptor.nil();
 
-            OVER165=(Token)input.LT(1);
-            match(input,OVER,FOLLOW_OVER_in_over_clause2822); if (failed) return retval;
+            OVER166=(Token)input.LT(1);
+            match(input,OVER,FOLLOW_OVER_in_over_clause2846); if (failed) return retval;
             if ( backtracking==0 ) {
-            OVER165_tree = (Object)adaptor.create(OVER165);
-            root_0 = (Object)adaptor.becomeRoot(OVER165_tree, root_0);
+            OVER166_tree = (Object)adaptor.create(OVER166);
+            root_0 = (Object)adaptor.becomeRoot(OVER166_tree, root_0);
             }
             if ( backtracking==0 ) {
-              	emit(OVER165, DroolsEditorType.KEYWORD);	
+              	emit(OVER166, DroolsEditorType.KEYWORD);	
             }
-            pushFollow(FOLLOW_over_elements_in_over_clause2827);
-            over_elements166=over_elements();
+            pushFollow(FOLLOW_over_elements_in_over_clause2851);
+            over_elements167=over_elements();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements166.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:938:4: ( COMMA over_elements )*
-            loop58:
+            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements167.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:940:4: ( COMMA over_elements )*
+            loop59:
             do {
-                int alt58=2;
-                int LA58_0 = input.LA(1);
+                int alt59=2;
+                int LA59_0 = input.LA(1);
 
-                if ( (LA58_0==COMMA) ) {
-                    int LA58_2 = input.LA(2);
+                if ( (LA59_0==COMMA) ) {
+                    int LA59_2 = input.LA(2);
 
-                    if ( (LA58_2==ID) ) {
-                        int LA58_3 = input.LA(3);
+                    if ( (LA59_2==ID) ) {
+                        int LA59_3 = input.LA(3);
 
-                        if ( (LA58_3==COLON) ) {
-                            alt58=1;
+                        if ( (LA59_3==COLON) ) {
+                            alt59=1;
                         }
 
 
@@ -7684,26 +7622,26 @@
                 }
 
 
-                switch (alt58) {
+                switch (alt59) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:938:5: COMMA over_elements
+            	    // src/main/resources/org/drools/lang/DRL.g:940:5: COMMA over_elements
             	    {
-            	    COMMA167=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2834); if (failed) return retval;
+            	    COMMA168=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2858); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA167, DroolsEditorType.SYMBOL);	
+            	      	emit(COMMA168, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_over_elements_in_over_clause2839);
-            	    over_elements168=over_elements();
+            	    pushFollow(FOLLOW_over_elements_in_over_clause2863);
+            	    over_elements169=over_elements();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements168.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements169.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop58;
+            	    break loop59;
                 }
             } while (true);
 
@@ -7733,7 +7671,7 @@
     };
 
     // $ANTLR start over_elements
-    // src/main/resources/org/drools/lang/DRL.g:941:1: over_elements : id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:943:1: over_elements : id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) ;
     public final over_elements_return over_elements() throws RecognitionException {
         over_elements_return retval = new over_elements_return();
         retval.start = input.LT(1);
@@ -7742,63 +7680,63 @@
 
         Token id1=null;
         Token id2=null;
-        Token COLON169=null;
-        paren_chunk_return paren_chunk170 = null;
+        Token COLON170=null;
+        paren_chunk_return paren_chunk171 = null;
 
 
         Object id1_tree=null;
         Object id2_tree=null;
-        Object COLON169_tree=null;
+        Object COLON170_tree=null;
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:942:2: (id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:942:4: id1= ID COLON id2= ID paren_chunk
+            // src/main/resources/org/drools/lang/DRL.g:944:2: (id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:944:4: id1= ID COLON id2= ID paren_chunk
             {
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2854); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_over_elements2878); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             if ( backtracking==0 ) {
               	emit(id1, DroolsEditorType.IDENTIFIER);	
             }
-            COLON169=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_over_elements2861); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON169);
+            COLON170=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_over_elements2885); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON170);
 
             if ( backtracking==0 ) {
-              	emit(COLON169, DroolsEditorType.SYMBOL);	
+              	emit(COLON170, DroolsEditorType.SYMBOL);	
             }
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2870); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_over_elements2894); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               	emit(id2, DroolsEditorType.IDENTIFIER);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_over_elements2877);
-            paren_chunk170=paren_chunk();
+            pushFollow(FOLLOW_paren_chunk_in_over_elements2901);
+            paren_chunk171=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk170.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk171.getTree());
 
             // AST REWRITE
             // elements: paren_chunk, id2, id1
-            // token labels: id2, id1
+            // token labels: id1, id2
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
             if ( backtracking==0 ) {
             retval.tree = root_0;
+            RewriteRuleTokenStream stream_id1=new RewriteRuleTokenStream(adaptor,"token id1",id1);
             RewriteRuleTokenStream stream_id2=new RewriteRuleTokenStream(adaptor,"token id2",id2);
-            RewriteRuleTokenStream stream_id1=new RewriteRuleTokenStream(adaptor,"token id1",id1);
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 946:2: -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
+            // 948:2: -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:946:5: ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:948:5: ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_BEHAVIOR, "VT_BEHAVIOR"), root_1);
@@ -7839,75 +7777,75 @@
     };
 
     // $ANTLR start accumulate_statement
-    // src/main/resources/org/drools/lang/DRL.g:949:1: accumulate_statement : ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:951:1: accumulate_statement : ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) ;
     public final accumulate_statement_return accumulate_statement() throws RecognitionException {
         accumulate_statement_return retval = new accumulate_statement_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ACCUMULATE171=null;
-        Token LEFT_PAREN172=null;
-        Token COMMA174=null;
-        Token RIGHT_PAREN177=null;
-        lhs_or_return lhs_or173 = null;
+        Token ACCUMULATE172=null;
+        Token LEFT_PAREN173=null;
+        Token COMMA175=null;
+        Token RIGHT_PAREN178=null;
+        lhs_or_return lhs_or174 = null;
 
-        accumulate_init_clause_return accumulate_init_clause175 = null;
+        accumulate_init_clause_return accumulate_init_clause176 = null;
 
-        accumulate_id_clause_return accumulate_id_clause176 = null;
+        accumulate_id_clause_return accumulate_id_clause177 = null;
 
 
-        Object ACCUMULATE171_tree=null;
-        Object LEFT_PAREN172_tree=null;
-        Object COMMA174_tree=null;
-        Object RIGHT_PAREN177_tree=null;
+        Object ACCUMULATE172_tree=null;
+        Object LEFT_PAREN173_tree=null;
+        Object COMMA175_tree=null;
+        Object RIGHT_PAREN178_tree=null;
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_ACCUMULATE=new RewriteRuleTokenStream(adaptor,"token ACCUMULATE");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
-        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         RewriteRuleSubtreeStream stream_accumulate_init_clause=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_init_clause");
         RewriteRuleSubtreeStream stream_accumulate_id_clause=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_id_clause");
-        RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:950:2: ( ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) )
-            // src/main/resources/org/drools/lang/DRL.g:950:4: ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:952:2: ( ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:952:4: ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN
             {
-            ACCUMULATE171=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2903); if (failed) return retval;
-            if ( backtracking==0 ) stream_ACCUMULATE.add(ACCUMULATE171);
+            ACCUMULATE172=(Token)input.LT(1);
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2927); if (failed) return retval;
+            if ( backtracking==0 ) stream_ACCUMULATE.add(ACCUMULATE172);
 
             if ( backtracking==0 ) {
-              	emit(ACCUMULATE171, DroolsEditorType.KEYWORD);	
+              	emit(ACCUMULATE172, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE);	
             }
-            LEFT_PAREN172=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2912); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN172);
+            LEFT_PAREN173=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2936); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN173);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN172, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN173, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2920);
-            lhs_or173=lhs_or();
+            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2944);
+            lhs_or174=lhs_or();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_lhs_or.add(lhs_or173.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:954:3: ( COMMA )?
-            int alt59=2;
-            int LA59_0 = input.LA(1);
+            if ( backtracking==0 ) stream_lhs_or.add(lhs_or174.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:956:3: ( COMMA )?
+            int alt60=2;
+            int LA60_0 = input.LA(1);
 
-            if ( (LA59_0==COMMA) ) {
-                alt59=1;
+            if ( (LA60_0==COMMA) ) {
+                alt60=1;
             }
-            switch (alt59) {
+            switch (alt60) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:954:3: COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:956:3: COMMA
                     {
-                    COMMA174=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2925); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COMMA.add(COMMA174);
+                    COMMA175=(Token)input.LT(1);
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2949); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COMMA.add(COMMA175);
 
 
                     }
@@ -7916,64 +7854,64 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(COMMA174, DroolsEditorType.SYMBOL);	
+              	emit(COMMA175, DroolsEditorType.SYMBOL);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:955:3: ( accumulate_init_clause | accumulate_id_clause )
-            int alt60=2;
-            int LA60_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:957:3: ( accumulate_init_clause | accumulate_id_clause )
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( (LA60_0==INIT) ) {
-                alt60=1;
+            if ( (LA61_0==INIT) ) {
+                alt61=1;
             }
-            else if ( (LA60_0==ID) ) {
-                alt60=2;
+            else if ( (LA61_0==ID) ) {
+                alt61=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("955:3: ( accumulate_init_clause | accumulate_id_clause )", 60, 0, input);
+                    new NoViableAltException("957:3: ( accumulate_init_clause | accumulate_id_clause )", 61, 0, input);
 
                 throw nvae;
             }
-            switch (alt60) {
+            switch (alt61) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:955:5: accumulate_init_clause
+                    // src/main/resources/org/drools/lang/DRL.g:957:5: accumulate_init_clause
                     {
-                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2935);
-                    accumulate_init_clause175=accumulate_init_clause();
+                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2959);
+                    accumulate_init_clause176=accumulate_init_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause175.getTree());
+                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause176.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:956:5: accumulate_id_clause
+                    // src/main/resources/org/drools/lang/DRL.g:958:5: accumulate_id_clause
                     {
-                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2941);
-                    accumulate_id_clause176=accumulate_id_clause();
+                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2965);
+                    accumulate_id_clause177=accumulate_id_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause176.getTree());
+                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause177.getTree());
 
                     }
                     break;
 
             }
 
-            RIGHT_PAREN177=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2949); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN177);
+            RIGHT_PAREN178=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2973); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN178);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN177, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN178, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
 
             // AST REWRITE
-            // elements: accumulate_init_clause, lhs_or, ACCUMULATE, RIGHT_PAREN, accumulate_id_clause
+            // elements: accumulate_id_clause, RIGHT_PAREN, accumulate_init_clause, ACCUMULATE, lhs_or
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7983,21 +7921,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 960:3: -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
+            // 962:3: -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:960:6: ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:962:6: ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ACCUMULATE.next(), root_1);
 
                 adaptor.addChild(root_1, stream_lhs_or.next());
-                // src/main/resources/org/drools/lang/DRL.g:960:26: ( accumulate_init_clause )?
+                // src/main/resources/org/drools/lang/DRL.g:962:26: ( accumulate_init_clause )?
                 if ( stream_accumulate_init_clause.hasNext() ) {
                     adaptor.addChild(root_1, stream_accumulate_init_clause.next());
 
                 }
                 stream_accumulate_init_clause.reset();
-                // src/main/resources/org/drools/lang/DRL.g:960:50: ( accumulate_id_clause )?
+                // src/main/resources/org/drools/lang/DRL.g:962:50: ( accumulate_id_clause )?
                 if ( stream_accumulate_id_clause.hasNext() ) {
                     adaptor.addChild(root_1, stream_accumulate_id_clause.next());
 
@@ -8037,7 +7975,7 @@
     };
 
     // $ANTLR start accumulate_init_clause
-    // src/main/resources/org/drools/lang/DRL.g:964:1: accumulate_init_clause : INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE] -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) ;
+    // src/main/resources/org/drools/lang/DRL.g:966:1: accumulate_init_clause : INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE] -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) ;
     public final accumulate_init_clause_return accumulate_init_clause() throws RecognitionException {
         accumulate_init_clause_return retval = new accumulate_init_clause_return();
         retval.start = input.LT(1);
@@ -8047,7 +7985,7 @@
         Token cm1=null;
         Token cm2=null;
         Token cm3=null;
-        Token INIT178=null;
+        Token INIT179=null;
         accumulate_paren_chunk_return pc1 = null;
 
         accumulate_paren_chunk_return pc2 = null;
@@ -8058,54 +7996,54 @@
 
         accumulate_paren_chunk_return pc4 = null;
 
-        action_key_return action_key179 = null;
+        action_key_return action_key180 = null;
 
-        reverse_key_return reverse_key180 = null;
+        reverse_key_return reverse_key181 = null;
 
 
         Object cm1_tree=null;
         Object cm2_tree=null;
         Object cm3_tree=null;
-        Object INIT178_tree=null;
+        Object INIT179_tree=null;
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_INIT=new RewriteRuleTokenStream(adaptor,"token INIT");
-        RewriteRuleSubtreeStream stream_action_key=new RewriteRuleSubtreeStream(adaptor,"rule action_key");
         RewriteRuleSubtreeStream stream_accumulate_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_paren_chunk");
         RewriteRuleSubtreeStream stream_reverse_key=new RewriteRuleSubtreeStream(adaptor,"rule reverse_key");
         RewriteRuleSubtreeStream stream_result_key=new RewriteRuleSubtreeStream(adaptor,"rule result_key");
+        RewriteRuleSubtreeStream stream_action_key=new RewriteRuleSubtreeStream(adaptor,"rule action_key");
          boolean isFailed = true;	
         try {
-            // src/main/resources/org/drools/lang/DRL.g:967:2: ( INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE] -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) )
-            // src/main/resources/org/drools/lang/DRL.g:967:4: INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE]
+            // src/main/resources/org/drools/lang/DRL.g:969:2: ( INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE] -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) )
+            // src/main/resources/org/drools/lang/DRL.g:969:4: INIT pc1= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE] (cm1= COMMA )? action_key pc2= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE] (cm2= COMMA )? ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )? res1= result_key pc4= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE]
             {
-            INIT178=(Token)input.LT(1);
-            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause2995); if (failed) return retval;
-            if ( backtracking==0 ) stream_INIT.add(INIT178);
+            INIT179=(Token)input.LT(1);
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause3019); if (failed) return retval;
+            if ( backtracking==0 ) stream_INIT.add(INIT179);
 
             if ( backtracking==0 ) {
-              	emit(INIT178, DroolsEditorType.KEYWORD);	
+              	emit(INIT179, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT);	
             }
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3006);
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3030);
             pc1=accumulate_paren_chunk(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_accumulate_paren_chunk.add(pc1.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:969:84: (cm1= COMMA )?
-            int alt61=2;
-            int LA61_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:971:84: (cm1= COMMA )?
+            int alt62=2;
+            int LA62_0 = input.LA(1);
 
-            if ( (LA61_0==COMMA) ) {
-                alt61=1;
+            if ( (LA62_0==COMMA) ) {
+                alt62=1;
             }
-            switch (alt61) {
+            switch (alt62) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:969:84: cm1= COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:971:84: cm1= COMMA
                     {
                     cm1=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3011); if (failed) return retval;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3035); if (failed) return retval;
                     if ( backtracking==0 ) stream_COMMA.add(cm1);
 
 
@@ -8120,29 +8058,29 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION);	
             }
-            pushFollow(FOLLOW_action_key_in_accumulate_init_clause3022);
-            action_key179=action_key();
+            pushFollow(FOLLOW_action_key_in_accumulate_init_clause3046);
+            action_key180=action_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_action_key.add(action_key179.getTree());
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3026);
+            if ( backtracking==0 ) stream_action_key.add(action_key180.getTree());
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3050);
             pc2=accumulate_paren_chunk(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_accumulate_paren_chunk.add(pc2.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:971:97: (cm2= COMMA )?
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:973:97: (cm2= COMMA )?
+            int alt63=2;
+            int LA63_0 = input.LA(1);
 
-            if ( (LA62_0==COMMA) ) {
-                alt62=1;
+            if ( (LA63_0==COMMA) ) {
+                alt63=1;
             }
-            switch (alt62) {
+            switch (alt63) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:971:97: cm2= COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:973:97: cm2= COMMA
                     {
                     cm2=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3031); if (failed) return retval;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3055); if (failed) return retval;
                     if ( backtracking==0 ) stream_COMMA.add(cm2);
 
 
@@ -8157,36 +8095,36 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:974:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?
-            int alt64=2;
-            alt64 = dfa64.predict(input);
-            switch (alt64) {
+            // src/main/resources/org/drools/lang/DRL.g:976:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?
+            int alt65=2;
+            alt65 = dfa65.predict(input);
+            switch (alt65) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:974:4: reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )?
+                    // src/main/resources/org/drools/lang/DRL.g:976:4: reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )?
                     {
-                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause3044);
-                    reverse_key180=reverse_key();
+                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause3068);
+                    reverse_key181=reverse_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key180.getTree());
-                    pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3048);
+                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key181.getTree());
+                    pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3072);
                     pc3=accumulate_paren_chunk(Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE);
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_accumulate_paren_chunk.add(pc3.getTree());
-                    // src/main/resources/org/drools/lang/DRL.g:974:100: (cm3= COMMA )?
-                    int alt63=2;
-                    int LA63_0 = input.LA(1);
+                    // src/main/resources/org/drools/lang/DRL.g:976:100: (cm3= COMMA )?
+                    int alt64=2;
+                    int LA64_0 = input.LA(1);
 
-                    if ( (LA63_0==COMMA) ) {
-                        alt63=1;
+                    if ( (LA64_0==COMMA) ) {
+                        alt64=1;
                     }
-                    switch (alt63) {
+                    switch (alt64) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:974:100: cm3= COMMA
+                            // src/main/resources/org/drools/lang/DRL.g:976:100: cm3= COMMA
                             {
                             cm3=(Token)input.LT(1);
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3053); if (failed) return retval;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3077); if (failed) return retval;
                             if ( backtracking==0 ) stream_COMMA.add(cm3);
 
 
@@ -8207,7 +8145,7 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	
             }
-            pushFollow(FOLLOW_result_key_in_accumulate_init_clause3068);
+            pushFollow(FOLLOW_result_key_in_accumulate_init_clause3092);
             res1=result_key();
             _fsp--;
             if (failed) return retval;
@@ -8215,35 +8153,35 @@
             if ( backtracking==0 ) {
               	emit(((Token)res1.start), DroolsEditorType.KEYWORD);	
             }
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3074);
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3098);
             pc4=accumulate_paren_chunk(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_accumulate_paren_chunk.add(pc4.getTree());
 
             // AST REWRITE
-            // elements: pc2, pc1, pc3, result_key, reverse_key, INIT, pc4, action_key
+            // elements: pc3, action_key, pc2, pc1, INIT, pc4, reverse_key, result_key
             // token labels: 
-            // rule labels: pc4, pc3, retval, pc1, pc2
+            // rule labels: pc2, pc4, pc3, pc1, retval
             // token list labels: 
             // rule list labels: 
             if ( backtracking==0 ) {
             retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_pc2=new RewriteRuleSubtreeStream(adaptor,"token pc2",pc2!=null?pc2.tree:null);
             RewriteRuleSubtreeStream stream_pc4=new RewriteRuleSubtreeStream(adaptor,"token pc4",pc4!=null?pc4.tree:null);
             RewriteRuleSubtreeStream stream_pc3=new RewriteRuleSubtreeStream(adaptor,"token pc3",pc3!=null?pc3.tree:null);
+            RewriteRuleSubtreeStream stream_pc1=new RewriteRuleSubtreeStream(adaptor,"token pc1",pc1!=null?pc1.tree:null);
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
-            RewriteRuleSubtreeStream stream_pc1=new RewriteRuleSubtreeStream(adaptor,"token pc1",pc1!=null?pc1.tree:null);
-            RewriteRuleSubtreeStream stream_pc2=new RewriteRuleSubtreeStream(adaptor,"token pc2",pc2!=null?pc2.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 977:2: -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
+            // 979:2: -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
             {
-                // src/main/resources/org/drools/lang/DRL.g:977:5: ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
+                // src/main/resources/org/drools/lang/DRL.g:979:5: ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_ACCUMULATE_INIT_CLAUSE, "VT_ACCUMULATE_INIT_CLAUSE"), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:977:33: ^( INIT $pc1)
+                // src/main/resources/org/drools/lang/DRL.g:979:33: ^( INIT $pc1)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_INIT.next(), root_2);
@@ -8252,7 +8190,7 @@
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // src/main/resources/org/drools/lang/DRL.g:977:46: ^( action_key $pc2)
+                // src/main/resources/org/drools/lang/DRL.g:979:46: ^( action_key $pc2)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_action_key.nextNode(), root_2);
@@ -8261,9 +8199,9 @@
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // src/main/resources/org/drools/lang/DRL.g:977:65: ( ^( reverse_key $pc3) )?
+                // src/main/resources/org/drools/lang/DRL.g:979:65: ( ^( reverse_key $pc3) )?
                 if ( stream_pc3.hasNext()||stream_reverse_key.hasNext() ) {
-                    // src/main/resources/org/drools/lang/DRL.g:977:65: ^( reverse_key $pc3)
+                    // src/main/resources/org/drools/lang/DRL.g:979:65: ^( reverse_key $pc3)
                     {
                     Object root_2 = (Object)adaptor.nil();
                     root_2 = (Object)adaptor.becomeRoot(stream_reverse_key.nextNode(), root_2);
@@ -8276,7 +8214,7 @@
                 }
                 stream_pc3.reset();
                 stream_reverse_key.reset();
-                // src/main/resources/org/drools/lang/DRL.g:977:86: ^( result_key $pc4)
+                // src/main/resources/org/drools/lang/DRL.g:979:86: ^( result_key $pc4)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_result_key.nextNode(), root_2);
@@ -8331,7 +8269,7 @@
     };
 
     // $ANTLR start accumulate_paren_chunk
-    // src/main/resources/org/drools/lang/DRL.g:990:1: accumulate_paren_chunk[int locationType] : pc= accumulate_paren_chunk_data[false,$locationType] -> VT_PAREN_CHUNK[$pc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:992:1: accumulate_paren_chunk[int locationType] : pc= accumulate_paren_chunk_data[false,$locationType] -> VT_PAREN_CHUNK[$pc.start,text] ;
     public final accumulate_paren_chunk_return accumulate_paren_chunk(int locationType) throws RecognitionException {
         accumulate_paren_chunk_return retval = new accumulate_paren_chunk_return();
         retval.start = input.LT(1);
@@ -8342,14 +8280,14 @@
 
 
         RewriteRuleSubtreeStream stream_accumulate_paren_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_paren_chunk_data");
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:993:3: (pc= accumulate_paren_chunk_data[false,$locationType] -> VT_PAREN_CHUNK[$pc.start,text] )
-            // src/main/resources/org/drools/lang/DRL.g:993:5: pc= accumulate_paren_chunk_data[false,$locationType]
+            // src/main/resources/org/drools/lang/DRL.g:995:3: (pc= accumulate_paren_chunk_data[false,$locationType] -> VT_PAREN_CHUNK[$pc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:995:5: pc= accumulate_paren_chunk_data[false,$locationType]
             {
-            pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3132);
+            pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3156);
             pc=accumulate_paren_chunk_data(false, locationType);
             _fsp--;
             if (failed) return retval;
@@ -8369,7 +8307,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 994:2: -> VT_PAREN_CHUNK[$pc.start,text]
+            // 996:2: -> VT_PAREN_CHUNK[$pc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_PAREN_CHUNK, ((Token)pc.start), text));
 
@@ -8402,7 +8340,7 @@
     };
 
     // $ANTLR start accumulate_paren_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:997:1: accumulate_paren_chunk_data[boolean isRecursive, int locationType] : lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN ;
+    // src/main/resources/org/drools/lang/DRL.g:999:1: accumulate_paren_chunk_data[boolean isRecursive, int locationType] : lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN ;
     public final accumulate_paren_chunk_data_return accumulate_paren_chunk_data(boolean isRecursive, int locationType) throws RecognitionException {
         accumulate_paren_chunk_data_return retval = new accumulate_paren_chunk_data_return();
         retval.start = input.LT(1);
@@ -8412,7 +8350,7 @@
         Token lp1=null;
         Token any=null;
         Token rp1=null;
-        accumulate_paren_chunk_data_return accumulate_paren_chunk_data181 = null;
+        accumulate_paren_chunk_data_return accumulate_paren_chunk_data182 = null;
 
 
         Object lp1_tree=null;
@@ -8420,13 +8358,13 @@
         Object rp1_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:998:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN )
-            // src/main/resources/org/drools/lang/DRL.g:998:4: lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:1000:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1000:4: lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )* rp1= RIGHT_PAREN
             {
             root_0 = (Object)adaptor.nil();
 
             lp1=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3156); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3180); if (failed) return retval;
             if ( backtracking==0 ) {
             lp1_tree = (Object)adaptor.create(lp1);
             adaptor.addChild(root_0, lp1_tree);
@@ -8440,23 +8378,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1006:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )*
-            loop65:
+            // src/main/resources/org/drools/lang/DRL.g:1008:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )*
+            loop66:
             do {
-                int alt65=3;
-                int LA65_0 = input.LA(1);
+                int alt66=3;
+                int LA66_0 = input.LA(1);
 
-                if ( ((LA65_0>=VT_COMPILATION_UNIT && LA65_0<=STRING)||LA65_0==COMMA||(LA65_0>=AT && LA65_0<=MULTI_LINE_COMMENT)) ) {
-                    alt65=1;
+                if ( ((LA66_0>=VT_COMPILATION_UNIT && LA66_0<=STRING)||LA66_0==COMMA||(LA66_0>=AT && LA66_0<=MULTI_LINE_COMMENT)) ) {
+                    alt66=1;
                 }
-                else if ( (LA65_0==LEFT_PAREN) ) {
-                    alt65=2;
+                else if ( (LA66_0==LEFT_PAREN) ) {
+                    alt66=2;
                 }
 
 
-                switch (alt65) {
+                switch (alt66) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1006:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // src/main/resources/org/drools/lang/DRL.g:1008:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
             	    any=(Token)input.LT(1);
             	    if ( (input.LA(1)>=VT_COMPILATION_UNIT && input.LA(1)<=STRING)||input.LA(1)==COMMA||(input.LA(1)>=AT && input.LA(1)<=MULTI_LINE_COMMENT) ) {
@@ -8468,7 +8406,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_accumulate_paren_chunk_data3168);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_accumulate_paren_chunk_data3192);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -8478,24 +8416,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1006:87: accumulate_paren_chunk_data[true,-1]
+            	    // src/main/resources/org/drools/lang/DRL.g:1008:87: accumulate_paren_chunk_data[true,-1]
             	    {
-            	    pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3184);
-            	    accumulate_paren_chunk_data181=accumulate_paren_chunk_data(true, -1);
+            	    pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3208);
+            	    accumulate_paren_chunk_data182=accumulate_paren_chunk_data(true, -1);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_paren_chunk_data181.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_paren_chunk_data182.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop65;
+            	    break loop66;
                 }
             } while (true);
 
             rp1=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3195); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3219); if (failed) return retval;
             if ( backtracking==0 ) {
             rp1_tree = (Object)adaptor.create(rp1);
             adaptor.addChild(root_0, rp1_tree);
@@ -8534,36 +8472,36 @@
     };
 
     // $ANTLR start accumulate_id_clause
-    // src/main/resources/org/drools/lang/DRL.g:1016:1: accumulate_id_clause : ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1018:1: accumulate_id_clause : ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) ;
     public final accumulate_id_clause_return accumulate_id_clause() throws RecognitionException {
         accumulate_id_clause_return retval = new accumulate_id_clause_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ID182=null;
-        paren_chunk_return paren_chunk183 = null;
+        Token ID183=null;
+        paren_chunk_return paren_chunk184 = null;
 
 
-        Object ID182_tree=null;
+        Object ID183_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1017:2: ( ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:1017:4: ID paren_chunk
+            // src/main/resources/org/drools/lang/DRL.g:1019:2: ( ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:1019:4: ID paren_chunk
             {
-            ID182=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accumulate_id_clause3211); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID182);
+            ID183=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accumulate_id_clause3235); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID183);
 
             if ( backtracking==0 ) {
-              	emit(ID182, DroolsEditorType.IDENTIFIER);	
+              	emit(ID183, DroolsEditorType.IDENTIFIER);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause3217);
-            paren_chunk183=paren_chunk();
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause3241);
+            paren_chunk184=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk183.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk184.getTree());
 
             // AST REWRITE
             // elements: paren_chunk, ID
@@ -8576,9 +8514,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1019:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+            // 1021:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1019:5: ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:1021:5: ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_ACCUMULATE_ID_CLAUSE, "VT_ACCUMULATE_ID_CLAUSE"), root_1);
@@ -8618,58 +8556,58 @@
     };
 
     // $ANTLR start collect_statement
-    // src/main/resources/org/drools/lang/DRL.g:1022:1: collect_statement : COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1024:1: collect_statement : COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) ;
     public final collect_statement_return collect_statement() throws RecognitionException {
         collect_statement_return retval = new collect_statement_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token COLLECT184=null;
-        Token LEFT_PAREN185=null;
-        Token RIGHT_PAREN187=null;
-        pattern_source_return pattern_source186 = null;
+        Token COLLECT185=null;
+        Token LEFT_PAREN186=null;
+        Token RIGHT_PAREN188=null;
+        pattern_source_return pattern_source187 = null;
 
 
-        Object COLLECT184_tree=null;
-        Object LEFT_PAREN185_tree=null;
-        Object RIGHT_PAREN187_tree=null;
+        Object COLLECT185_tree=null;
+        Object LEFT_PAREN186_tree=null;
+        Object RIGHT_PAREN188_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleTokenStream stream_COLLECT=new RewriteRuleTokenStream(adaptor,"token COLLECT");
         RewriteRuleSubtreeStream stream_pattern_source=new RewriteRuleSubtreeStream(adaptor,"rule pattern_source");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1023:2: ( COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) )
-            // src/main/resources/org/drools/lang/DRL.g:1023:4: COLLECT LEFT_PAREN pattern_source RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:1025:2: ( COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:1025:4: COLLECT LEFT_PAREN pattern_source RIGHT_PAREN
             {
-            COLLECT184=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3239); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLLECT.add(COLLECT184);
+            COLLECT185=(Token)input.LT(1);
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3263); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLLECT.add(COLLECT185);
 
             if ( backtracking==0 ) {
-              	emit(COLLECT184, DroolsEditorType.KEYWORD);	
+              	emit(COLLECT185, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_COLLECT);	
             }
-            LEFT_PAREN185=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3248); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN185);
+            LEFT_PAREN186=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3272); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN186);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN185, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN186, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_pattern_source_in_collect_statement3255);
-            pattern_source186=pattern_source();
+            pushFollow(FOLLOW_pattern_source_in_collect_statement3279);
+            pattern_source187=pattern_source();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_pattern_source.add(pattern_source186.getTree());
-            RIGHT_PAREN187=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3260); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN187);
+            if ( backtracking==0 ) stream_pattern_source.add(pattern_source187.getTree());
+            RIGHT_PAREN188=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3284); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN188);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN187, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN188, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
@@ -8686,9 +8624,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1029:2: -> ^( COLLECT pattern_source RIGHT_PAREN )
+            // 1031:2: -> ^( COLLECT pattern_source RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1029:5: ^( COLLECT pattern_source RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:1031:5: ^( COLLECT pattern_source RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_COLLECT.next(), root_1);
@@ -8728,43 +8666,43 @@
     };
 
     // $ANTLR start entrypoint_statement
-    // src/main/resources/org/drools/lang/DRL.g:1032:1: entrypoint_statement : entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1034:1: entrypoint_statement : entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) ;
     public final entrypoint_statement_return entrypoint_statement() throws RecognitionException {
         entrypoint_statement_return retval = new entrypoint_statement_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        entry_point_key_return entry_point_key188 = null;
+        entry_point_key_return entry_point_key189 = null;
 
-        entrypoint_id_return entrypoint_id189 = null;
+        entrypoint_id_return entrypoint_id190 = null;
 
 
         RewriteRuleSubtreeStream stream_entrypoint_id=new RewriteRuleSubtreeStream(adaptor,"rule entrypoint_id");
         RewriteRuleSubtreeStream stream_entry_point_key=new RewriteRuleSubtreeStream(adaptor,"rule entry_point_key");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1033:2: ( entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) )
-            // src/main/resources/org/drools/lang/DRL.g:1033:4: entry_point_key entrypoint_id
+            // src/main/resources/org/drools/lang/DRL.g:1035:2: ( entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) )
+            // src/main/resources/org/drools/lang/DRL.g:1035:4: entry_point_key entrypoint_id
             {
-            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement3287);
-            entry_point_key188=entry_point_key();
+            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement3311);
+            entry_point_key189=entry_point_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key188.getTree());
+            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key189.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_COLLECT);	
             }
-            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement3295);
-            entrypoint_id189=entrypoint_id();
+            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement3319);
+            entrypoint_id190=entrypoint_id();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id189.getTree());
+            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id190.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
 
             // AST REWRITE
-            // elements: entry_point_key, entrypoint_id
+            // elements: entrypoint_id, entry_point_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8774,9 +8712,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1037:2: -> ^( entry_point_key entrypoint_id )
+            // 1039:2: -> ^( entry_point_key entrypoint_id )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1037:5: ^( entry_point_key entrypoint_id )
+                // src/main/resources/org/drools/lang/DRL.g:1039:5: ^( entry_point_key entrypoint_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_entry_point_key.nextNode(), root_1);
@@ -8815,7 +8753,7 @@
     };
 
     // $ANTLR start entrypoint_id
-    // src/main/resources/org/drools/lang/DRL.g:1040:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );
+    // src/main/resources/org/drools/lang/DRL.g:1042:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );
     public final entrypoint_id_return entrypoint_id() throws RecognitionException {
         entrypoint_id_return retval = new entrypoint_id_return();
         retval.start = input.LT(1);
@@ -8825,33 +8763,33 @@
         Token value=null;
 
         Object value_tree=null;
+        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1041:2: (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] )
-            int alt66=2;
-            int LA66_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1043:2: (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] )
+            int alt67=2;
+            int LA67_0 = input.LA(1);
 
-            if ( (LA66_0==ID) ) {
-                alt66=1;
+            if ( (LA67_0==ID) ) {
+                alt67=1;
             }
-            else if ( (LA66_0==STRING) ) {
-                alt66=2;
+            else if ( (LA67_0==STRING) ) {
+                alt67=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1040:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 66, 0, input);
+                    new NoViableAltException("1042:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 67, 0, input);
 
                 throw nvae;
             }
-            switch (alt66) {
+            switch (alt67) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1041:5: value= ID
+                    // src/main/resources/org/drools/lang/DRL.g:1043:5: value= ID
                     {
                     value=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_entrypoint_id3321); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_entrypoint_id3345); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(value);
 
                     if ( backtracking==0 ) {
@@ -8869,7 +8807,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1042:3: -> VT_ENTRYPOINT_ID[$value]
+                    // 1044:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8880,10 +8818,10 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1043:5: value= STRING
+                    // src/main/resources/org/drools/lang/DRL.g:1045:5: value= STRING
                     {
                     value=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id3338); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id3362); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(value);
 
                     if ( backtracking==0 ) {
@@ -8901,7 +8839,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1044:3: -> VT_ENTRYPOINT_ID[$value]
+                    // 1046:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8936,42 +8874,42 @@
     };
 
     // $ANTLR start from_source
-    // src/main/resources/org/drools/lang/DRL.g:1047:1: from_source : ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1049:1: from_source : ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) ;
     public final from_source_return from_source() throws RecognitionException {
         from_source_return retval = new from_source_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ID190=null;
+        Token ID191=null;
         paren_chunk_return args = null;
 
-        expression_chain_return expression_chain191 = null;
+        expression_chain_return expression_chain192 = null;
 
 
-        Object ID190_tree=null;
+        Object ID191_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
+        RewriteRuleSubtreeStream stream_expression_chain=new RewriteRuleSubtreeStream(adaptor,"rule expression_chain");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
-        RewriteRuleSubtreeStream stream_expression_chain=new RewriteRuleSubtreeStream(adaptor,"rule expression_chain");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1048:2: ( ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:1048:4: ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )?
+            // src/main/resources/org/drools/lang/DRL.g:1050:2: ( ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:1050:4: ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )?
             {
-            ID190=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_source3358); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID190);
+            ID191=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_from_source3382); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID191);
 
             if ( backtracking==0 ) {
-              	emit(ID190, DroolsEditorType.IDENTIFIER);	
+              	emit(ID191, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1049:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
-            int alt67=2;
-            alt67 = dfa67.predict(input);
-            switch (alt67) {
+            // src/main/resources/org/drools/lang/DRL.g:1051:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
+            int alt68=2;
+            alt68 = dfa68.predict(input);
+            switch (alt68) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1049:5: ( LEFT_PAREN )=>args= paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1051:5: ( LEFT_PAREN )=>args= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source3373);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source3397);
                     args=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
@@ -8982,22 +8920,22 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1050:3: ( expression_chain )?
-            int alt68=2;
-            int LA68_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1052:3: ( expression_chain )?
+            int alt69=2;
+            int LA69_0 = input.LA(1);
 
-            if ( (LA68_0==DOT) ) {
-                alt68=1;
+            if ( (LA69_0==DOT) ) {
+                alt69=1;
             }
-            switch (alt68) {
+            switch (alt69) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1050:3: expression_chain
+                    // src/main/resources/org/drools/lang/DRL.g:1052:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source3380);
-                    expression_chain191=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_from_source3404);
+                    expression_chain192=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain191.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain192.getTree());
 
                     }
                     break;
@@ -9013,7 +8951,7 @@
             }
 
             // AST REWRITE
-            // elements: expression_chain, paren_chunk, ID
+            // elements: ID, expression_chain, paren_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9023,21 +8961,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1056:2: -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
+            // 1058:2: -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1056:5: ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
+                // src/main/resources/org/drools/lang/DRL.g:1058:5: ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FROM_SOURCE, "VT_FROM_SOURCE"), root_1);
 
                 adaptor.addChild(root_1, stream_ID.next());
-                // src/main/resources/org/drools/lang/DRL.g:1056:25: ( paren_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1058:25: ( paren_chunk )?
                 if ( stream_paren_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_paren_chunk.next());
 
                 }
                 stream_paren_chunk.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1056:38: ( expression_chain )?
+                // src/main/resources/org/drools/lang/DRL.g:1058:38: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -9076,96 +9014,250 @@
     };
 
     // $ANTLR start expression_chain
-    // src/main/resources/org/drools/lang/DRL.g:1059:1: expression_chain : DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1061:1: expression_chain : DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) ;
     public final expression_chain_return expression_chain() throws RecognitionException {
         expression_chain_return retval = new expression_chain_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOT192=null;
-        Token ID193=null;
-        paren_chunk_return paren_chunk194 = null;
+        Token DOT193=null;
+        Token ID194=null;
+        paren_chunk_return paren_chunk195 = null;
 
-        square_chunk_return square_chunk195 = null;
+        square_chunk_return square_chunk196 = null;
 
-        expression_chain_return expression_chain196 = null;
+        expression_chain_return expression_chain197 = null;
 
 
-        Object DOT192_tree=null;
-        Object ID193_tree=null;
+        Object DOT193_tree=null;
+        Object ID194_tree=null;
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         RewriteRuleSubtreeStream stream_square_chunk=new RewriteRuleSubtreeStream(adaptor,"rule square_chunk");
         RewriteRuleSubtreeStream stream_expression_chain=new RewriteRuleSubtreeStream(adaptor,"rule expression_chain");
+        RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1060:2: ( DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:1061:3: DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )?
+            // src/main/resources/org/drools/lang/DRL.g:1062:2: ( DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:1063:3: DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )?
             {
-            DOT192=(Token)input.LT(1);
-            match(input,DOT,FOLLOW_DOT_in_expression_chain3413); if (failed) return retval;
-            if ( backtracking==0 ) stream_DOT.add(DOT192);
+            DOT193=(Token)input.LT(1);
+            match(input,DOT,FOLLOW_DOT_in_expression_chain3437); if (failed) return retval;
+            if ( backtracking==0 ) stream_DOT.add(DOT193);
 
             if ( backtracking==0 ) {
-              	emit(DOT192, DroolsEditorType.IDENTIFIER);	
+              	emit(DOT193, DroolsEditorType.IDENTIFIER);	
             }
-            ID193=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_expression_chain3420); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID193);
+            ID194=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_expression_chain3444); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID194);
 
             if ( backtracking==0 ) {
-              	emit(ID193, DroolsEditorType.IDENTIFIER);	
+              	emit(ID194, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1063:4: ({...}? paren_chunk | square_chunk )?
-            int alt69=3;
-            alt69 = dfa69.predict(input);
-            switch (alt69) {
+            // src/main/resources/org/drools/lang/DRL.g:1065:4: ({...}? paren_chunk | square_chunk )?
+            int alt70=3;
+            int LA70_0 = input.LA(1);
+
+            if ( (LA70_0==LEFT_PAREN) ) {
+                switch ( input.LA(2) ) {
+                    case LEFT_PAREN:
+                        {
+                        int LA70_4 = input.LA(3);
+
+                        if ( (input.LA(1) == LEFT_PAREN) ) {
+                            alt70=1;
+                        }
+                        }
+                        break;
+                    case ID:
+                        {
+                        int LA70_5 = input.LA(3);
+
+                        if ( (input.LA(1) == LEFT_PAREN) ) {
+                            alt70=1;
+                        }
+                        }
+                        break;
+                    case VT_COMPILATION_UNIT:
+                    case VT_FUNCTION_IMPORT:
+                    case VT_FACT:
+                    case VT_CONSTRAINTS:
+                    case VT_LABEL:
+                    case VT_QUERY_ID:
+                    case VT_TEMPLATE_ID:
+                    case VT_TYPE_DECLARE_ID:
+                    case VT_RULE_ID:
+                    case VT_ENTRYPOINT_ID:
+                    case VT_SLOT_ID:
+                    case VT_SLOT:
+                    case VT_RULE_ATTRIBUTES:
+                    case VT_RHS_CHUNK:
+                    case VT_CURLY_CHUNK:
+                    case VT_SQUARE_CHUNK:
+                    case VT_PAREN_CHUNK:
+                    case VT_BEHAVIOR:
+                    case VT_AND_IMPLICIT:
+                    case VT_AND_PREFIX:
+                    case VT_OR_PREFIX:
+                    case VT_AND_INFIX:
+                    case VT_OR_INFIX:
+                    case VT_ACCUMULATE_INIT_CLAUSE:
+                    case VT_ACCUMULATE_ID_CLAUSE:
+                    case VT_FROM_SOURCE:
+                    case VT_EXPRESSION_CHAIN:
+                    case VT_PATTERN:
+                    case VT_FACT_BINDING:
+                    case VT_FACT_OR:
+                    case VT_BIND_FIELD:
+                    case VT_FIELD:
+                    case VT_ACCESSOR_PATH:
+                    case VT_ACCESSOR_ELEMENT:
+                    case VT_DATA_TYPE:
+                    case VT_PATTERN_TYPE:
+                    case VT_PACKAGE_ID:
+                    case VT_IMPORT_ID:
+                    case VT_GLOBAL_ID:
+                    case VT_FUNCTION_ID:
+                    case VT_PARAM_LIST:
+                    case VK_DATE_EFFECTIVE:
+                    case VK_DATE_EXPIRES:
+                    case VK_LOCK_ON_ACTIVE:
+                    case VK_NO_LOOP:
+                    case VK_AUTO_FOCUS:
+                    case VK_ACTIVATION_GROUP:
+                    case VK_AGENDA_GROUP:
+                    case VK_RULEFLOW_GROUP:
+                    case VK_DURATION:
+                    case VK_DIALECT:
+                    case VK_SALIENCE:
+                    case VK_ENABLED:
+                    case VK_ATTRIBUTES:
+                    case VK_RULE:
+                    case VK_IMPORT:
+                    case VK_PACKAGE:
+                    case VK_TEMPLATE:
+                    case VK_QUERY:
+                    case VK_DECLARE:
+                    case VK_FUNCTION:
+                    case VK_GLOBAL:
+                    case VK_EVAL:
+                    case VK_CONTAINS:
+                    case VK_MATCHES:
+                    case VK_EXCLUDES:
+                    case VK_SOUNDSLIKE:
+                    case VK_MEMBEROF:
+                    case VK_ENTRY_POINT:
+                    case VK_NOT:
+                    case VK_IN:
+                    case VK_OR:
+                    case VK_AND:
+                    case VK_EXISTS:
+                    case VK_FORALL:
+                    case VK_ACTION:
+                    case VK_REVERSE:
+                    case VK_RESULT:
+                    case SEMICOLON:
+                    case DOT:
+                    case DOT_STAR:
+                    case END:
+                    case STRING:
+                    case COMMA:
+                    case RIGHT_PAREN:
+                    case AT:
+                    case COLON:
+                    case EQUALS:
+                    case WHEN:
+                    case BOOL:
+                    case INT:
+                    case DOUBLE_PIPE:
+                    case DOUBLE_AMPER:
+                    case FROM:
+                    case OVER:
+                    case ACCUMULATE:
+                    case INIT:
+                    case COLLECT:
+                    case ARROW:
+                    case EQUAL:
+                    case GREATER:
+                    case GREATER_EQUAL:
+                    case LESS:
+                    case LESS_EQUAL:
+                    case NOT_EQUAL:
+                    case GRAVE_ACCENT:
+                    case FLOAT:
+                    case NULL:
+                    case LEFT_SQUARE:
+                    case RIGHT_SQUARE:
+                    case THEN:
+                    case LEFT_CURLY:
+                    case RIGHT_CURLY:
+                    case MISC:
+                    case EOL:
+                    case WS:
+                    case EscapeSequence:
+                    case HexDigit:
+                    case UnicodeEscape:
+                    case OctalEscape:
+                    case SH_STYLE_SINGLE_LINE_COMMENT:
+                    case C_STYLE_SINGLE_LINE_COMMENT:
+                    case MULTI_LINE_COMMENT:
+                        {
+                        alt70=1;
+                        }
+                        break;
+                }
+
+            }
+            else if ( (LA70_0==LEFT_SQUARE) ) {
+                alt70=2;
+            }
+            switch (alt70) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1064:6: {...}? paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1066:6: {...}? paren_chunk
                     {
                     if ( !(input.LA(1) == LEFT_PAREN) ) {
                         if (backtracking>0) {failed=true; return retval;}
                         throw new FailedPredicateException(input, "expression_chain", "input.LA(1) == LEFT_PAREN");
                     }
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3436);
-                    paren_chunk194=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3460);
+                    paren_chunk195=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk194.getTree());
+                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk195.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1066:6: square_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1068:6: square_chunk
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain3450);
-                    square_chunk195=square_chunk();
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain3474);
+                    square_chunk196=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk195.getTree());
+                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk196.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1068:4: ( expression_chain )?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1070:4: ( expression_chain )?
+            int alt71=2;
+            int LA71_0 = input.LA(1);
 
-            if ( (LA70_0==DOT) ) {
-                alt70=1;
+            if ( (LA71_0==DOT) ) {
+                alt71=1;
             }
-            switch (alt70) {
+            switch (alt71) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1068:4: expression_chain
+                    // src/main/resources/org/drools/lang/DRL.g:1070:4: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain3461);
-                    expression_chain196=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain3485);
+                    expression_chain197=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain196.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain197.getTree());
 
                     }
                     break;
@@ -9174,7 +9266,7 @@
 
 
             // AST REWRITE
-            // elements: paren_chunk, expression_chain, ID, square_chunk
+            // elements: ID, paren_chunk, square_chunk, expression_chain
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9184,27 +9276,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1069:4: -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
+            // 1071:4: -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1069:7: ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
+                // src/main/resources/org/drools/lang/DRL.g:1071:7: ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_EXPRESSION_CHAIN, DOT192), root_1);
+                root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_EXPRESSION_CHAIN, DOT193), root_1);
 
                 adaptor.addChild(root_1, stream_ID.next());
-                // src/main/resources/org/drools/lang/DRL.g:1069:38: ( square_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1071:38: ( square_chunk )?
                 if ( stream_square_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_square_chunk.next());
 
                 }
                 stream_square_chunk.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1069:52: ( paren_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1071:52: ( paren_chunk )?
                 if ( stream_paren_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_paren_chunk.next());
 
                 }
                 stream_paren_chunk.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1069:65: ( expression_chain )?
+                // src/main/resources/org/drools/lang/DRL.g:1071:65: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -9243,38 +9335,38 @@
     };
 
     // $ANTLR start lhs_pattern
-    // src/main/resources/org/drools/lang/DRL.g:1072:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );
+    // src/main/resources/org/drools/lang/DRL.g:1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );
     public final lhs_pattern_return lhs_pattern() throws RecognitionException {
         lhs_pattern_return retval = new lhs_pattern_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        fact_binding_return fact_binding197 = null;
+        fact_binding_return fact_binding198 = null;
 
-        fact_return fact198 = null;
+        fact_return fact199 = null;
 
 
         RewriteRuleSubtreeStream stream_fact_binding=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding");
         RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1073:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
-            int alt71=2;
-            int LA71_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1075:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
+            int alt72=2;
+            int LA72_0 = input.LA(1);
 
-            if ( (LA71_0==ID) ) {
-                int LA71_1 = input.LA(2);
+            if ( (LA72_0==ID) ) {
+                int LA72_1 = input.LA(2);
 
-                if ( (LA71_1==COLON) ) {
-                    alt71=1;
+                if ( (LA72_1==COLON) ) {
+                    alt72=1;
                 }
-                else if ( (LA71_1==DOT||LA71_1==LEFT_PAREN||LA71_1==LEFT_SQUARE) ) {
-                    alt71=2;
+                else if ( (LA72_1==DOT||LA72_1==LEFT_PAREN||LA72_1==LEFT_SQUARE) ) {
+                    alt72=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1072:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 71, 1, input);
+                        new NoViableAltException("1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 72, 1, input);
 
                     throw nvae;
                 }
@@ -9282,19 +9374,19 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1072:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 71, 0, input);
+                    new NoViableAltException("1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 72, 0, input);
 
                 throw nvae;
             }
-            switch (alt71) {
+            switch (alt72) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1073:4: fact_binding
+                    // src/main/resources/org/drools/lang/DRL.g:1075:4: fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3494);
-                    fact_binding197=fact_binding();
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3518);
+                    fact_binding198=fact_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding197.getTree());
+                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding198.getTree());
 
                     // AST REWRITE
                     // elements: fact_binding
@@ -9307,9 +9399,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1073:17: -> ^( VT_PATTERN fact_binding )
+                    // 1075:17: -> ^( VT_PATTERN fact_binding )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1073:20: ^( VT_PATTERN fact_binding )
+                        // src/main/resources/org/drools/lang/DRL.g:1075:20: ^( VT_PATTERN fact_binding )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -9326,13 +9418,13 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1074:4: fact
+                    // src/main/resources/org/drools/lang/DRL.g:1076:4: fact
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern3507);
-                    fact198=fact();
+                    pushFollow(FOLLOW_fact_in_lhs_pattern3531);
+                    fact199=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact198.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact199.getTree());
 
                     // AST REWRITE
                     // elements: fact
@@ -9345,9 +9437,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1074:9: -> ^( VT_PATTERN fact )
+                    // 1076:9: -> ^( VT_PATTERN fact )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1074:12: ^( VT_PATTERN fact )
+                        // src/main/resources/org/drools/lang/DRL.g:1076:12: ^( VT_PATTERN fact )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -9388,88 +9480,88 @@
     };
 
     // $ANTLR start fact_binding
-    // src/main/resources/org/drools/lang/DRL.g:1077:1: fact_binding : label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1079:1: fact_binding : label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) ;
     public final fact_binding_return fact_binding() throws RecognitionException {
         fact_binding_return retval = new fact_binding_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN201=null;
-        Token RIGHT_PAREN203=null;
-        label_return label199 = null;
+        Token LEFT_PAREN202=null;
+        Token RIGHT_PAREN204=null;
+        label_return label200 = null;
 
-        fact_return fact200 = null;
+        fact_return fact201 = null;
 
-        fact_binding_expression_return fact_binding_expression202 = null;
+        fact_binding_expression_return fact_binding_expression203 = null;
 
 
-        Object LEFT_PAREN201_tree=null;
-        Object RIGHT_PAREN203_tree=null;
+        Object LEFT_PAREN202_tree=null;
+        Object RIGHT_PAREN204_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
+        RewriteRuleSubtreeStream stream_label=new RewriteRuleSubtreeStream(adaptor,"rule label");
+        RewriteRuleSubtreeStream stream_fact_binding_expression=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding_expression");
         RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
-        RewriteRuleSubtreeStream stream_fact_binding_expression=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding_expression");
-        RewriteRuleSubtreeStream stream_label=new RewriteRuleSubtreeStream(adaptor,"rule label");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1078:3: ( label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:1078:5: label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1080:3: ( label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:1080:5: label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
             {
-            pushFollow(FOLLOW_label_in_fact_binding3527);
-            label199=label();
+            pushFollow(FOLLOW_label_in_fact_binding3551);
+            label200=label();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_label.add(label199.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1079:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            if ( backtracking==0 ) stream_label.add(label200.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1081:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
+            int alt73=2;
+            int LA73_0 = input.LA(1);
 
-            if ( (LA72_0==ID) ) {
-                alt72=1;
+            if ( (LA73_0==ID) ) {
+                alt73=1;
             }
-            else if ( (LA72_0==LEFT_PAREN) ) {
-                alt72=2;
+            else if ( (LA73_0==LEFT_PAREN) ) {
+                alt73=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1079:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 72, 0, input);
+                    new NoViableAltException("1081:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 73, 0, input);
 
                 throw nvae;
             }
-            switch (alt72) {
+            switch (alt73) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1079:5: fact
+                    // src/main/resources/org/drools/lang/DRL.g:1081:5: fact
                     {
-                    pushFollow(FOLLOW_fact_in_fact_binding3533);
-                    fact200=fact();
+                    pushFollow(FOLLOW_fact_in_fact_binding3557);
+                    fact201=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact200.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact201.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1080:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1082:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
                     {
-                    LEFT_PAREN201=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3540); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN201);
+                    LEFT_PAREN202=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3564); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN202);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN201, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN202, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding3548);
-                    fact_binding_expression202=fact_binding_expression();
+                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding3572);
+                    fact_binding_expression203=fact_binding_expression();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact_binding_expression.add(fact_binding_expression202.getTree());
-                    RIGHT_PAREN203=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3556); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN203);
+                    if ( backtracking==0 ) stream_fact_binding_expression.add(fact_binding_expression203.getTree());
+                    RIGHT_PAREN204=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3580); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN204);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN203, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN204, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -9479,7 +9571,7 @@
 
 
             // AST REWRITE
-            // elements: fact_binding_expression, fact, label, RIGHT_PAREN
+            // elements: label, RIGHT_PAREN, fact, fact_binding_expression
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9489,27 +9581,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1084:3: -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
+            // 1086:3: -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1084:6: ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
+                // src/main/resources/org/drools/lang/DRL.g:1086:6: ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FACT_BINDING, "VT_FACT_BINDING"), root_1);
 
                 adaptor.addChild(root_1, stream_label.next());
-                // src/main/resources/org/drools/lang/DRL.g:1084:30: ( fact )?
+                // src/main/resources/org/drools/lang/DRL.g:1086:30: ( fact )?
                 if ( stream_fact.hasNext() ) {
                     adaptor.addChild(root_1, stream_fact.next());
 
                 }
                 stream_fact.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1084:36: ( fact_binding_expression )?
+                // src/main/resources/org/drools/lang/DRL.g:1086:36: ( fact_binding_expression )?
                 if ( stream_fact_binding_expression.hasNext() ) {
                     adaptor.addChild(root_1, stream_fact_binding_expression.next());
 
                 }
                 stream_fact_binding_expression.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1084:61: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:1086:61: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -9548,7 +9640,7 @@
     };
 
     // $ANTLR start fact_binding_expression
-    // src/main/resources/org/drools/lang/DRL.g:1087:1: fact_binding_expression : ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1089:1: fact_binding_expression : ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* ;
     public final fact_binding_expression_return fact_binding_expression() throws RecognitionException {
         fact_binding_expression_return retval = new fact_binding_expression_return();
         retval.start = input.LT(1);
@@ -9558,30 +9650,30 @@
         Token pipe=null;
         or_key_return value = null;
 
-        fact_return fact204 = null;
-
         fact_return fact205 = null;
 
+        fact_return fact206 = null;
 
+
         Object pipe_tree=null;
         RewriteRuleTokenStream stream_DOUBLE_PIPE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_PIPE");
+        RewriteRuleSubtreeStream stream_or_key=new RewriteRuleSubtreeStream(adaptor,"rule or_key");
         RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
-        RewriteRuleSubtreeStream stream_or_key=new RewriteRuleSubtreeStream(adaptor,"rule or_key");
-
+        
         	Token orToken = null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1090:3: ( ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* )
-            // src/main/resources/org/drools/lang/DRL.g:1090:5: ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
+            // src/main/resources/org/drools/lang/DRL.g:1092:3: ( ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* )
+            // src/main/resources/org/drools/lang/DRL.g:1092:5: ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
             {
-            // src/main/resources/org/drools/lang/DRL.g:1090:5: ( fact -> fact )
-            // src/main/resources/org/drools/lang/DRL.g:1090:6: fact
+            // src/main/resources/org/drools/lang/DRL.g:1092:5: ( fact -> fact )
+            // src/main/resources/org/drools/lang/DRL.g:1092:6: fact
             {
-            pushFollow(FOLLOW_fact_in_fact_binding_expression3597);
-            fact204=fact();
+            pushFollow(FOLLOW_fact_in_fact_binding_expression3621);
+            fact205=fact();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact.add(fact204.getTree());
+            if ( backtracking==0 ) stream_fact.add(fact205.getTree());
 
             // AST REWRITE
             // elements: fact
@@ -9594,7 +9686,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1090:11: -> fact
+            // 1092:11: -> fact
             {
                 adaptor.addChild(root_0, stream_fact.next());
 
@@ -9604,46 +9696,46 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1090:20: ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
-            loop74:
+            // src/main/resources/org/drools/lang/DRL.g:1092:20: ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
+            loop75:
             do {
-                int alt74=2;
-                int LA74_0 = input.LA(1);
+                int alt75=2;
+                int LA75_0 = input.LA(1);
 
-                if ( (LA74_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    alt74=1;
+                if ( (LA75_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    alt75=1;
                 }
-                else if ( (LA74_0==DOUBLE_PIPE) ) {
-                    alt74=1;
+                else if ( (LA75_0==DOUBLE_PIPE) ) {
+                    alt75=1;
                 }
 
 
-                switch (alt74) {
+                switch (alt75) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1090:22: (value= or_key | pipe= DOUBLE_PIPE ) fact
+            	    // src/main/resources/org/drools/lang/DRL.g:1092:22: (value= or_key | pipe= DOUBLE_PIPE ) fact
             	    {
-            	    // src/main/resources/org/drools/lang/DRL.g:1090:22: (value= or_key | pipe= DOUBLE_PIPE )
-            	    int alt73=2;
-            	    int LA73_0 = input.LA(1);
+            	    // src/main/resources/org/drools/lang/DRL.g:1092:22: (value= or_key | pipe= DOUBLE_PIPE )
+            	    int alt74=2;
+            	    int LA74_0 = input.LA(1);
 
-            	    if ( (LA73_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-            	        alt73=1;
+            	    if ( (LA74_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+            	        alt74=1;
             	    }
-            	    else if ( (LA73_0==DOUBLE_PIPE) ) {
-            	        alt73=2;
+            	    else if ( (LA74_0==DOUBLE_PIPE) ) {
+            	        alt74=2;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("1090:22: (value= or_key | pipe= DOUBLE_PIPE )", 73, 0, input);
+            	            new NoViableAltException("1092:22: (value= or_key | pipe= DOUBLE_PIPE )", 74, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt73) {
+            	    switch (alt74) {
             	        case 1 :
-            	            // src/main/resources/org/drools/lang/DRL.g:1090:23: value= or_key
+            	            // src/main/resources/org/drools/lang/DRL.g:1092:23: value= or_key
             	            {
-            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3609);
+            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3633);
             	            value=or_key();
             	            _fsp--;
             	            if (failed) return retval;
@@ -9655,10 +9747,10 @@
             	            }
             	            break;
             	        case 2 :
-            	            // src/main/resources/org/drools/lang/DRL.g:1090:62: pipe= DOUBLE_PIPE
+            	            // src/main/resources/org/drools/lang/DRL.g:1092:62: pipe= DOUBLE_PIPE
             	            {
             	            pipe=(Token)input.LT(1);
-            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3615); if (failed) return retval;
+            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3639); if (failed) return retval;
             	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
             	            if ( backtracking==0 ) {
@@ -9670,14 +9762,14 @@
 
             	    }
 
-            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3620);
-            	    fact205=fact();
+            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3644);
+            	    fact206=fact();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_fact.add(fact205.getTree());
+            	    if ( backtracking==0 ) stream_fact.add(fact206.getTree());
 
             	    // AST REWRITE
-            	    // elements: fact_binding_expression, fact
+            	    // elements: fact, fact_binding_expression
             	    // token labels: 
             	    // rule labels: retval
             	    // token list labels: 
@@ -9687,9 +9779,9 @@
             	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             	    root_0 = (Object)adaptor.nil();
-            	    // 1091:3: -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
+            	    // 1093:3: -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
             	    {
-            	        // src/main/resources/org/drools/lang/DRL.g:1091:6: ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
+            	        // src/main/resources/org/drools/lang/DRL.g:1093:6: ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
             	        {
             	        Object root_1 = (Object)adaptor.nil();
             	        root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FACT_OR, orToken), root_1);
@@ -9708,7 +9800,7 @@
             	    break;
 
             	default :
-            	    break loop74;
+            	    break loop75;
                 }
             } while (true);
 
@@ -9738,84 +9830,84 @@
     };
 
     // $ANTLR start fact
-    // src/main/resources/org/drools/lang/DRL.g:1094:1: fact : pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1096:1: fact : pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) ;
     public final fact_return fact() throws RecognitionException {
         fact_return retval = new fact_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN207=null;
-        Token RIGHT_PAREN209=null;
-        pattern_type_return pattern_type206 = null;
+        Token LEFT_PAREN208=null;
+        Token RIGHT_PAREN210=null;
+        pattern_type_return pattern_type207 = null;
 
-        constraints_return constraints208 = null;
+        constraints_return constraints209 = null;
 
 
-        Object LEFT_PAREN207_tree=null;
-        Object RIGHT_PAREN209_tree=null;
+        Object LEFT_PAREN208_tree=null;
+        Object RIGHT_PAREN210_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
+        RewriteRuleSubtreeStream stream_pattern_type=new RewriteRuleSubtreeStream(adaptor,"rule pattern_type");
         RewriteRuleSubtreeStream stream_constraints=new RewriteRuleSubtreeStream(adaptor,"rule constraints");
-        RewriteRuleSubtreeStream stream_pattern_type=new RewriteRuleSubtreeStream(adaptor,"rule pattern_type");
          boolean isFailedOnConstraints = true; pushParaphrases(DroolsParaphraseTypes.PATTERN); 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1097:2: ( pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) )
-            // src/main/resources/org/drools/lang/DRL.g:1097:4: pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:1099:2: ( pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:1099:4: pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN
             {
-            pushFollow(FOLLOW_pattern_type_in_fact3660);
-            pattern_type206=pattern_type();
+            pushFollow(FOLLOW_pattern_type_in_fact3684);
+            pattern_type207=pattern_type();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_pattern_type.add(pattern_type206.getTree());
-            LEFT_PAREN207=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3665); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN207);
+            if ( backtracking==0 ) stream_pattern_type.add(pattern_type207.getTree());
+            LEFT_PAREN208=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3689); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN208);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN207, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN208, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1100:4: ( constraints )?
-            int alt75=2;
-            int LA75_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1102:4: ( constraints )?
+            int alt76=2;
+            int LA76_0 = input.LA(1);
 
-            if ( (LA75_0==ID||LA75_0==LEFT_PAREN) ) {
-                alt75=1;
+            if ( (LA76_0==ID||LA76_0==LEFT_PAREN) ) {
+                alt76=1;
             }
-            switch (alt75) {
+            switch (alt76) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1100:4: constraints
+                    // src/main/resources/org/drools/lang/DRL.g:1102:4: constraints
                     {
-                    pushFollow(FOLLOW_constraints_in_fact3676);
-                    constraints208=constraints();
+                    pushFollow(FOLLOW_constraints_in_fact3700);
+                    constraints209=constraints();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_constraints.add(constraints208.getTree());
+                    if ( backtracking==0 ) stream_constraints.add(constraints209.getTree());
 
                     }
                     break;
 
             }
 
-            RIGHT_PAREN209=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3682); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN209);
+            RIGHT_PAREN210=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3706); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN210);
 
             if ( backtracking==0 ) {
               	isFailedOnConstraints = false;	
             }
             if ( backtracking==0 ) {
-              	if (RIGHT_PAREN209.getText().equals(")") ){ //WORKAROUND FOR ANTLR BUG!
-              			emit(RIGHT_PAREN209, DroolsEditorType.SYMBOL);
+              	if (RIGHT_PAREN210.getText().equals(")") ){ //WORKAROUND FOR ANTLR BUG!
+              			emit(RIGHT_PAREN210, DroolsEditorType.SYMBOL);
               			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
               		}	
             }
 
             // AST REWRITE
-            // elements: pattern_type, constraints, RIGHT_PAREN
+            // elements: constraints, RIGHT_PAREN, pattern_type
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9825,15 +9917,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1106:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+            // 1108:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1106:5: ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:1108:5: ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FACT, "VT_FACT"), root_1);
 
                 adaptor.addChild(root_1, stream_pattern_type.next());
-                // src/main/resources/org/drools/lang/DRL.g:1106:28: ( constraints )?
+                // src/main/resources/org/drools/lang/DRL.g:1108:28: ( constraints )?
                 if ( stream_constraints.hasNext() ) {
                     adaptor.addChild(root_1, stream_constraints.next());
 
@@ -9865,7 +9957,7 @@
             recover(input,re);
         }
         finally {
-
+            
             	if (isEditorInterfaceEnabled && isFailedOnConstraints && input.LA(1) == EOF && input.get(input.index() - 1).getType() == WS){
             		if (!(getActiveSentence().getContent().getLast() instanceof Integer) && input.LA(-1) != COLON) {
             			emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
@@ -9883,64 +9975,64 @@
     };
 
     // $ANTLR start constraints
-    // src/main/resources/org/drools/lang/DRL.g:1116:1: constraints : constraint ( COMMA constraint )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1118:1: constraints : constraint ( COMMA constraint )* ;
     public final constraints_return constraints() throws RecognitionException {
         constraints_return retval = new constraints_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token COMMA211=null;
-        constraint_return constraint210 = null;
+        Token COMMA212=null;
+        constraint_return constraint211 = null;
 
-        constraint_return constraint212 = null;
+        constraint_return constraint213 = null;
 
 
-        Object COMMA211_tree=null;
+        Object COMMA212_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1117:2: ( constraint ( COMMA constraint )* )
-            // src/main/resources/org/drools/lang/DRL.g:1117:4: constraint ( COMMA constraint )*
+            // src/main/resources/org/drools/lang/DRL.g:1119:2: ( constraint ( COMMA constraint )* )
+            // src/main/resources/org/drools/lang/DRL.g:1119:4: constraint ( COMMA constraint )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_in_constraints3716);
-            constraint210=constraint();
+            pushFollow(FOLLOW_constraint_in_constraints3740);
+            constraint211=constraint();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, constraint210.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1117:15: ( COMMA constraint )*
-            loop76:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint211.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1119:15: ( COMMA constraint )*
+            loop77:
             do {
-                int alt76=2;
-                int LA76_0 = input.LA(1);
+                int alt77=2;
+                int LA77_0 = input.LA(1);
 
-                if ( (LA76_0==COMMA) ) {
-                    alt76=1;
+                if ( (LA77_0==COMMA) ) {
+                    alt77=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt77) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1117:17: COMMA constraint
+            	    // src/main/resources/org/drools/lang/DRL.g:1119:17: COMMA constraint
             	    {
-            	    COMMA211=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3720); if (failed) return retval;
+            	    COMMA212=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3744); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA211, DroolsEditorType.SYMBOL);
+            	      	emit(COMMA212, DroolsEditorType.SYMBOL);
             	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
             	    }
-            	    pushFollow(FOLLOW_constraint_in_constraints3727);
-            	    constraint212=constraint();
+            	    pushFollow(FOLLOW_constraint_in_constraints3751);
+            	    constraint213=constraint();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint212.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint213.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop77;
                 }
             } while (true);
 
@@ -9970,28 +10062,28 @@
     };
 
     // $ANTLR start constraint
-    // src/main/resources/org/drools/lang/DRL.g:1122:1: constraint : or_constr ;
+    // src/main/resources/org/drools/lang/DRL.g:1124:1: constraint : or_constr ;
     public final constraint_return constraint() throws RecognitionException {
         constraint_return retval = new constraint_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        or_constr_return or_constr213 = null;
+        or_constr_return or_constr214 = null;
 
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1123:2: ( or_constr )
-            // src/main/resources/org/drools/lang/DRL.g:1123:4: or_constr
+            // src/main/resources/org/drools/lang/DRL.g:1125:2: ( or_constr )
+            // src/main/resources/org/drools/lang/DRL.g:1125:4: or_constr
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_or_constr_in_constraint3741);
-            or_constr213=or_constr();
+            pushFollow(FOLLOW_or_constr_in_constraint3765);
+            or_constr214=or_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr213.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr214.getTree());
 
             }
 
@@ -10018,67 +10110,67 @@
     };
 
     // $ANTLR start or_constr
-    // src/main/resources/org/drools/lang/DRL.g:1126:1: or_constr : and_constr ( DOUBLE_PIPE and_constr )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1128:1: or_constr : and_constr ( DOUBLE_PIPE and_constr )* ;
     public final or_constr_return or_constr() throws RecognitionException {
         or_constr_return retval = new or_constr_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOUBLE_PIPE215=null;
-        and_constr_return and_constr214 = null;
+        Token DOUBLE_PIPE216=null;
+        and_constr_return and_constr215 = null;
 
-        and_constr_return and_constr216 = null;
+        and_constr_return and_constr217 = null;
 
 
-        Object DOUBLE_PIPE215_tree=null;
+        Object DOUBLE_PIPE216_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1127:2: ( and_constr ( DOUBLE_PIPE and_constr )* )
-            // src/main/resources/org/drools/lang/DRL.g:1127:4: and_constr ( DOUBLE_PIPE and_constr )*
+            // src/main/resources/org/drools/lang/DRL.g:1129:2: ( and_constr ( DOUBLE_PIPE and_constr )* )
+            // src/main/resources/org/drools/lang/DRL.g:1129:4: and_constr ( DOUBLE_PIPE and_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_constr_in_or_constr3752);
-            and_constr214=and_constr();
+            pushFollow(FOLLOW_and_constr_in_or_constr3776);
+            and_constr215=and_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, and_constr214.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1127:15: ( DOUBLE_PIPE and_constr )*
-            loop77:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_constr215.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1129:15: ( DOUBLE_PIPE and_constr )*
+            loop78:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
+                int alt78=2;
+                int LA78_0 = input.LA(1);
 
-                if ( (LA77_0==DOUBLE_PIPE) ) {
-                    alt77=1;
+                if ( (LA78_0==DOUBLE_PIPE) ) {
+                    alt78=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt78) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1127:17: DOUBLE_PIPE and_constr
+            	    // src/main/resources/org/drools/lang/DRL.g:1129:17: DOUBLE_PIPE and_constr
             	    {
-            	    DOUBLE_PIPE215=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3756); if (failed) return retval;
+            	    DOUBLE_PIPE216=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3780); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE215_tree = (Object)adaptor.create(DOUBLE_PIPE215);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE215_tree, root_0);
+            	    DOUBLE_PIPE216_tree = (Object)adaptor.create(DOUBLE_PIPE216);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE216_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_PIPE215, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_PIPE216, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr3763);
-            	    and_constr216=and_constr();
+            	    pushFollow(FOLLOW_and_constr_in_or_constr3787);
+            	    and_constr217=and_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr216.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr217.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop78;
                 }
             } while (true);
 
@@ -10108,67 +10200,67 @@
     };
 
     // $ANTLR start and_constr
-    // src/main/resources/org/drools/lang/DRL.g:1131:1: and_constr : unary_constr ( DOUBLE_AMPER unary_constr )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1133:1: and_constr : unary_constr ( DOUBLE_AMPER unary_constr )* ;
     public final and_constr_return and_constr() throws RecognitionException {
         and_constr_return retval = new and_constr_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOUBLE_AMPER218=null;
-        unary_constr_return unary_constr217 = null;
+        Token DOUBLE_AMPER219=null;
+        unary_constr_return unary_constr218 = null;
 
-        unary_constr_return unary_constr219 = null;
+        unary_constr_return unary_constr220 = null;
 
 
-        Object DOUBLE_AMPER218_tree=null;
+        Object DOUBLE_AMPER219_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1132:2: ( unary_constr ( DOUBLE_AMPER unary_constr )* )
-            // src/main/resources/org/drools/lang/DRL.g:1132:4: unary_constr ( DOUBLE_AMPER unary_constr )*
+            // src/main/resources/org/drools/lang/DRL.g:1134:2: ( unary_constr ( DOUBLE_AMPER unary_constr )* )
+            // src/main/resources/org/drools/lang/DRL.g:1134:4: unary_constr ( DOUBLE_AMPER unary_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_unary_constr_in_and_constr3778);
-            unary_constr217=unary_constr();
+            pushFollow(FOLLOW_unary_constr_in_and_constr3802);
+            unary_constr218=unary_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr217.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1132:17: ( DOUBLE_AMPER unary_constr )*
-            loop78:
+            if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr218.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1134:17: ( DOUBLE_AMPER unary_constr )*
+            loop79:
             do {
-                int alt78=2;
-                int LA78_0 = input.LA(1);
+                int alt79=2;
+                int LA79_0 = input.LA(1);
 
-                if ( (LA78_0==DOUBLE_AMPER) ) {
-                    alt78=1;
+                if ( (LA79_0==DOUBLE_AMPER) ) {
+                    alt79=1;
                 }
 
 
-                switch (alt78) {
+                switch (alt79) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1132:19: DOUBLE_AMPER unary_constr
+            	    // src/main/resources/org/drools/lang/DRL.g:1134:19: DOUBLE_AMPER unary_constr
             	    {
-            	    DOUBLE_AMPER218=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3782); if (failed) return retval;
+            	    DOUBLE_AMPER219=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3806); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER218_tree = (Object)adaptor.create(DOUBLE_AMPER218);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER218_tree, root_0);
+            	    DOUBLE_AMPER219_tree = (Object)adaptor.create(DOUBLE_AMPER219);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER219_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_AMPER218, DroolsEditorType.SYMBOL);;	
+            	      	emit(DOUBLE_AMPER219, DroolsEditorType.SYMBOL);;	
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr3789);
-            	    unary_constr219=unary_constr();
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr3813);
+            	    unary_constr220=unary_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr219.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr220.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop79;
                 }
             } while (true);
 
@@ -10198,52 +10290,52 @@
     };
 
     // $ANTLR start unary_constr
-    // src/main/resources/org/drools/lang/DRL.g:1136:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );
+    // src/main/resources/org/drools/lang/DRL.g:1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );
     public final unary_constr_return unary_constr() throws RecognitionException {
         unary_constr_return retval = new unary_constr_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN223=null;
-        Token RIGHT_PAREN225=null;
-        eval_key_return eval_key220 = null;
+        Token LEFT_PAREN224=null;
+        Token RIGHT_PAREN226=null;
+        eval_key_return eval_key221 = null;
 
-        paren_chunk_return paren_chunk221 = null;
+        paren_chunk_return paren_chunk222 = null;
 
-        field_constraint_return field_constraint222 = null;
+        field_constraint_return field_constraint223 = null;
 
-        or_constr_return or_constr224 = null;
+        or_constr_return or_constr225 = null;
 
 
-        Object LEFT_PAREN223_tree=null;
-        Object RIGHT_PAREN225_tree=null;
+        Object LEFT_PAREN224_tree=null;
+        Object RIGHT_PAREN226_tree=null;
 
          boolean isFailed = true;	
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1140:2: ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN )
-            int alt79=3;
-            int LA79_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1142:2: ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN )
+            int alt80=3;
+            int LA80_0 = input.LA(1);
 
-            if ( (LA79_0==ID) ) {
-                int LA79_1 = input.LA(2);
+            if ( (LA80_0==ID) ) {
+                int LA80_1 = input.LA(2);
 
-                if ( ((LA79_1>=ID && LA79_1<=DOT)||LA79_1==COLON||(LA79_1>=EQUAL && LA79_1<=GRAVE_ACCENT)||LA79_1==LEFT_SQUARE) ) {
-                    alt79=2;
+                if ( ((LA80_1>=ID && LA80_1<=DOT)||LA80_1==COLON||(LA80_1>=EQUAL && LA80_1<=GRAVE_ACCENT)||LA80_1==LEFT_SQUARE) ) {
+                    alt80=2;
                 }
-                else if ( (LA79_1==LEFT_PAREN) ) {
-                    int LA79_4 = input.LA(3);
+                else if ( (LA80_1==LEFT_PAREN) ) {
+                    int LA80_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                        alt79=1;
+                        alt80=1;
                     }
                     else if ( (true) ) {
-                        alt79=2;
+                        alt80=2;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1136:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 4, input);
+                            new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 4, input);
 
                         throw nvae;
                     }
@@ -10251,76 +10343,76 @@
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1136:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 1, input);
+                        new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA79_0==LEFT_PAREN) ) {
-                alt79=3;
+            else if ( (LA80_0==LEFT_PAREN) ) {
+                alt80=3;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1136:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 0, input);
+                    new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 0, input);
 
                 throw nvae;
             }
-            switch (alt79) {
+            switch (alt80) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1140:4: eval_key paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1142:4: eval_key paren_chunk
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_eval_key_in_unary_constr3822);
-                    eval_key220=eval_key();
+                    pushFollow(FOLLOW_eval_key_in_unary_constr3846);
+                    eval_key221=eval_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key220.getTree(), root_0);
-                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3825);
-                    paren_chunk221=paren_chunk();
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key221.getTree(), root_0);
+                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3849);
+                    paren_chunk222=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk221.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk222.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1141:4: field_constraint
+                    // src/main/resources/org/drools/lang/DRL.g:1143:4: field_constraint
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr3830);
-                    field_constraint222=field_constraint();
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr3854);
+                    field_constraint223=field_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint222.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint223.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1142:5: LEFT_PAREN or_constr RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1144:5: LEFT_PAREN or_constr RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN223=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3836); if (failed) return retval;
+                    LEFT_PAREN224=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3860); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN223, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN224, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_constr_in_unary_constr3846);
-                    or_constr224=or_constr();
+                    pushFollow(FOLLOW_or_constr_in_unary_constr3870);
+                    or_constr225=or_constr();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, or_constr224.getTree());
-                    RIGHT_PAREN225=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3851); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, or_constr225.getTree());
+                    RIGHT_PAREN226=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3875); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN225_tree = (Object)adaptor.create(RIGHT_PAREN225);
-                    adaptor.addChild(root_0, RIGHT_PAREN225_tree);
+                    RIGHT_PAREN226_tree = (Object)adaptor.create(RIGHT_PAREN226);
+                    adaptor.addChild(root_0, RIGHT_PAREN226_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN225, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN226, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -10361,7 +10453,7 @@
     };
 
     // $ANTLR start field_constraint
-    // src/main/resources/org/drools/lang/DRL.g:1155:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );
+    // src/main/resources/org/drools/lang/DRL.g:1157:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );
     public final field_constraint_return field_constraint() throws RecognitionException {
         field_constraint_return retval = new field_constraint_return();
         retval.start = input.LT(1);
@@ -10369,46 +10461,46 @@
         Object root_0 = null;
 
         Token arw=null;
-        label_return label226 = null;
+        label_return label227 = null;
 
-        accessor_path_return accessor_path227 = null;
+        accessor_path_return accessor_path228 = null;
 
-        or_restr_connective_return or_restr_connective228 = null;
+        or_restr_connective_return or_restr_connective229 = null;
 
-        paren_chunk_return paren_chunk229 = null;
+        paren_chunk_return paren_chunk230 = null;
 
-        accessor_path_return accessor_path230 = null;
+        accessor_path_return accessor_path231 = null;
 
-        or_restr_connective_return or_restr_connective231 = null;
+        or_restr_connective_return or_restr_connective232 = null;
 
 
         Object arw_tree=null;
         RewriteRuleTokenStream stream_ARROW=new RewriteRuleTokenStream(adaptor,"token ARROW");
+        RewriteRuleSubtreeStream stream_accessor_path=new RewriteRuleSubtreeStream(adaptor,"rule accessor_path");
+        RewriteRuleSubtreeStream stream_label=new RewriteRuleSubtreeStream(adaptor,"rule label");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         RewriteRuleSubtreeStream stream_or_restr_connective=new RewriteRuleSubtreeStream(adaptor,"rule or_restr_connective");
-        RewriteRuleSubtreeStream stream_label=new RewriteRuleSubtreeStream(adaptor,"rule label");
-        RewriteRuleSubtreeStream stream_accessor_path=new RewriteRuleSubtreeStream(adaptor,"rule accessor_path");
-
+        
         	boolean isArrow = false;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1158:3: ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) )
-            int alt81=2;
-            int LA81_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1160:3: ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) )
+            int alt82=2;
+            int LA82_0 = input.LA(1);
 
-            if ( (LA81_0==ID) ) {
-                int LA81_1 = input.LA(2);
+            if ( (LA82_0==ID) ) {
+                int LA82_1 = input.LA(2);
 
-                if ( (LA81_1==COLON) ) {
-                    alt81=1;
+                if ( (LA82_1==COLON) ) {
+                    alt82=1;
                 }
-                else if ( ((LA81_1>=ID && LA81_1<=DOT)||LA81_1==LEFT_PAREN||(LA81_1>=EQUAL && LA81_1<=GRAVE_ACCENT)||LA81_1==LEFT_SQUARE) ) {
-                    alt81=2;
+                else if ( ((LA82_1>=ID && LA82_1<=DOT)||LA82_1==LEFT_PAREN||(LA82_1>=EQUAL && LA82_1<=GRAVE_ACCENT)||LA82_1==LEFT_SQUARE) ) {
+                    alt82=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1155:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 81, 1, input);
+                        new NoViableAltException("1157:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 82, 1, input);
 
                     throw nvae;
                 }
@@ -10416,61 +10508,61 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1155:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 81, 0, input);
+                    new NoViableAltException("1157:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 82, 0, input);
 
                 throw nvae;
             }
-            switch (alt81) {
+            switch (alt82) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1158:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
+                    // src/main/resources/org/drools/lang/DRL.g:1160:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
                     {
-                    pushFollow(FOLLOW_label_in_field_constraint3871);
-                    label226=label();
+                    pushFollow(FOLLOW_label_in_field_constraint3895);
+                    label227=label();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_label.add(label226.getTree());
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3873);
-                    accessor_path227=accessor_path();
+                    if ( backtracking==0 ) stream_label.add(label227.getTree());
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3897);
+                    accessor_path228=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path227.getTree());
-                    // src/main/resources/org/drools/lang/DRL.g:1159:3: ( or_restr_connective | arw= ARROW paren_chunk )?
-                    int alt80=3;
-                    int LA80_0 = input.LA(1);
+                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path228.getTree());
+                    // src/main/resources/org/drools/lang/DRL.g:1161:3: ( or_restr_connective | arw= ARROW paren_chunk )?
+                    int alt81=3;
+                    int LA81_0 = input.LA(1);
 
-                    if ( (LA80_0==ID||LA80_0==LEFT_PAREN||(LA80_0>=EQUAL && LA80_0<=GRAVE_ACCENT)) ) {
-                        alt80=1;
+                    if ( (LA81_0==ID||LA81_0==LEFT_PAREN||(LA81_0>=EQUAL && LA81_0<=GRAVE_ACCENT)) ) {
+                        alt81=1;
                     }
-                    else if ( (LA80_0==ARROW) ) {
-                        alt80=2;
+                    else if ( (LA81_0==ARROW) ) {
+                        alt81=2;
                     }
-                    switch (alt80) {
+                    switch (alt81) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:1159:5: or_restr_connective
+                            // src/main/resources/org/drools/lang/DRL.g:1161:5: or_restr_connective
                             {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3880);
-                            or_restr_connective228=or_restr_connective();
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3904);
+                            or_restr_connective229=or_restr_connective();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective228.getTree());
+                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective229.getTree());
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:1159:27: arw= ARROW paren_chunk
+                            // src/main/resources/org/drools/lang/DRL.g:1161:27: arw= ARROW paren_chunk
                             {
                             arw=(Token)input.LT(1);
-                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3886); if (failed) return retval;
+                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3910); if (failed) return retval;
                             if ( backtracking==0 ) stream_ARROW.add(arw);
 
                             if ( backtracking==0 ) {
                               	emit(arw, DroolsEditorType.SYMBOL);	
                             }
-                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3890);
-                            paren_chunk229=paren_chunk();
+                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3914);
+                            paren_chunk230=paren_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk229.getTree());
+                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk230.getTree());
                             if ( backtracking==0 ) {
                               isArrow = true;
                             }
@@ -10482,7 +10574,7 @@
 
 
                     // AST REWRITE
-                    // elements: accessor_path, paren_chunk, or_restr_connective, label, accessor_path, label
+                    // elements: accessor_path, accessor_path, label, paren_chunk, or_restr_connective, label
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -10492,15 +10584,15 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1160:3: -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                    // 1162:3: -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )?
                     if (isArrow) {
-                        // src/main/resources/org/drools/lang/DRL.g:1160:17: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) )
+                        // src/main/resources/org/drools/lang/DRL.g:1162:17: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_BIND_FIELD, "VT_BIND_FIELD"), root_1);
 
                         adaptor.addChild(root_1, stream_label.next());
-                        // src/main/resources/org/drools/lang/DRL.g:1160:39: ^( VT_FIELD accessor_path )
+                        // src/main/resources/org/drools/lang/DRL.g:1162:39: ^( VT_FIELD accessor_path )
                         {
                         Object root_2 = (Object)adaptor.nil();
                         root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_FIELD, "VT_FIELD"), root_2);
@@ -10512,9 +10604,9 @@
 
                         adaptor.addChild(root_0, root_1);
                         }
-                        // src/main/resources/org/drools/lang/DRL.g:1160:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                        // src/main/resources/org/drools/lang/DRL.g:1162:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
                         if ( stream_paren_chunk.hasNext() ) {
-                            // src/main/resources/org/drools/lang/DRL.g:1160:66: ^( VK_EVAL[$arw] paren_chunk )
+                            // src/main/resources/org/drools/lang/DRL.g:1162:66: ^( VK_EVAL[$arw] paren_chunk )
                             {
                             Object root_1 = (Object)adaptor.nil();
                             root_1 = (Object)adaptor.becomeRoot(adaptor.create(VK_EVAL, arw), root_1);
@@ -10528,21 +10620,21 @@
                         stream_paren_chunk.reset();
 
                     }
-                    else // 1161:3: -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
+                    else // 1163:3: -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1161:6: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
+                        // src/main/resources/org/drools/lang/DRL.g:1163:6: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_BIND_FIELD, "VT_BIND_FIELD"), root_1);
 
                         adaptor.addChild(root_1, stream_label.next());
-                        // src/main/resources/org/drools/lang/DRL.g:1161:28: ^( VT_FIELD accessor_path ( or_restr_connective )? )
+                        // src/main/resources/org/drools/lang/DRL.g:1163:28: ^( VT_FIELD accessor_path ( or_restr_connective )? )
                         {
                         Object root_2 = (Object)adaptor.nil();
                         root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_FIELD, "VT_FIELD"), root_2);
 
                         adaptor.addChild(root_2, stream_accessor_path.next());
-                        // src/main/resources/org/drools/lang/DRL.g:1161:53: ( or_restr_connective )?
+                        // src/main/resources/org/drools/lang/DRL.g:1163:53: ( or_restr_connective )?
                         if ( stream_or_restr_connective.hasNext() ) {
                             adaptor.addChild(root_2, stream_or_restr_connective.next());
 
@@ -10562,21 +10654,21 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1162:4: accessor_path or_restr_connective
+                    // src/main/resources/org/drools/lang/DRL.g:1164:4: accessor_path or_restr_connective
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3944);
-                    accessor_path230=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3968);
+                    accessor_path231=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path230.getTree());
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3946);
-                    or_restr_connective231=or_restr_connective();
+                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path231.getTree());
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3970);
+                    or_restr_connective232=or_restr_connective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective231.getTree());
+                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective232.getTree());
 
                     // AST REWRITE
-                    // elements: accessor_path, or_restr_connective
+                    // elements: or_restr_connective, accessor_path
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -10586,9 +10678,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1163:3: -> ^( VT_FIELD accessor_path or_restr_connective )
+                    // 1165:3: -> ^( VT_FIELD accessor_path or_restr_connective )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1163:6: ^( VT_FIELD accessor_path or_restr_connective )
+                        // src/main/resources/org/drools/lang/DRL.g:1165:6: ^( VT_FIELD accessor_path or_restr_connective )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FIELD, "VT_FIELD"), root_1);
@@ -10630,7 +10722,7 @@
     };
 
     // $ANTLR start label
-    // src/main/resources/org/drools/lang/DRL.g:1166:1: label : value= ID COLON -> VT_LABEL[$value] ;
+    // src/main/resources/org/drools/lang/DRL.g:1168:1: label : value= ID COLON -> VT_LABEL[$value] ;
     public final label_return label() throws RecognitionException {
         label_return retval = new label_return();
         retval.start = input.LT(1);
@@ -10638,30 +10730,30 @@
         Object root_0 = null;
 
         Token value=null;
-        Token COLON232=null;
+        Token COLON233=null;
 
         Object value_tree=null;
-        Object COLON232_tree=null;
+        Object COLON233_tree=null;
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1167:2: (value= ID COLON -> VT_LABEL[$value] )
-            // src/main/resources/org/drools/lang/DRL.g:1167:4: value= ID COLON
+            // src/main/resources/org/drools/lang/DRL.g:1169:2: (value= ID COLON -> VT_LABEL[$value] )
+            // src/main/resources/org/drools/lang/DRL.g:1169:4: value= ID COLON
             {
             value=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_label3971); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_label3995); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(value);
 
             if ( backtracking==0 ) {
               	emit(value, DroolsEditorType.IDENTIFIER_VARIABLE);	
             }
-            COLON232=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_label3978); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON232);
+            COLON233=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_label4002); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON233);
 
             if ( backtracking==0 ) {
-              	emit(COLON232, DroolsEditorType.SYMBOL);	
+              	emit(COLON233, DroolsEditorType.SYMBOL);	
             }
 
             // AST REWRITE
@@ -10675,7 +10767,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1169:3: -> VT_LABEL[$value]
+            // 1171:3: -> VT_LABEL[$value]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_LABEL, value));
 
@@ -10708,65 +10800,65 @@
     };
 
     // $ANTLR start or_restr_connective
-    // src/main/resources/org/drools/lang/DRL.g:1172:1: or_restr_connective : and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1174:1: or_restr_connective : and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* ;
     public final or_restr_connective_return or_restr_connective() throws RecognitionException {
         or_restr_connective_return retval = new or_restr_connective_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOUBLE_PIPE234=null;
-        and_restr_connective_return and_restr_connective233 = null;
+        Token DOUBLE_PIPE235=null;
+        and_restr_connective_return and_restr_connective234 = null;
 
-        and_restr_connective_return and_restr_connective235 = null;
+        and_restr_connective_return and_restr_connective236 = null;
 
 
-        Object DOUBLE_PIPE234_tree=null;
+        Object DOUBLE_PIPE235_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1173:2: ( and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* )
-            // src/main/resources/org/drools/lang/DRL.g:1173:4: and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )*
+            // src/main/resources/org/drools/lang/DRL.g:1175:2: ( and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* )
+            // src/main/resources/org/drools/lang/DRL.g:1175:4: and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3999);
-            and_restr_connective233=and_restr_connective();
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4023);
+            and_restr_connective234=and_restr_connective();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective233.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1173:25: ({...}? => DOUBLE_PIPE and_restr_connective )*
-            loop82:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective234.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1175:25: ({...}? => DOUBLE_PIPE and_restr_connective )*
+            loop83:
             do {
-                int alt82=2;
-                alt82 = dfa82.predict(input);
-                switch (alt82) {
+                int alt83=2;
+                alt83 = dfa83.predict(input);
+                switch (alt83) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1173:26: {...}? => DOUBLE_PIPE and_restr_connective
+            	    // src/main/resources/org/drools/lang/DRL.g:1175:26: {...}? => DOUBLE_PIPE and_restr_connective
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "or_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_PIPE234=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4005); if (failed) return retval;
+            	    DOUBLE_PIPE235=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4029); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE234_tree = (Object)adaptor.create(DOUBLE_PIPE234);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE234_tree, root_0);
+            	    DOUBLE_PIPE235_tree = (Object)adaptor.create(DOUBLE_PIPE235);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE235_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_PIPE234, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_PIPE235, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4013);
-            	    and_restr_connective235=and_restr_connective();
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4037);
+            	    and_restr_connective236=and_restr_connective();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective235.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective236.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop82;
+            	    break loop83;
                 }
             } while (true);
 
@@ -10796,65 +10888,65 @@
     };
 
     // $ANTLR start and_restr_connective
-    // src/main/resources/org/drools/lang/DRL.g:1177:1: and_restr_connective : constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1179:1: and_restr_connective : constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* ;
     public final and_restr_connective_return and_restr_connective() throws RecognitionException {
         and_restr_connective_return retval = new and_restr_connective_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOUBLE_AMPER237=null;
-        constraint_expression_return constraint_expression236 = null;
+        Token DOUBLE_AMPER238=null;
+        constraint_expression_return constraint_expression237 = null;
 
-        constraint_expression_return constraint_expression238 = null;
+        constraint_expression_return constraint_expression239 = null;
 
 
-        Object DOUBLE_AMPER237_tree=null;
+        Object DOUBLE_AMPER238_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1178:2: ( constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* )
-            // src/main/resources/org/drools/lang/DRL.g:1178:4: constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )*
+            // src/main/resources/org/drools/lang/DRL.g:1180:2: ( constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* )
+            // src/main/resources/org/drools/lang/DRL.g:1180:4: constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4028);
-            constraint_expression236=constraint_expression();
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4052);
+            constraint_expression237=constraint_expression();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression236.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1178:26: ({...}? => DOUBLE_AMPER constraint_expression )*
-            loop83:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression237.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1180:26: ({...}? => DOUBLE_AMPER constraint_expression )*
+            loop84:
             do {
-                int alt83=2;
-                alt83 = dfa83.predict(input);
-                switch (alt83) {
+                int alt84=2;
+                alt84 = dfa84.predict(input);
+                switch (alt84) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1178:27: {...}? => DOUBLE_AMPER constraint_expression
+            	    // src/main/resources/org/drools/lang/DRL.g:1180:27: {...}? => DOUBLE_AMPER constraint_expression
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "and_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_AMPER237=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4034); if (failed) return retval;
+            	    DOUBLE_AMPER238=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4058); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER237_tree = (Object)adaptor.create(DOUBLE_AMPER237);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER237_tree, root_0);
+            	    DOUBLE_AMPER238_tree = (Object)adaptor.create(DOUBLE_AMPER238);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER238_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_AMPER237, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_AMPER238, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4041);
-            	    constraint_expression238=constraint_expression();
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4065);
+            	    constraint_expression239=constraint_expression();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression238.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression239.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop83;
+            	    break loop84;
                 }
             } while (true);
 
@@ -10884,105 +10976,200 @@
     };
 
     // $ANTLR start constraint_expression
-    // src/main/resources/org/drools/lang/DRL.g:1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );
+    // src/main/resources/org/drools/lang/DRL.g:1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );
     public final constraint_expression_return constraint_expression() throws RecognitionException {
         constraint_expression_return retval = new constraint_expression_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN241=null;
-        Token RIGHT_PAREN243=null;
-        compound_operator_return compound_operator239 = null;
+        Token LEFT_PAREN242=null;
+        Token RIGHT_PAREN244=null;
+        compound_operator_return compound_operator240 = null;
 
-        simple_operator_return simple_operator240 = null;
+        simple_operator_return simple_operator241 = null;
 
-        or_restr_connective_return or_restr_connective242 = null;
+        or_restr_connective_return or_restr_connective243 = null;
 
 
-        Object LEFT_PAREN241_tree=null;
-        Object RIGHT_PAREN243_tree=null;
+        Object LEFT_PAREN242_tree=null;
+        Object RIGHT_PAREN244_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1185:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
-            int alt84=3;
+            // src/main/resources/org/drools/lang/DRL.g:1187:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
+            int alt85=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                int LA84_1 = input.LA(2);
+                int LA85_1 = input.LA(2);
 
-                if ( (LA84_1==ID) ) {
-                    int LA84_10 = input.LA(3);
+                if ( (LA85_1==ID) ) {
+                    int LA85_10 = input.LA(3);
 
-                    if ( (LA84_10==ID||LA84_10==STRING||(LA84_10>=BOOL && LA84_10<=INT)||(LA84_10>=FLOAT && LA84_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        alt84=2;
+                    if ( (LA85_10==ID||LA85_10==STRING||(LA85_10>=BOOL && LA85_10<=INT)||(LA85_10>=FLOAT && LA85_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        alt85=2;
                     }
-                    else if ( (LA84_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        int LA84_24 = input.LA(4);
+                    else if ( (LA85_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        int LA85_24 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt84=1;
+                            alt85=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt84=2;
+                            alt85=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 24, input);
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 24, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA84_10==DOT||(LA84_10>=COMMA && LA84_10<=RIGHT_PAREN)||(LA84_10>=DOUBLE_PIPE && LA84_10<=DOUBLE_AMPER)||LA84_10==LEFT_SQUARE) ) {
-                        alt84=2;
+                    else if ( (LA85_10==DOT||(LA85_10>=COMMA && LA85_10<=RIGHT_PAREN)||(LA85_10>=DOUBLE_PIPE && LA85_10<=DOUBLE_AMPER)||LA85_10==LEFT_SQUARE) ) {
+                        alt85=2;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 10, input);
+                            new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 10, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA84_1==STRING||(LA84_1>=BOOL && LA84_1<=INT)||(LA84_1>=FLOAT && LA84_1<=NULL)) ) {
-                    alt84=2;
+                else if ( (LA85_1==STRING||(LA85_1>=BOOL && LA85_1<=INT)||(LA85_1>=FLOAT && LA85_1<=NULL)) ) {
+                    alt85=2;
                 }
-                else if ( (LA84_1==LEFT_PAREN) ) {
+                else if ( (LA85_1==LEFT_PAREN) ) {
                     switch ( input.LA(3) ) {
                     case ID:
                         {
-                        int LA84_31 = input.LA(4);
+                        int LA85_31 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
+                            alt85=1;
                         }
                         else if ( (true) ) {
-                            alt84=2;
+                            alt85=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 31, input);
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 31, input);
 
                             throw nvae;
                         }
                         }
                         break;
+                    case STRING:
+                        {
+                        int LA85_32 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt85=1;
+                        }
+                        else if ( (true) ) {
+                            alt85=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 32, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case INT:
+                        {
+                        int LA85_33 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt85=1;
+                        }
+                        else if ( (true) ) {
+                            alt85=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 33, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case FLOAT:
+                        {
+                        int LA85_34 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt85=1;
+                        }
+                        else if ( (true) ) {
+                            alt85=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 34, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case BOOL:
+                        {
+                        int LA85_35 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt85=1;
+                        }
+                        else if ( (true) ) {
+                            alt85=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 35, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case NULL:
+                        {
+                        int LA85_36 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt85=1;
+                        }
+                        else if ( (true) ) {
+                            alt85=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 36, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
                     case LEFT_PAREN:
                         {
-                        int LA84_32 = input.LA(4);
+                        int LA85_37 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
+                            alt85=1;
                         }
                         else if ( (true) ) {
-                            alt84=2;
+                            alt85=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 32, input);
+                                new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 37, input);
 
                             throw nvae;
                         }
@@ -11107,120 +11294,25 @@
                     case C_STYLE_SINGLE_LINE_COMMENT:
                     case MULTI_LINE_COMMENT:
                         {
-                        alt84=2;
+                        alt85=2;
                         }
                         break;
-                    case STRING:
-                        {
-                        int LA84_34 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 34, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
-                    case INT:
-                        {
-                        int LA84_35 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 35, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
-                    case FLOAT:
-                        {
-                        int LA84_36 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 36, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
-                    case BOOL:
-                        {
-                        int LA84_37 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 37, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
-                    case NULL:
-                        {
-                        int LA84_38 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 38, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 16, input);
+                            new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 16, input);
 
                         throw nvae;
                     }
 
                 }
-                else if ( (LA84_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt84=2;
+                else if ( (LA85_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt85=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 1, input);
+                        new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 1, input);
 
                     throw nvae;
                 }
@@ -11234,72 +11326,72 @@
             case NOT_EQUAL:
             case GRAVE_ACCENT:
                 {
-                alt84=2;
+                alt85=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt84=3;
+                alt85=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1182:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 0, input);
+                    new NoViableAltException("1184:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 85, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt84) {
+            switch (alt85) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1185:5: compound_operator
+                    // src/main/resources/org/drools/lang/DRL.g:1187:5: compound_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4063);
-                    compound_operator239=compound_operator();
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4087);
+                    compound_operator240=compound_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator239.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator240.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1186:4: simple_operator
+                    // src/main/resources/org/drools/lang/DRL.g:1188:4: simple_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4068);
-                    simple_operator240=simple_operator();
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4092);
+                    simple_operator241=simple_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator240.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator241.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1187:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1189:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN241=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4073); if (failed) return retval;
+                    LEFT_PAREN242=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4097); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN241, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN242, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4082);
-                    or_restr_connective242=or_restr_connective();
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4106);
+                    or_restr_connective243=or_restr_connective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, or_restr_connective242.getTree());
-                    RIGHT_PAREN243=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4087); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, or_restr_connective243.getTree());
+                    RIGHT_PAREN244=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4111); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN243_tree = (Object)adaptor.create(RIGHT_PAREN243);
-                    adaptor.addChild(root_0, RIGHT_PAREN243_tree);
+                    RIGHT_PAREN244_tree = (Object)adaptor.create(RIGHT_PAREN244);
+                    adaptor.addChild(root_0, RIGHT_PAREN244_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN243, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN244, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -11314,7 +11406,7 @@
             }
         }
         catch ( RecognitionException re ) {
-
+            
             	if (!lookaheadTest){
             		reportError(re);
             		recover(input, re);
@@ -11324,7 +11416,7 @@
 
         }
         finally {
-
+            
             	if (isEditorInterfaceEnabled && input.LA(2) == EOF && input.LA(1) == ID) {
             		emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             		emit(input.LT(1), DroolsEditorType.KEYWORD);
@@ -11367,7 +11459,7 @@
     };
 
     // $ANTLR start simple_operator
-    // src/main/resources/org/drools/lang/DRL.g:1232:1: simple_operator : ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value ;
+    // src/main/resources/org/drools/lang/DRL.g:1234:1: simple_operator : ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value ;
     public final simple_operator_return simple_operator() throws RecognitionException {
         simple_operator_return retval = new simple_operator_return();
         retval.start = input.LT(1);
@@ -11380,37 +11472,37 @@
         Token id3=null;
         Token ga2=null;
         Token id4=null;
-        Token EQUAL244=null;
-        Token GREATER245=null;
-        Token GREATER_EQUAL246=null;
-        Token LESS247=null;
-        Token LESS_EQUAL248=null;
-        Token NOT_EQUAL249=null;
-        not_key_return not_key250 = null;
+        Token EQUAL245=null;
+        Token GREATER246=null;
+        Token GREATER_EQUAL247=null;
+        Token LESS248=null;
+        Token LESS_EQUAL249=null;
+        Token NOT_EQUAL250=null;
+        not_key_return not_key251 = null;
 
-        contains_key_return contains_key251 = null;
+        contains_key_return contains_key252 = null;
 
-        soundslike_key_return soundslike_key252 = null;
+        soundslike_key_return soundslike_key253 = null;
 
-        matches_key_return matches_key253 = null;
+        matches_key_return matches_key254 = null;
 
-        memberof_key_return memberof_key254 = null;
+        memberof_key_return memberof_key255 = null;
 
-        square_chunk_return square_chunk255 = null;
+        square_chunk_return square_chunk256 = null;
 
-        contains_key_return contains_key256 = null;
+        contains_key_return contains_key257 = null;
 
-        excludes_key_return excludes_key257 = null;
+        excludes_key_return excludes_key258 = null;
 
-        matches_key_return matches_key258 = null;
+        matches_key_return matches_key259 = null;
 
-        soundslike_key_return soundslike_key259 = null;
+        soundslike_key_return soundslike_key260 = null;
 
-        memberof_key_return memberof_key260 = null;
+        memberof_key_return memberof_key261 = null;
 
-        square_chunk_return square_chunk261 = null;
+        square_chunk_return square_chunk262 = null;
 
-        expression_value_return expression_value262 = null;
+        expression_value_return expression_value263 = null;
 
 
         Object id1_tree=null;
@@ -11419,84 +11511,84 @@
         Object id3_tree=null;
         Object ga2_tree=null;
         Object id4_tree=null;
-        Object EQUAL244_tree=null;
-        Object GREATER245_tree=null;
-        Object GREATER_EQUAL246_tree=null;
-        Object LESS247_tree=null;
-        Object LESS_EQUAL248_tree=null;
-        Object NOT_EQUAL249_tree=null;
+        Object EQUAL245_tree=null;
+        Object GREATER246_tree=null;
+        Object GREATER_EQUAL247_tree=null;
+        Object LESS248_tree=null;
+        Object LESS_EQUAL249_tree=null;
+        Object NOT_EQUAL250_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1233:2: ( ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value )
-            // src/main/resources/org/drools/lang/DRL.g:1233:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value
+            // src/main/resources/org/drools/lang/DRL.g:1235:2: ( ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value )
+            // src/main/resources/org/drools/lang/DRL.g:1235:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk ) expression_value
             {
             root_0 = (Object)adaptor.nil();
 
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1234:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )
-            int alt86=14;
+            // src/main/resources/org/drools/lang/DRL.g:1236:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )
+            int alt87=14;
             switch ( input.LA(1) ) {
             case EQUAL:
                 {
-                alt86=1;
+                alt87=1;
                 }
                 break;
             case GREATER:
                 {
-                alt86=2;
+                alt87=2;
                 }
                 break;
             case GREATER_EQUAL:
                 {
-                alt86=3;
+                alt87=3;
                 }
                 break;
             case LESS:
                 {
-                alt86=4;
+                alt87=4;
                 }
                 break;
             case LESS_EQUAL:
                 {
-                alt86=5;
+                alt87=5;
                 }
                 break;
             case NOT_EQUAL:
                 {
-                alt86=6;
+                alt87=6;
                 }
                 break;
             case ID:
                 {
-                int LA86_7 = input.LA(2);
+                int LA87_7 = input.LA(2);
 
-                if ( (LA86_7==ID||LA86_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt86=7;
+                if ( (LA87_7==ID||LA87_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt87=7;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                    alt86=8;
+                    alt87=8;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))) ) {
-                    alt86=9;
+                    alt87=9;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                    alt86=10;
+                    alt87=10;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                    alt86=11;
+                    alt87=11;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                    alt86=12;
+                    alt87=12;
                 }
                 else if ( (true) ) {
-                    alt86=13;
+                    alt87=13;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1234:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )", 86, 7, input);
+                        new NoViableAltException("1236:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )", 87, 7, input);
 
                     throw nvae;
                 }
@@ -11504,206 +11596,206 @@
                 break;
             case GRAVE_ACCENT:
                 {
-                alt86=14;
+                alt87=14;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1234:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )", 86, 0, input);
+                    new NoViableAltException("1236:3: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | id3= ID | ga2= GRAVE_ACCENT id4= ID square_chunk )", 87, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt86) {
+            switch (alt87) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1234:4: EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1236:4: EQUAL
                     {
-                    EQUAL244=(Token)input.LT(1);
-                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator4116); if (failed) return retval;
+                    EQUAL245=(Token)input.LT(1);
+                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator4140); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    EQUAL244_tree = (Object)adaptor.create(EQUAL244);
-                    root_0 = (Object)adaptor.becomeRoot(EQUAL244_tree, root_0);
+                    EQUAL245_tree = (Object)adaptor.create(EQUAL245);
+                    root_0 = (Object)adaptor.becomeRoot(EQUAL245_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(EQUAL244, DroolsEditorType.SYMBOL);	
+                      	emit(EQUAL245, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1235:4: GREATER
+                    // src/main/resources/org/drools/lang/DRL.g:1237:4: GREATER
                     {
-                    GREATER245=(Token)input.LT(1);
-                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator4124); if (failed) return retval;
+                    GREATER246=(Token)input.LT(1);
+                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator4148); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER245_tree = (Object)adaptor.create(GREATER245);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER245_tree, root_0);
+                    GREATER246_tree = (Object)adaptor.create(GREATER246);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER246_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(GREATER245, DroolsEditorType.SYMBOL);	
+                      	emit(GREATER246, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1236:4: GREATER_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1238:4: GREATER_EQUAL
                     {
-                    GREATER_EQUAL246=(Token)input.LT(1);
-                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator4132); if (failed) return retval;
+                    GREATER_EQUAL247=(Token)input.LT(1);
+                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator4156); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER_EQUAL246_tree = (Object)adaptor.create(GREATER_EQUAL246);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL246_tree, root_0);
+                    GREATER_EQUAL247_tree = (Object)adaptor.create(GREATER_EQUAL247);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL247_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(GREATER_EQUAL246, DroolsEditorType.SYMBOL);	
+                      	emit(GREATER_EQUAL247, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:1237:4: LESS
+                    // src/main/resources/org/drools/lang/DRL.g:1239:4: LESS
                     {
-                    LESS247=(Token)input.LT(1);
-                    match(input,LESS,FOLLOW_LESS_in_simple_operator4140); if (failed) return retval;
+                    LESS248=(Token)input.LT(1);
+                    match(input,LESS,FOLLOW_LESS_in_simple_operator4164); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS247_tree = (Object)adaptor.create(LESS247);
-                    root_0 = (Object)adaptor.becomeRoot(LESS247_tree, root_0);
+                    LESS248_tree = (Object)adaptor.create(LESS248);
+                    root_0 = (Object)adaptor.becomeRoot(LESS248_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(LESS247, DroolsEditorType.SYMBOL);	
+                      	emit(LESS248, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:1238:4: LESS_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1240:4: LESS_EQUAL
                     {
-                    LESS_EQUAL248=(Token)input.LT(1);
-                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator4148); if (failed) return retval;
+                    LESS_EQUAL249=(Token)input.LT(1);
+                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator4172); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS_EQUAL248_tree = (Object)adaptor.create(LESS_EQUAL248);
-                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL248_tree, root_0);
+                    LESS_EQUAL249_tree = (Object)adaptor.create(LESS_EQUAL249);
+                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL249_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(LESS_EQUAL248, DroolsEditorType.SYMBOL);	
+                      	emit(LESS_EQUAL249, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:1239:4: NOT_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1241:4: NOT_EQUAL
                     {
-                    NOT_EQUAL249=(Token)input.LT(1);
-                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator4156); if (failed) return retval;
+                    NOT_EQUAL250=(Token)input.LT(1);
+                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator4180); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    NOT_EQUAL249_tree = (Object)adaptor.create(NOT_EQUAL249);
-                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL249_tree, root_0);
+                    NOT_EQUAL250_tree = (Object)adaptor.create(NOT_EQUAL250);
+                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL250_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(NOT_EQUAL249, DroolsEditorType.SYMBOL);	
+                      	emit(NOT_EQUAL250, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 7 :
-                    // src/main/resources/org/drools/lang/DRL.g:1240:4: not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
+                    // src/main/resources/org/drools/lang/DRL.g:1242:4: not_key ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
                     {
-                    pushFollow(FOLLOW_not_key_in_simple_operator4164);
-                    not_key250=not_key();
+                    pushFollow(FOLLOW_not_key_in_simple_operator4188);
+                    not_key251=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key250.getTree());
-                    // src/main/resources/org/drools/lang/DRL.g:1241:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
-                    int alt85=6;
-                    int LA85_0 = input.LA(1);
+                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key251.getTree());
+                    // src/main/resources/org/drools/lang/DRL.g:1243:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
+                    int alt86=6;
+                    int LA86_0 = input.LA(1);
 
-                    if ( (LA85_0==ID) ) {
-                        int LA85_1 = input.LA(2);
+                    if ( (LA86_0==ID) ) {
+                        int LA86_1 = input.LA(2);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                            alt85=1;
+                            alt86=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                            alt85=2;
+                            alt86=2;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                            alt85=3;
+                            alt86=3;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                            alt85=4;
+                            alt86=4;
                         }
                         else if ( (true) ) {
-                            alt85=5;
+                            alt86=5;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("1241:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 85, 1, input);
+                                new NoViableAltException("1243:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 86, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA85_0==GRAVE_ACCENT) ) {
-                        alt85=6;
+                    else if ( (LA86_0==GRAVE_ACCENT) ) {
+                        alt86=6;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1241:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 85, 0, input);
+                            new NoViableAltException("1243:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 86, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt85) {
+                    switch (alt86) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:1241:5: contains_key
+                            // src/main/resources/org/drools/lang/DRL.g:1243:5: contains_key
                             {
-                            pushFollow(FOLLOW_contains_key_in_simple_operator4171);
-                            contains_key251=contains_key();
+                            pushFollow(FOLLOW_contains_key_in_simple_operator4195);
+                            contains_key252=contains_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key251.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key252.getTree(), root_0);
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:1242:5: soundslike_key
+                            // src/main/resources/org/drools/lang/DRL.g:1244:5: soundslike_key
                             {
-                            pushFollow(FOLLOW_soundslike_key_in_simple_operator4178);
-                            soundslike_key252=soundslike_key();
+                            pushFollow(FOLLOW_soundslike_key_in_simple_operator4202);
+                            soundslike_key253=soundslike_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key252.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key253.getTree(), root_0);
 
                             }
                             break;
                         case 3 :
-                            // src/main/resources/org/drools/lang/DRL.g:1243:5: matches_key
+                            // src/main/resources/org/drools/lang/DRL.g:1245:5: matches_key
                             {
-                            pushFollow(FOLLOW_matches_key_in_simple_operator4185);
-                            matches_key253=matches_key();
+                            pushFollow(FOLLOW_matches_key_in_simple_operator4209);
+                            matches_key254=matches_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key253.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key254.getTree(), root_0);
 
                             }
                             break;
                         case 4 :
-                            // src/main/resources/org/drools/lang/DRL.g:1244:5: memberof_key
+                            // src/main/resources/org/drools/lang/DRL.g:1246:5: memberof_key
                             {
-                            pushFollow(FOLLOW_memberof_key_in_simple_operator4192);
-                            memberof_key254=memberof_key();
+                            pushFollow(FOLLOW_memberof_key_in_simple_operator4216);
+                            memberof_key255=memberof_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key254.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key255.getTree(), root_0);
 
                             }
                             break;
                         case 5 :
-                            // src/main/resources/org/drools/lang/DRL.g:1245:5: id1= ID
+                            // src/main/resources/org/drools/lang/DRL.g:1247:5: id1= ID
                             {
                             id1=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator4201); if (failed) return retval;
+                            match(input,ID,FOLLOW_ID_in_simple_operator4225); if (failed) return retval;
                             if ( backtracking==0 ) {
                             id1_tree = (Object)adaptor.create(id1);
                             root_0 = (Object)adaptor.becomeRoot(id1_tree, root_0);
@@ -11715,15 +11807,15 @@
                             }
                             break;
                         case 6 :
-                            // src/main/resources/org/drools/lang/DRL.g:1246:5: ga1= GRAVE_ACCENT id2= ID square_chunk
+                            // src/main/resources/org/drools/lang/DRL.g:1248:5: ga1= GRAVE_ACCENT id2= ID square_chunk
                             {
                             ga1=(Token)input.LT(1);
-                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4212); if (failed) return retval;
+                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4236); if (failed) return retval;
                             if ( backtracking==0 ) {
                               	emit(ga1, DroolsEditorType.SYMBOL);	
                             }
                             id2=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator4220); if (failed) return retval;
+                            match(input,ID,FOLLOW_ID_in_simple_operator4244); if (failed) return retval;
                             if ( backtracking==0 ) {
                             id2_tree = (Object)adaptor.create(id2);
                             root_0 = (Object)adaptor.becomeRoot(id2_tree, root_0);
@@ -11731,11 +11823,11 @@
                             if ( backtracking==0 ) {
                               	emit(id2, DroolsEditorType.IDENTIFIER);	
                             }
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4226);
-                            square_chunk255=square_chunk();
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4250);
+                            square_chunk256=square_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk255.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk256.getTree());
 
                             }
                             break;
@@ -11746,65 +11838,65 @@
                     }
                     break;
                 case 8 :
-                    // src/main/resources/org/drools/lang/DRL.g:1247:4: contains_key
+                    // src/main/resources/org/drools/lang/DRL.g:1249:4: contains_key
                     {
-                    pushFollow(FOLLOW_contains_key_in_simple_operator4232);
-                    contains_key256=contains_key();
+                    pushFollow(FOLLOW_contains_key_in_simple_operator4256);
+                    contains_key257=contains_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key256.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key257.getTree(), root_0);
 
                     }
                     break;
                 case 9 :
-                    // src/main/resources/org/drools/lang/DRL.g:1248:4: excludes_key
+                    // src/main/resources/org/drools/lang/DRL.g:1250:4: excludes_key
                     {
-                    pushFollow(FOLLOW_excludes_key_in_simple_operator4238);
-                    excludes_key257=excludes_key();
+                    pushFollow(FOLLOW_excludes_key_in_simple_operator4262);
+                    excludes_key258=excludes_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key257.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key258.getTree(), root_0);
 
                     }
                     break;
                 case 10 :
-                    // src/main/resources/org/drools/lang/DRL.g:1249:4: matches_key
+                    // src/main/resources/org/drools/lang/DRL.g:1251:4: matches_key
                     {
-                    pushFollow(FOLLOW_matches_key_in_simple_operator4244);
-                    matches_key258=matches_key();
+                    pushFollow(FOLLOW_matches_key_in_simple_operator4268);
+                    matches_key259=matches_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key258.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key259.getTree(), root_0);
 
                     }
                     break;
                 case 11 :
-                    // src/main/resources/org/drools/lang/DRL.g:1250:4: soundslike_key
+                    // src/main/resources/org/drools/lang/DRL.g:1252:4: soundslike_key
                     {
-                    pushFollow(FOLLOW_soundslike_key_in_simple_operator4250);
-                    soundslike_key259=soundslike_key();
+                    pushFollow(FOLLOW_soundslike_key_in_simple_operator4274);
+                    soundslike_key260=soundslike_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key259.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key260.getTree(), root_0);
 
                     }
                     break;
                 case 12 :
-                    // src/main/resources/org/drools/lang/DRL.g:1251:4: memberof_key
+                    // src/main/resources/org/drools/lang/DRL.g:1253:4: memberof_key
                     {
-                    pushFollow(FOLLOW_memberof_key_in_simple_operator4256);
-                    memberof_key260=memberof_key();
+                    pushFollow(FOLLOW_memberof_key_in_simple_operator4280);
+                    memberof_key261=memberof_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key260.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key261.getTree(), root_0);
 
                     }
                     break;
                 case 13 :
-                    // src/main/resources/org/drools/lang/DRL.g:1252:4: id3= ID
+                    // src/main/resources/org/drools/lang/DRL.g:1254:4: id3= ID
                     {
                     id3=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4264); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_simple_operator4288); if (failed) return retval;
                     if ( backtracking==0 ) {
                     id3_tree = (Object)adaptor.create(id3);
                     root_0 = (Object)adaptor.becomeRoot(id3_tree, root_0);
@@ -11816,15 +11908,15 @@
                     }
                     break;
                 case 14 :
-                    // src/main/resources/org/drools/lang/DRL.g:1253:4: ga2= GRAVE_ACCENT id4= ID square_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1255:4: ga2= GRAVE_ACCENT id4= ID square_chunk
                     {
                     ga2=(Token)input.LT(1);
-                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4274); if (failed) return retval;
+                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4298); if (failed) return retval;
                     if ( backtracking==0 ) {
                       	emit(ga2, DroolsEditorType.SYMBOL);	
                     }
                     id4=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4282); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_simple_operator4306); if (failed) return retval;
                     if ( backtracking==0 ) {
                     id4_tree = (Object)adaptor.create(id4);
                     root_0 = (Object)adaptor.becomeRoot(id4_tree, root_0);
@@ -11832,11 +11924,11 @@
                     if ( backtracking==0 ) {
                       	emit(id4, DroolsEditorType.IDENTIFIER);	
                     }
-                    pushFollow(FOLLOW_square_chunk_in_simple_operator4288);
-                    square_chunk261=square_chunk();
+                    pushFollow(FOLLOW_square_chunk_in_simple_operator4312);
+                    square_chunk262=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk261.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk262.getTree());
 
                     }
                     break;
@@ -11846,11 +11938,11 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator4295);
-            expression_value262=expression_value();
+            pushFollow(FOLLOW_expression_value_in_simple_operator4319);
+            expression_value263=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value262.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value263.getTree());
 
             }
 
@@ -11877,57 +11969,57 @@
     };
 
     // $ANTLR start compound_operator
-    // src/main/resources/org/drools/lang/DRL.g:1259:1: compound_operator : ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN ;
+    // src/main/resources/org/drools/lang/DRL.g:1261:1: compound_operator : ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN ;
     public final compound_operator_return compound_operator() throws RecognitionException {
         compound_operator_return retval = new compound_operator_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN266=null;
-        Token COMMA268=null;
-        Token RIGHT_PAREN270=null;
-        in_key_return in_key263 = null;
+        Token LEFT_PAREN267=null;
+        Token COMMA269=null;
+        Token RIGHT_PAREN271=null;
+        in_key_return in_key264 = null;
 
-        not_key_return not_key264 = null;
+        not_key_return not_key265 = null;
 
-        in_key_return in_key265 = null;
+        in_key_return in_key266 = null;
 
-        expression_value_return expression_value267 = null;
+        expression_value_return expression_value268 = null;
 
-        expression_value_return expression_value269 = null;
+        expression_value_return expression_value270 = null;
 
 
-        Object LEFT_PAREN266_tree=null;
-        Object COMMA268_tree=null;
-        Object RIGHT_PAREN270_tree=null;
+        Object LEFT_PAREN267_tree=null;
+        Object COMMA269_tree=null;
+        Object RIGHT_PAREN271_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1260:2: ( ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN )
-            // src/main/resources/org/drools/lang/DRL.g:1260:4: ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:1262:2: ( ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1262:4: ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN
             {
             root_0 = (Object)adaptor.nil();
 
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1261:2: ( in_key | not_key in_key )
-            int alt87=2;
-            int LA87_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1263:2: ( in_key | not_key in_key )
+            int alt88=2;
+            int LA88_0 = input.LA(1);
 
-            if ( (LA87_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.IN))||(validateIdentifierKey(DroolsSoftKeywords.NOT))))) {
-                int LA87_1 = input.LA(2);
+            if ( (LA88_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.IN))||(validateIdentifierKey(DroolsSoftKeywords.NOT))))) {
+                int LA88_1 = input.LA(2);
 
-                if ( (LA87_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt87=2;
+                if ( (LA88_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
+                    alt88=1;
                 }
-                else if ( (LA87_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
-                    alt87=1;
+                else if ( (LA88_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt88=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1261:2: ( in_key | not_key in_key )", 87, 1, input);
+                        new NoViableAltException("1263:2: ( in_key | not_key in_key )", 88, 1, input);
 
                     throw nvae;
                 }
@@ -11935,35 +12027,35 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1261:2: ( in_key | not_key in_key )", 87, 0, input);
+                    new NoViableAltException("1263:2: ( in_key | not_key in_key )", 88, 0, input);
 
                 throw nvae;
             }
-            switch (alt87) {
+            switch (alt88) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1261:4: in_key
+                    // src/main/resources/org/drools/lang/DRL.g:1263:4: in_key
                     {
-                    pushFollow(FOLLOW_in_key_in_compound_operator4313);
-                    in_key263=in_key();
+                    pushFollow(FOLLOW_in_key_in_compound_operator4337);
+                    in_key264=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key263.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key264.getTree(), root_0);
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1261:14: not_key in_key
+                    // src/main/resources/org/drools/lang/DRL.g:1263:14: not_key in_key
                     {
-                    pushFollow(FOLLOW_not_key_in_compound_operator4318);
-                    not_key264=not_key();
+                    pushFollow(FOLLOW_not_key_in_compound_operator4342);
+                    not_key265=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key264.getTree());
-                    pushFollow(FOLLOW_in_key_in_compound_operator4320);
-                    in_key265=in_key();
+                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key265.getTree());
+                    pushFollow(FOLLOW_in_key_in_compound_operator4344);
+                    in_key266=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key265.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key266.getTree(), root_0);
 
                     }
                     break;
@@ -11973,58 +12065,58 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
             }
-            LEFT_PAREN266=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4331); if (failed) return retval;
+            LEFT_PAREN267=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4355); if (failed) return retval;
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN266, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN267, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_expression_value_in_compound_operator4339);
-            expression_value267=expression_value();
+            pushFollow(FOLLOW_expression_value_in_compound_operator4363);
+            expression_value268=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value267.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1264:21: ( COMMA expression_value )*
-            loop88:
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value268.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1266:21: ( COMMA expression_value )*
+            loop89:
             do {
-                int alt88=2;
-                int LA88_0 = input.LA(1);
+                int alt89=2;
+                int LA89_0 = input.LA(1);
 
-                if ( (LA88_0==COMMA) ) {
-                    alt88=1;
+                if ( (LA89_0==COMMA) ) {
+                    alt89=1;
                 }
 
 
-                switch (alt88) {
+                switch (alt89) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1264:23: COMMA expression_value
+            	    // src/main/resources/org/drools/lang/DRL.g:1266:23: COMMA expression_value
             	    {
-            	    COMMA268=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4343); if (failed) return retval;
+            	    COMMA269=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4367); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA268, DroolsEditorType.SYMBOL);	
+            	      	emit(COMMA269, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator4348);
-            	    expression_value269=expression_value();
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4372);
+            	    expression_value270=expression_value();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value269.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value270.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop88;
+            	    break loop89;
                 }
             } while (true);
 
-            RIGHT_PAREN270=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4356); if (failed) return retval;
+            RIGHT_PAREN271=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4380); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_PAREN270_tree = (Object)adaptor.create(RIGHT_PAREN270);
-            adaptor.addChild(root_0, RIGHT_PAREN270_tree);
+            RIGHT_PAREN271_tree = (Object)adaptor.create(RIGHT_PAREN271);
+            adaptor.addChild(root_0, RIGHT_PAREN271_tree);
             }
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN270, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN271, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	
@@ -12061,33 +12153,33 @@
     };
 
     // $ANTLR start expression_value
-    // src/main/resources/org/drools/lang/DRL.g:1275:1: expression_value : ( accessor_path | literal_constraint | paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1277:1: expression_value : ( accessor_path | literal_constraint | paren_chunk ) ;
     public final expression_value_return expression_value() throws RecognitionException {
         expression_value_return retval = new expression_value_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        accessor_path_return accessor_path271 = null;
+        accessor_path_return accessor_path272 = null;
 
-        literal_constraint_return literal_constraint272 = null;
+        literal_constraint_return literal_constraint273 = null;
 
-        paren_chunk_return paren_chunk273 = null;
+        paren_chunk_return paren_chunk274 = null;
 
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1276:2: ( ( accessor_path | literal_constraint | paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:1276:4: ( accessor_path | literal_constraint | paren_chunk )
+            // src/main/resources/org/drools/lang/DRL.g:1278:2: ( ( accessor_path | literal_constraint | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:1278:4: ( accessor_path | literal_constraint | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            // src/main/resources/org/drools/lang/DRL.g:1276:4: ( accessor_path | literal_constraint | paren_chunk )
-            int alt89=3;
+            // src/main/resources/org/drools/lang/DRL.g:1278:4: ( accessor_path | literal_constraint | paren_chunk )
+            int alt90=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                alt89=1;
+                alt90=1;
                 }
                 break;
             case STRING:
@@ -12096,53 +12188,53 @@
             case FLOAT:
             case NULL:
                 {
-                alt89=2;
+                alt90=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt89=3;
+                alt90=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1276:4: ( accessor_path | literal_constraint | paren_chunk )", 89, 0, input);
+                    new NoViableAltException("1278:4: ( accessor_path | literal_constraint | paren_chunk )", 90, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt89) {
+            switch (alt90) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1276:5: accessor_path
+                    // src/main/resources/org/drools/lang/DRL.g:1278:5: accessor_path
                     {
-                    pushFollow(FOLLOW_accessor_path_in_expression_value4377);
-                    accessor_path271=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4401);
+                    accessor_path272=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path271.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path272.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1277:4: literal_constraint
+                    // src/main/resources/org/drools/lang/DRL.g:1279:4: literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value4382);
-                    literal_constraint272=literal_constraint();
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4406);
+                    literal_constraint273=literal_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint272.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint273.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1278:4: paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1280:4: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value4388);
-                    paren_chunk273=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4412);
+                    paren_chunk274=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk273.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk274.getTree());
 
                     }
                     break;
@@ -12188,144 +12280,144 @@
     };
 
     // $ANTLR start literal_constraint
-    // src/main/resources/org/drools/lang/DRL.g:1292:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );
+    // src/main/resources/org/drools/lang/DRL.g:1294:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );
     public final literal_constraint_return literal_constraint() throws RecognitionException {
         literal_constraint_return retval = new literal_constraint_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING274=null;
-        Token INT275=null;
-        Token FLOAT276=null;
-        Token BOOL277=null;
-        Token NULL278=null;
+        Token STRING275=null;
+        Token INT276=null;
+        Token FLOAT277=null;
+        Token BOOL278=null;
+        Token NULL279=null;
 
-        Object STRING274_tree=null;
-        Object INT275_tree=null;
-        Object FLOAT276_tree=null;
-        Object BOOL277_tree=null;
-        Object NULL278_tree=null;
+        Object STRING275_tree=null;
+        Object INT276_tree=null;
+        Object FLOAT277_tree=null;
+        Object BOOL278_tree=null;
+        Object NULL279_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1293:2: ( STRING | INT | FLOAT | BOOL | NULL )
-            int alt90=5;
+            // src/main/resources/org/drools/lang/DRL.g:1295:2: ( STRING | INT | FLOAT | BOOL | NULL )
+            int alt91=5;
             switch ( input.LA(1) ) {
             case STRING:
                 {
-                alt90=1;
+                alt91=1;
                 }
                 break;
             case INT:
                 {
-                alt90=2;
+                alt91=2;
                 }
                 break;
             case FLOAT:
                 {
-                alt90=3;
+                alt91=3;
                 }
                 break;
             case BOOL:
                 {
-                alt90=4;
+                alt91=4;
                 }
                 break;
             case NULL:
                 {
-                alt90=5;
+                alt91=5;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1292:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );", 90, 0, input);
+                    new NoViableAltException("1294:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );", 91, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt90) {
+            switch (alt91) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1293:4: STRING
+                    // src/main/resources/org/drools/lang/DRL.g:1295:4: STRING
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    STRING274=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4407); if (failed) return retval;
+                    STRING275=(Token)input.LT(1);
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4431); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    STRING274_tree = (Object)adaptor.create(STRING274);
-                    adaptor.addChild(root_0, STRING274_tree);
+                    STRING275_tree = (Object)adaptor.create(STRING275);
+                    adaptor.addChild(root_0, STRING275_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(STRING274, DroolsEditorType.STRING_CONST);	
+                      	emit(STRING275, DroolsEditorType.STRING_CONST);	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1294:4: INT
+                    // src/main/resources/org/drools/lang/DRL.g:1296:4: INT
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    INT275=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint4414); if (failed) return retval;
+                    INT276=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4438); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    INT275_tree = (Object)adaptor.create(INT275);
-                    adaptor.addChild(root_0, INT275_tree);
+                    INT276_tree = (Object)adaptor.create(INT276);
+                    adaptor.addChild(root_0, INT276_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(INT275, DroolsEditorType.NUMERIC_CONST);	
+                      	emit(INT276, DroolsEditorType.NUMERIC_CONST);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1295:4: FLOAT
+                    // src/main/resources/org/drools/lang/DRL.g:1297:4: FLOAT
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    FLOAT276=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4421); if (failed) return retval;
+                    FLOAT277=(Token)input.LT(1);
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4445); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    FLOAT276_tree = (Object)adaptor.create(FLOAT276);
-                    adaptor.addChild(root_0, FLOAT276_tree);
+                    FLOAT277_tree = (Object)adaptor.create(FLOAT277);
+                    adaptor.addChild(root_0, FLOAT277_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(FLOAT276, DroolsEditorType.NUMERIC_CONST);	
+                      	emit(FLOAT277, DroolsEditorType.NUMERIC_CONST);	
                     }
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:1296:4: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:1298:4: BOOL
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    BOOL277=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4428); if (failed) return retval;
+                    BOOL278=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4452); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL277_tree = (Object)adaptor.create(BOOL277);
-                    adaptor.addChild(root_0, BOOL277_tree);
+                    BOOL278_tree = (Object)adaptor.create(BOOL278);
+                    adaptor.addChild(root_0, BOOL278_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(BOOL277, DroolsEditorType.BOOLEAN_CONST);	
+                      	emit(BOOL278, DroolsEditorType.BOOLEAN_CONST);	
                     }
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:1297:4: NULL
+                    // src/main/resources/org/drools/lang/DRL.g:1299:4: NULL
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    NULL278=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4435); if (failed) return retval;
+                    NULL279=(Token)input.LT(1);
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4459); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    NULL278_tree = (Object)adaptor.create(NULL278);
-                    adaptor.addChild(root_0, NULL278_tree);
+                    NULL279_tree = (Object)adaptor.create(NULL279);
+                    adaptor.addChild(root_0, NULL279_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(NULL278, DroolsEditorType.NULL_CONST);	
+                      	emit(NULL279, DroolsEditorType.NULL_CONST);	
                     }
 
                     }
@@ -12355,7 +12447,7 @@
     };
 
     // $ANTLR start pattern_type
-    // src/main/resources/org/drools/lang/DRL.g:1300:1: pattern_type : id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1302:1: pattern_type : id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) ;
     public final pattern_type_return pattern_type() throws RecognitionException {
         pattern_type_return retval = new pattern_type_return();
         retval.start = input.LT(1);
@@ -12364,7 +12456,7 @@
 
         Token id=null;
         List list_id=null;
-        dimension_definition_return dimension_definition279 = null;
+        dimension_definition_return dimension_definition280 = null;
 
 
         Object id_tree=null;
@@ -12372,40 +12464,40 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_dimension_definition=new RewriteRuleSubtreeStream(adaptor,"rule dimension_definition");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1301:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) )
-            // src/main/resources/org/drools/lang/DRL.g:1301:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
+            // src/main/resources/org/drools/lang/DRL.g:1303:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1303:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_pattern_type4450); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_pattern_type4474); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // src/main/resources/org/drools/lang/DRL.g:1301:11: (id+= DOT id+= ID )*
-            loop91:
+            // src/main/resources/org/drools/lang/DRL.g:1303:11: (id+= DOT id+= ID )*
+            loop92:
             do {
-                int alt91=2;
-                int LA91_0 = input.LA(1);
+                int alt92=2;
+                int LA92_0 = input.LA(1);
 
-                if ( (LA91_0==DOT) ) {
-                    alt91=1;
+                if ( (LA92_0==DOT) ) {
+                    alt92=1;
                 }
 
 
-                switch (alt91) {
+                switch (alt92) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1301:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:1303:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_pattern_type4456); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_pattern_type4480); if (failed) return retval;
             	    if ( backtracking==0 ) stream_DOT.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
             	    list_id.add(id);
 
             	    id=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_pattern_type4460); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_pattern_type4484); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -12416,7 +12508,7 @@
             	    break;
 
             	default :
-            	    break loop91;
+            	    break loop92;
                 }
             } while (true);
 
@@ -12424,38 +12516,38 @@
               	emit(list_id, DroolsEditorType.IDENTIFIER);
               		setParaphrasesValue(DroolsParaphraseTypes.PATTERN, buildStringFromTokens(list_id));	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1304:6: ( dimension_definition )*
-            loop92:
+            // src/main/resources/org/drools/lang/DRL.g:1306:6: ( dimension_definition )*
+            loop93:
             do {
-                int alt92=2;
-                int LA92_0 = input.LA(1);
+                int alt93=2;
+                int LA93_0 = input.LA(1);
 
-                if ( (LA92_0==LEFT_SQUARE) ) {
-                    alt92=1;
+                if ( (LA93_0==LEFT_SQUARE) ) {
+                    alt93=1;
                 }
 
 
-                switch (alt92) {
+                switch (alt93) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1304:6: dimension_definition
+            	    // src/main/resources/org/drools/lang/DRL.g:1306:6: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type4475);
-            	    dimension_definition279=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type4499);
+            	    dimension_definition280=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition279.getTree());
+            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition280.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop92;
+            	    break loop93;
                 }
             } while (true);
 
 
             // AST REWRITE
-            // elements: dimension_definition, ID
+            // elements: ID, dimension_definition
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -12465,9 +12557,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1305:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+            // 1307:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1305:6: ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+                // src/main/resources/org/drools/lang/DRL.g:1307:6: ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN_TYPE, "VT_PATTERN_TYPE"), root_1);
@@ -12480,7 +12572,7 @@
 
                 }
                 stream_ID.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1305:28: ( dimension_definition )*
+                // src/main/resources/org/drools/lang/DRL.g:1307:28: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -12519,7 +12611,7 @@
     };
 
     // $ANTLR start data_type
-    // src/main/resources/org/drools/lang/DRL.g:1308:1: data_type : id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1310:1: data_type : id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) ;
     public final data_type_return data_type() throws RecognitionException {
         data_type_return retval = new data_type_return();
         retval.start = input.LT(1);
@@ -12528,7 +12620,7 @@
 
         Token id=null;
         List list_id=null;
-        dimension_definition_return dimension_definition280 = null;
+        dimension_definition_return dimension_definition281 = null;
 
 
         Object id_tree=null;
@@ -12536,40 +12628,40 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_dimension_definition=new RewriteRuleSubtreeStream(adaptor,"rule dimension_definition");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1309:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) )
-            // src/main/resources/org/drools/lang/DRL.g:1309:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
+            // src/main/resources/org/drools/lang/DRL.g:1311:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1311:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_data_type4503); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_data_type4527); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // src/main/resources/org/drools/lang/DRL.g:1309:11: (id+= DOT id+= ID )*
-            loop93:
+            // src/main/resources/org/drools/lang/DRL.g:1311:11: (id+= DOT id+= ID )*
+            loop94:
             do {
-                int alt93=2;
-                int LA93_0 = input.LA(1);
+                int alt94=2;
+                int LA94_0 = input.LA(1);
 
-                if ( (LA93_0==DOT) ) {
-                    alt93=1;
+                if ( (LA94_0==DOT) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt94) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1309:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:1311:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_data_type4509); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_data_type4533); if (failed) return retval;
             	    if ( backtracking==0 ) stream_DOT.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
             	    list_id.add(id);
 
             	    id=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_data_type4513); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_data_type4537); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -12580,36 +12672,36 @@
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop94;
                 }
             } while (true);
 
-            // src/main/resources/org/drools/lang/DRL.g:1309:31: ( dimension_definition )*
-            loop94:
+            // src/main/resources/org/drools/lang/DRL.g:1311:31: ( dimension_definition )*
+            loop95:
             do {
-                int alt94=2;
-                int LA94_0 = input.LA(1);
+                int alt95=2;
+                int LA95_0 = input.LA(1);
 
-                if ( (LA94_0==LEFT_SQUARE) ) {
-                    alt94=1;
+                if ( (LA95_0==LEFT_SQUARE) ) {
+                    alt95=1;
                 }
 
 
-                switch (alt94) {
+                switch (alt95) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1309:31: dimension_definition
+            	    // src/main/resources/org/drools/lang/DRL.g:1311:31: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_data_type4518);
-            	    dimension_definition280=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_data_type4542);
+            	    dimension_definition281=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition280.getTree());
+            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition281.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop94;
+            	    break loop95;
                 }
             } while (true);
 
@@ -12628,9 +12720,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1311:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+            // 1313:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1311:6: ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+                // src/main/resources/org/drools/lang/DRL.g:1313:6: ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_DATA_TYPE, "VT_DATA_TYPE"), root_1);
@@ -12643,7 +12735,7 @@
 
                 }
                 stream_ID.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1311:25: ( dimension_definition )*
+                // src/main/resources/org/drools/lang/DRL.g:1313:25: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -12682,42 +12774,42 @@
     };
 
     // $ANTLR start dimension_definition
-    // src/main/resources/org/drools/lang/DRL.g:1314:1: dimension_definition : LEFT_SQUARE RIGHT_SQUARE ;
+    // src/main/resources/org/drools/lang/DRL.g:1316:1: dimension_definition : LEFT_SQUARE RIGHT_SQUARE ;
     public final dimension_definition_return dimension_definition() throws RecognitionException {
         dimension_definition_return retval = new dimension_definition_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token LEFT_SQUARE281=null;
-        Token RIGHT_SQUARE282=null;
+        Token LEFT_SQUARE282=null;
+        Token RIGHT_SQUARE283=null;
 
-        Object LEFT_SQUARE281_tree=null;
-        Object RIGHT_SQUARE282_tree=null;
+        Object LEFT_SQUARE282_tree=null;
+        Object RIGHT_SQUARE283_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1315:2: ( LEFT_SQUARE RIGHT_SQUARE )
-            // src/main/resources/org/drools/lang/DRL.g:1315:4: LEFT_SQUARE RIGHT_SQUARE
+            // src/main/resources/org/drools/lang/DRL.g:1317:2: ( LEFT_SQUARE RIGHT_SQUARE )
+            // src/main/resources/org/drools/lang/DRL.g:1317:4: LEFT_SQUARE RIGHT_SQUARE
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_SQUARE281=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition4547); if (failed) return retval;
+            LEFT_SQUARE282=(Token)input.LT(1);
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition4571); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_SQUARE281_tree = (Object)adaptor.create(LEFT_SQUARE281);
-            adaptor.addChild(root_0, LEFT_SQUARE281_tree);
+            LEFT_SQUARE282_tree = (Object)adaptor.create(LEFT_SQUARE282);
+            adaptor.addChild(root_0, LEFT_SQUARE282_tree);
             }
             if ( backtracking==0 ) {
-              	emit(LEFT_SQUARE281, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_SQUARE282, DroolsEditorType.SYMBOL);	
             }
-            RIGHT_SQUARE282=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition4554); if (failed) return retval;
+            RIGHT_SQUARE283=(Token)input.LT(1);
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition4578); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_SQUARE282_tree = (Object)adaptor.create(RIGHT_SQUARE282);
-            adaptor.addChild(root_0, RIGHT_SQUARE282_tree);
+            RIGHT_SQUARE283_tree = (Object)adaptor.create(RIGHT_SQUARE283);
+            adaptor.addChild(root_0, RIGHT_SQUARE283_tree);
             }
             if ( backtracking==0 ) {
-              	emit(RIGHT_SQUARE282, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_SQUARE283, DroolsEditorType.SYMBOL);	
             }
 
             }
@@ -12745,64 +12837,64 @@
     };
 
     // $ANTLR start accessor_path
-    // src/main/resources/org/drools/lang/DRL.g:1319:1: accessor_path : accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1321:1: accessor_path : accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) ;
     public final accessor_path_return accessor_path() throws RecognitionException {
         accessor_path_return retval = new accessor_path_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token DOT284=null;
-        accessor_element_return accessor_element283 = null;
+        Token DOT285=null;
+        accessor_element_return accessor_element284 = null;
 
-        accessor_element_return accessor_element285 = null;
+        accessor_element_return accessor_element286 = null;
 
 
-        Object DOT284_tree=null;
+        Object DOT285_tree=null;
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_accessor_element=new RewriteRuleSubtreeStream(adaptor,"rule accessor_element");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1320:2: ( accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) )
-            // src/main/resources/org/drools/lang/DRL.g:1320:4: accessor_element ( DOT accessor_element )*
+            // src/main/resources/org/drools/lang/DRL.g:1322:2: ( accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) )
+            // src/main/resources/org/drools/lang/DRL.g:1322:4: accessor_element ( DOT accessor_element )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path4568);
-            accessor_element283=accessor_element();
+            pushFollow(FOLLOW_accessor_element_in_accessor_path4592);
+            accessor_element284=accessor_element();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_accessor_element.add(accessor_element283.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1320:21: ( DOT accessor_element )*
-            loop95:
+            if ( backtracking==0 ) stream_accessor_element.add(accessor_element284.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1322:21: ( DOT accessor_element )*
+            loop96:
             do {
-                int alt95=2;
-                int LA95_0 = input.LA(1);
+                int alt96=2;
+                int LA96_0 = input.LA(1);
 
-                if ( (LA95_0==DOT) ) {
-                    alt95=1;
+                if ( (LA96_0==DOT) ) {
+                    alt96=1;
                 }
 
 
-                switch (alt95) {
+                switch (alt96) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1320:23: DOT accessor_element
+            	    // src/main/resources/org/drools/lang/DRL.g:1322:23: DOT accessor_element
             	    {
-            	    DOT284=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4572); if (failed) return retval;
-            	    if ( backtracking==0 ) stream_DOT.add(DOT284);
+            	    DOT285=(Token)input.LT(1);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4596); if (failed) return retval;
+            	    if ( backtracking==0 ) stream_DOT.add(DOT285);
 
             	    if ( backtracking==0 ) {
-            	      	emit(DOT284, DroolsEditorType.IDENTIFIER);	
+            	      	emit(DOT285, DroolsEditorType.IDENTIFIER);	
             	    }
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4576);
-            	    accessor_element285=accessor_element();
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4600);
+            	    accessor_element286=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element285.getTree());
+            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element286.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop95;
+            	    break loop96;
                 }
             } while (true);
 
@@ -12818,9 +12910,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1321:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+            // 1323:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1321:5: ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+                // src/main/resources/org/drools/lang/DRL.g:1323:5: ^( VT_ACCESSOR_PATH ( accessor_element )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_ACCESSOR_PATH, "VT_ACCESSOR_PATH"), root_1);
@@ -12866,63 +12958,63 @@
     };
 
     // $ANTLR start accessor_element
-    // src/main/resources/org/drools/lang/DRL.g:1324:1: accessor_element : ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1326:1: accessor_element : ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) ;
     public final accessor_element_return accessor_element() throws RecognitionException {
         accessor_element_return retval = new accessor_element_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token ID286=null;
-        square_chunk_return square_chunk287 = null;
+        Token ID287=null;
+        square_chunk_return square_chunk288 = null;
 
 
-        Object ID286_tree=null;
+        Object ID287_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_square_chunk=new RewriteRuleSubtreeStream(adaptor,"rule square_chunk");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1325:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
-            // src/main/resources/org/drools/lang/DRL.g:1325:4: ID ( square_chunk )*
+            // src/main/resources/org/drools/lang/DRL.g:1327:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1327:4: ID ( square_chunk )*
             {
-            ID286=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accessor_element4600); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID286);
+            ID287=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accessor_element4624); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID287);
 
             if ( backtracking==0 ) {
-              	emit(ID286, DroolsEditorType.IDENTIFIER);	
+              	emit(ID287, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1326:3: ( square_chunk )*
-            loop96:
+            // src/main/resources/org/drools/lang/DRL.g:1328:3: ( square_chunk )*
+            loop97:
             do {
-                int alt96=2;
-                int LA96_0 = input.LA(1);
+                int alt97=2;
+                int LA97_0 = input.LA(1);
 
-                if ( (LA96_0==LEFT_SQUARE) ) {
-                    alt96=1;
+                if ( (LA97_0==LEFT_SQUARE) ) {
+                    alt97=1;
                 }
 
 
-                switch (alt96) {
+                switch (alt97) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1326:3: square_chunk
+            	    // src/main/resources/org/drools/lang/DRL.g:1328:3: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4606);
-            	    square_chunk287=square_chunk();
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4630);
+            	    square_chunk288=square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk287.getTree());
+            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk288.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop97;
                 }
             } while (true);
 
 
             // AST REWRITE
-            // elements: ID, square_chunk
+            // elements: square_chunk, ID
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -12932,15 +13024,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1327:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+            // 1329:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1327:5: ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+                // src/main/resources/org/drools/lang/DRL.g:1329:5: ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_ACCESSOR_ELEMENT, "VT_ACCESSOR_ELEMENT"), root_1);
 
                 adaptor.addChild(root_1, stream_ID.next());
-                // src/main/resources/org/drools/lang/DRL.g:1327:30: ( square_chunk )*
+                // src/main/resources/org/drools/lang/DRL.g:1329:30: ( square_chunk )*
                 while ( stream_square_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_square_chunk.next());
 
@@ -12979,7 +13071,7 @@
     };
 
     // $ANTLR start rhs_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1330:1: rhs_chunk : rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1332:1: rhs_chunk : rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] ;
     public final rhs_chunk_return rhs_chunk() throws RecognitionException {
         rhs_chunk_return retval = new rhs_chunk_return();
         retval.start = input.LT(1);
@@ -12990,14 +13082,14 @@
 
 
         RewriteRuleSubtreeStream stream_rhs_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk_data");
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1333:3: (rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] )
-            // src/main/resources/org/drools/lang/DRL.g:1333:5: rc= rhs_chunk_data
+            // src/main/resources/org/drools/lang/DRL.g:1335:3: (rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1335:5: rc= rhs_chunk_data
             {
-            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk4635);
+            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk4659);
             rc=rhs_chunk_data();
             _fsp--;
             if (failed) return retval;
@@ -13017,7 +13109,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1334:2: -> VT_RHS_CHUNK[$rc.start,text]
+            // 1336:2: -> VT_RHS_CHUNK[$rc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_RHS_CHUNK, ((Token)rc.start), text));
 
@@ -13050,7 +13142,7 @@
     };
 
     // $ANTLR start rhs_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:1337:1: rhs_chunk_data : THEN (any=~ END )* end1= END ( SEMICOLON )? ;
+    // src/main/resources/org/drools/lang/DRL.g:1339:1: rhs_chunk_data : THEN (any=~ END )* end1= END ( SEMICOLON )? ;
     public final rhs_chunk_data_return rhs_chunk_data() throws RecognitionException {
         rhs_chunk_data_return retval = new rhs_chunk_data_return();
         retval.start = input.LT(1);
@@ -13059,46 +13151,46 @@
 
         Token any=null;
         Token end1=null;
-        Token THEN288=null;
-        Token SEMICOLON289=null;
+        Token THEN289=null;
+        Token SEMICOLON290=null;
 
         Object any_tree=null;
         Object end1_tree=null;
-        Object THEN288_tree=null;
-        Object SEMICOLON289_tree=null;
+        Object THEN289_tree=null;
+        Object SEMICOLON290_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1338:2: ( THEN (any=~ END )* end1= END ( SEMICOLON )? )
-            // src/main/resources/org/drools/lang/DRL.g:1338:4: THEN (any=~ END )* end1= END ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:1340:2: ( THEN (any=~ END )* end1= END ( SEMICOLON )? )
+            // src/main/resources/org/drools/lang/DRL.g:1340:4: THEN (any=~ END )* end1= END ( SEMICOLON )?
             {
             root_0 = (Object)adaptor.nil();
 
-            THEN288=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data4654); if (failed) return retval;
+            THEN289=(Token)input.LT(1);
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data4678); if (failed) return retval;
             if ( backtracking==0 ) {
-            THEN288_tree = (Object)adaptor.create(THEN288);
-            adaptor.addChild(root_0, THEN288_tree);
+            THEN289_tree = (Object)adaptor.create(THEN289);
+            adaptor.addChild(root_0, THEN289_tree);
             }
             if ( backtracking==0 ) {
-              	if (THEN288.getText().equalsIgnoreCase("then")){
-              			emit(THEN288, DroolsEditorType.KEYWORD);
+              	if (THEN289.getText().equalsIgnoreCase("then")){
+              			emit(THEN289, DroolsEditorType.KEYWORD);
               			emit(Location.LOCATION_RHS);
               		}	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1343:4: (any=~ END )*
-            loop97:
+            // src/main/resources/org/drools/lang/DRL.g:1345:4: (any=~ END )*
+            loop98:
             do {
-                int alt97=2;
-                int LA97_0 = input.LA(1);
+                int alt98=2;
+                int LA98_0 = input.LA(1);
 
-                if ( ((LA97_0>=VT_COMPILATION_UNIT && LA97_0<=DOT_STAR)||(LA97_0>=STRING && LA97_0<=MULTI_LINE_COMMENT)) ) {
-                    alt97=1;
+                if ( ((LA98_0>=VT_COMPILATION_UNIT && LA98_0<=DOT_STAR)||(LA98_0>=STRING && LA98_0<=MULTI_LINE_COMMENT)) ) {
+                    alt98=1;
                 }
 
 
-                switch (alt97) {
+                switch (alt98) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1343:6: any=~ END
+            	    // src/main/resources/org/drools/lang/DRL.g:1345:6: any=~ END
             	    {
             	    any=(Token)input.LT(1);
             	    if ( (input.LA(1)>=VT_COMPILATION_UNIT && input.LA(1)<=DOT_STAR)||(input.LA(1)>=STRING && input.LA(1)<=MULTI_LINE_COMMENT) ) {
@@ -13110,7 +13202,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data4667);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data4691);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13121,12 +13213,12 @@
             	    break;
 
             	default :
-            	    break loop97;
+            	    break loop98;
                 }
             } while (true);
 
             end1=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk_data4680); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_rhs_chunk_data4704); if (failed) return retval;
             if ( backtracking==0 ) {
             end1_tree = (Object)adaptor.create(end1);
             adaptor.addChild(root_0, end1_tree);
@@ -13134,22 +13226,22 @@
             if ( backtracking==0 ) {
               	emit(end1, DroolsEditorType.KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1345:3: ( SEMICOLON )?
-            int alt98=2;
-            int LA98_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1347:3: ( SEMICOLON )?
+            int alt99=2;
+            int LA99_0 = input.LA(1);
 
-            if ( (LA98_0==SEMICOLON) ) {
-                alt98=1;
+            if ( (LA99_0==SEMICOLON) ) {
+                alt99=1;
             }
-            switch (alt98) {
+            switch (alt99) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1345:3: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:1347:3: SEMICOLON
                     {
-                    SEMICOLON289=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data4686); if (failed) return retval;
+                    SEMICOLON290=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data4710); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    SEMICOLON289_tree = (Object)adaptor.create(SEMICOLON289);
-                    adaptor.addChild(root_0, SEMICOLON289_tree);
+                    SEMICOLON290_tree = (Object)adaptor.create(SEMICOLON290);
+                    adaptor.addChild(root_0, SEMICOLON290_tree);
                     }
 
                     }
@@ -13158,7 +13250,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(SEMICOLON289, DroolsEditorType.KEYWORD);	
+              	emit(SEMICOLON290, DroolsEditorType.KEYWORD);	
             }
 
             }
@@ -13186,7 +13278,7 @@
     };
 
     // $ANTLR start curly_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1348:1: curly_chunk : cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1350:1: curly_chunk : cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] ;
     public final curly_chunk_return curly_chunk() throws RecognitionException {
         curly_chunk_return retval = new curly_chunk_return();
         retval.start = input.LT(1);
@@ -13197,14 +13289,14 @@
 
 
         RewriteRuleSubtreeStream stream_curly_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule curly_chunk_data");
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1351:3: (cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] )
-            // src/main/resources/org/drools/lang/DRL.g:1351:5: cc= curly_chunk_data[false]
+            // src/main/resources/org/drools/lang/DRL.g:1353:3: (cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1353:5: cc= curly_chunk_data[false]
             {
-            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk4705);
+            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk4729);
             cc=curly_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13224,7 +13316,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1352:2: -> VT_CURLY_CHUNK[$cc.start,text]
+            // 1354:2: -> VT_CURLY_CHUNK[$cc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_CURLY_CHUNK, ((Token)cc.start), text));
 
@@ -13257,7 +13349,7 @@
     };
 
     // $ANTLR start curly_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:1355:1: curly_chunk_data[boolean isRecursive] : lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY ;
+    // src/main/resources/org/drools/lang/DRL.g:1357:1: curly_chunk_data[boolean isRecursive] : lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY ;
     public final curly_chunk_data_return curly_chunk_data(boolean isRecursive) throws RecognitionException {
         curly_chunk_data_return retval = new curly_chunk_data_return();
         retval.start = input.LT(1);
@@ -13267,7 +13359,7 @@
         Token lc1=null;
         Token any=null;
         Token rc1=null;
-        curly_chunk_data_return curly_chunk_data290 = null;
+        curly_chunk_data_return curly_chunk_data291 = null;
 
 
         Object lc1_tree=null;
@@ -13275,13 +13367,13 @@
         Object rc1_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1356:2: (lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY )
-            // src/main/resources/org/drools/lang/DRL.g:1356:4: lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY
+            // src/main/resources/org/drools/lang/DRL.g:1358:2: (lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY )
+            // src/main/resources/org/drools/lang/DRL.g:1358:4: lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY
             {
             root_0 = (Object)adaptor.nil();
 
             lc1=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk_data4728); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk_data4752); if (failed) return retval;
             if ( backtracking==0 ) {
             lc1_tree = (Object)adaptor.create(lc1);
             adaptor.addChild(root_0, lc1_tree);
@@ -13294,23 +13386,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1363:4: (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )*
-            loop99:
+            // src/main/resources/org/drools/lang/DRL.g:1365:4: (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )*
+            loop100:
             do {
-                int alt99=3;
-                int LA99_0 = input.LA(1);
+                int alt100=3;
+                int LA100_0 = input.LA(1);
 
-                if ( ((LA99_0>=VT_COMPILATION_UNIT && LA99_0<=THEN)||(LA99_0>=MISC && LA99_0<=MULTI_LINE_COMMENT)) ) {
-                    alt99=1;
+                if ( ((LA100_0>=VT_COMPILATION_UNIT && LA100_0<=THEN)||(LA100_0>=MISC && LA100_0<=MULTI_LINE_COMMENT)) ) {
+                    alt100=1;
                 }
-                else if ( (LA99_0==LEFT_CURLY) ) {
-                    alt99=2;
+                else if ( (LA100_0==LEFT_CURLY) ) {
+                    alt100=2;
                 }
 
 
-                switch (alt99) {
+                switch (alt100) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1363:5: any=~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // src/main/resources/org/drools/lang/DRL.g:1365:5: any=~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
             	    any=(Token)input.LT(1);
             	    if ( (input.LA(1)>=VT_COMPILATION_UNIT && input.LA(1)<=THEN)||(input.LA(1)>=MISC && input.LA(1)<=MULTI_LINE_COMMENT) ) {
@@ -13322,7 +13414,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data4740);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data4764);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13332,24 +13424,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1363:87: curly_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1365:87: curly_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data4756);
-            	    curly_chunk_data290=curly_chunk_data(true);
+            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data4780);
+            	    curly_chunk_data291=curly_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data290.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data291.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop99;
+            	    break loop100;
                 }
             } while (true);
 
             rc1=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data4767); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data4791); if (failed) return retval;
             if ( backtracking==0 ) {
             rc1_tree = (Object)adaptor.create(rc1);
             adaptor.addChild(root_0, rc1_tree);
@@ -13388,7 +13480,7 @@
     };
 
     // $ANTLR start paren_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1373:1: paren_chunk : pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1375:1: paren_chunk : pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] ;
     public final paren_chunk_return paren_chunk() throws RecognitionException {
         paren_chunk_return retval = new paren_chunk_return();
         retval.start = input.LT(1);
@@ -13399,14 +13491,14 @@
 
 
         RewriteRuleSubtreeStream stream_paren_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk_data");
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1376:3: (pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] )
-            // src/main/resources/org/drools/lang/DRL.g:1376:5: pc= paren_chunk_data[false]
+            // src/main/resources/org/drools/lang/DRL.g:1378:3: (pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1378:5: pc= paren_chunk_data[false]
             {
-            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk4788);
+            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk4812);
             pc=paren_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13426,7 +13518,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1377:2: -> VT_PAREN_CHUNK[$pc.start,text]
+            // 1379:2: -> VT_PAREN_CHUNK[$pc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_PAREN_CHUNK, ((Token)pc.start), text));
 
@@ -13459,7 +13551,7 @@
     };
 
     // $ANTLR start paren_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:1380:1: paren_chunk_data[boolean isRecursive] : lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN ;
+    // src/main/resources/org/drools/lang/DRL.g:1382:1: paren_chunk_data[boolean isRecursive] : lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN ;
     public final paren_chunk_data_return paren_chunk_data(boolean isRecursive) throws RecognitionException {
         paren_chunk_data_return retval = new paren_chunk_data_return();
         retval.start = input.LT(1);
@@ -13469,7 +13561,7 @@
         Token lp1=null;
         Token any=null;
         Token rp1=null;
-        paren_chunk_data_return paren_chunk_data291 = null;
+        paren_chunk_data_return paren_chunk_data292 = null;
 
 
         Object lp1_tree=null;
@@ -13477,13 +13569,13 @@
         Object rp1_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1381:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN )
-            // src/main/resources/org/drools/lang/DRL.g:1381:4: lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:1383:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1383:4: lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN
             {
             root_0 = (Object)adaptor.nil();
 
             lp1=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk_data4812); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk_data4836); if (failed) return retval;
             if ( backtracking==0 ) {
             lp1_tree = (Object)adaptor.create(lp1);
             adaptor.addChild(root_0, lp1_tree);
@@ -13496,23 +13588,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1388:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )*
-            loop100:
+            // src/main/resources/org/drools/lang/DRL.g:1390:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )*
+            loop101:
             do {
-                int alt100=3;
-                int LA100_0 = input.LA(1);
+                int alt101=3;
+                int LA101_0 = input.LA(1);
 
-                if ( ((LA100_0>=VT_COMPILATION_UNIT && LA100_0<=STRING)||LA100_0==COMMA||(LA100_0>=AT && LA100_0<=MULTI_LINE_COMMENT)) ) {
-                    alt100=1;
+                if ( ((LA101_0>=VT_COMPILATION_UNIT && LA101_0<=STRING)||LA101_0==COMMA||(LA101_0>=AT && LA101_0<=MULTI_LINE_COMMENT)) ) {
+                    alt101=1;
                 }
-                else if ( (LA100_0==LEFT_PAREN) ) {
-                    alt100=2;
+                else if ( (LA101_0==LEFT_PAREN) ) {
+                    alt101=2;
                 }
 
 
-                switch (alt100) {
+                switch (alt101) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1388:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // src/main/resources/org/drools/lang/DRL.g:1390:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
             	    any=(Token)input.LT(1);
             	    if ( (input.LA(1)>=VT_COMPILATION_UNIT && input.LA(1)<=STRING)||input.LA(1)==COMMA||(input.LA(1)>=AT && input.LA(1)<=MULTI_LINE_COMMENT) ) {
@@ -13524,7 +13616,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data4824);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data4848);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13534,24 +13626,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1388:87: paren_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1390:87: paren_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data4840);
-            	    paren_chunk_data291=paren_chunk_data(true);
+            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data4864);
+            	    paren_chunk_data292=paren_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data291.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data292.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop101;
                 }
             } while (true);
 
             rp1=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data4851); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data4875); if (failed) return retval;
             if ( backtracking==0 ) {
             rp1_tree = (Object)adaptor.create(rp1);
             adaptor.addChild(root_0, rp1_tree);
@@ -13590,7 +13682,7 @@
     };
 
     // $ANTLR start square_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1398:1: square_chunk : sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1400:1: square_chunk : sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] ;
     public final square_chunk_return square_chunk() throws RecognitionException {
         square_chunk_return retval = new square_chunk_return();
         retval.start = input.LT(1);
@@ -13601,14 +13693,14 @@
 
 
         RewriteRuleSubtreeStream stream_square_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule square_chunk_data");
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1401:3: (sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] )
-            // src/main/resources/org/drools/lang/DRL.g:1401:5: sc= square_chunk_data[false]
+            // src/main/resources/org/drools/lang/DRL.g:1403:3: (sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1403:5: sc= square_chunk_data[false]
             {
-            pushFollow(FOLLOW_square_chunk_data_in_square_chunk4872);
+            pushFollow(FOLLOW_square_chunk_data_in_square_chunk4896);
             sc=square_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13628,7 +13720,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1402:2: -> VT_SQUARE_CHUNK[$sc.start,text]
+            // 1404:2: -> VT_SQUARE_CHUNK[$sc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_SQUARE_CHUNK, ((Token)sc.start), text));
 
@@ -13661,7 +13753,7 @@
     };
 
     // $ANTLR start square_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:1405:1: square_chunk_data[boolean isRecursive] : ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE ;
+    // src/main/resources/org/drools/lang/DRL.g:1407:1: square_chunk_data[boolean isRecursive] : ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE ;
     public final square_chunk_data_return square_chunk_data(boolean isRecursive) throws RecognitionException {
         square_chunk_data_return retval = new square_chunk_data_return();
         retval.start = input.LT(1);
@@ -13671,7 +13763,7 @@
         Token ls1=null;
         Token any=null;
         Token rs1=null;
-        square_chunk_data_return square_chunk_data292 = null;
+        square_chunk_data_return square_chunk_data293 = null;
 
 
         Object ls1_tree=null;
@@ -13679,13 +13771,13 @@
         Object rs1_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1406:2: (ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE )
-            // src/main/resources/org/drools/lang/DRL.g:1406:4: ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE
+            // src/main/resources/org/drools/lang/DRL.g:1408:2: (ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE )
+            // src/main/resources/org/drools/lang/DRL.g:1408:4: ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE
             {
             root_0 = (Object)adaptor.nil();
 
             ls1=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk_data4895); if (failed) return retval;
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk_data4919); if (failed) return retval;
             if ( backtracking==0 ) {
             ls1_tree = (Object)adaptor.create(ls1);
             adaptor.addChild(root_0, ls1_tree);
@@ -13698,23 +13790,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1413:4: (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )*
-            loop101:
+            // src/main/resources/org/drools/lang/DRL.g:1415:4: (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )*
+            loop102:
             do {
-                int alt101=3;
-                int LA101_0 = input.LA(1);
+                int alt102=3;
+                int LA102_0 = input.LA(1);
 
-                if ( ((LA101_0>=VT_COMPILATION_UNIT && LA101_0<=NULL)||(LA101_0>=THEN && LA101_0<=MULTI_LINE_COMMENT)) ) {
-                    alt101=1;
+                if ( ((LA102_0>=VT_COMPILATION_UNIT && LA102_0<=NULL)||(LA102_0>=THEN && LA102_0<=MULTI_LINE_COMMENT)) ) {
+                    alt102=1;
                 }
-                else if ( (LA101_0==LEFT_SQUARE) ) {
-                    alt101=2;
+                else if ( (LA102_0==LEFT_SQUARE) ) {
+                    alt102=2;
                 }
 
 
-                switch (alt101) {
+                switch (alt102) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1413:5: any=~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // src/main/resources/org/drools/lang/DRL.g:1415:5: any=~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
             	    any=(Token)input.LT(1);
             	    if ( (input.LA(1)>=VT_COMPILATION_UNIT && input.LA(1)<=NULL)||(input.LA(1)>=THEN && input.LA(1)<=MULTI_LINE_COMMENT) ) {
@@ -13726,7 +13818,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4907);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4931);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13736,24 +13828,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1413:88: square_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1415:88: square_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4922);
-            	    square_chunk_data292=square_chunk_data(true);
+            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4946);
+            	    square_chunk_data293=square_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data292.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data293.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop101;
+            	    break loop102;
                 }
             } while (true);
 
             rs1=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4933); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4957); if (failed) return retval;
             if ( backtracking==0 ) {
             rs1_tree = (Object)adaptor.create(rs1);
             adaptor.addChild(root_0, rs1_tree);
@@ -13792,7 +13884,7 @@
     };
 
     // $ANTLR start lock_on_active_key
-    // src/main/resources/org/drools/lang/DRL.g:1423:1: lock_on_active_key : {...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID -> VK_LOCK_ON_ACTIVE[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1425:1: lock_on_active_key : {...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID -> VK_LOCK_ON_ACTIVE[$start, text] ;
     public final lock_on_active_key_return lock_on_active_key() throws RecognitionException {
         lock_on_active_key_return retval = new lock_on_active_key_return();
         retval.start = input.LT(1);
@@ -13810,38 +13902,38 @@
         Object id2_tree=null;
         Object mis2_tree=null;
         Object id3_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1426:3: ({...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID -> VK_LOCK_ON_ACTIVE[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1426:5: {...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID
+            // src/main/resources/org/drools/lang/DRL.g:1428:3: ({...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID -> VK_LOCK_ON_ACTIVE[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1428:5: {...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "lock_on_active_key", "(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, \"-\") && validateLT(5, DroolsSoftKeywords.ACTIVE))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4957); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4981); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4961); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4985); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4965); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4989); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             mis2=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4969); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4993); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis2);
 
             id3=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4973); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4997); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id3);
 
             if ( backtracking==0 ) {
@@ -13866,7 +13958,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1432:3: -> VK_LOCK_ON_ACTIVE[$start, text]
+            // 1434:3: -> VK_LOCK_ON_ACTIVE[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_LOCK_ON_ACTIVE, ((Token)retval.start),  text));
 
@@ -13899,7 +13991,7 @@
     };
 
     // $ANTLR start date_effective_key
-    // src/main/resources/org/drools/lang/DRL.g:1435:1: date_effective_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1437:1: date_effective_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] ;
     public final date_effective_key_return date_effective_key() throws RecognitionException {
         date_effective_key_return retval = new date_effective_key_return();
         retval.start = input.LT(1);
@@ -13913,30 +14005,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1438:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1438:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1440:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1440:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "date_effective_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_effective_key5005); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_effective_key5029); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_effective_key5009); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_date_effective_key5033); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_effective_key5013); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_effective_key5037); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -13959,7 +14051,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1442:3: -> VK_DATE_EFFECTIVE[$start, text]
+            // 1444:3: -> VK_DATE_EFFECTIVE[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DATE_EFFECTIVE, ((Token)retval.start),  text));
 
@@ -13992,7 +14084,7 @@
     };
 
     // $ANTLR start date_expires_key
-    // src/main/resources/org/drools/lang/DRL.g:1445:1: date_expires_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1447:1: date_expires_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] ;
     public final date_expires_key_return date_expires_key() throws RecognitionException {
         date_expires_key_return retval = new date_expires_key_return();
         retval.start = input.LT(1);
@@ -14006,30 +14098,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1448:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1448:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1450:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1450:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "date_expires_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EXPIRES))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_expires_key5045); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_expires_key5069); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_expires_key5049); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_date_expires_key5073); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_expires_key5053); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_expires_key5077); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14052,7 +14144,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1452:3: -> VK_DATE_EXPIRES[$start, text]
+            // 1454:3: -> VK_DATE_EXPIRES[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DATE_EXPIRES, ((Token)retval.start),  text));
 
@@ -14085,7 +14177,7 @@
     };
 
     // $ANTLR start no_loop_key
-    // src/main/resources/org/drools/lang/DRL.g:1455:1: no_loop_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1457:1: no_loop_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] ;
     public final no_loop_key_return no_loop_key() throws RecognitionException {
         no_loop_key_return retval = new no_loop_key_return();
         retval.start = input.LT(1);
@@ -14099,30 +14191,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1458:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1458:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1460:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1460:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "no_loop_key", "(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.LOOP))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_no_loop_key5085); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_no_loop_key5109); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_no_loop_key5089); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_no_loop_key5113); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_no_loop_key5093); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_no_loop_key5117); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14145,7 +14237,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1462:3: -> VK_NO_LOOP[$start, text]
+            // 1464:3: -> VK_NO_LOOP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NO_LOOP, ((Token)retval.start),  text));
 
@@ -14178,7 +14270,7 @@
     };
 
     // $ANTLR start auto_focus_key
-    // src/main/resources/org/drools/lang/DRL.g:1465:1: auto_focus_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1467:1: auto_focus_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] ;
     public final auto_focus_key_return auto_focus_key() throws RecognitionException {
         auto_focus_key_return retval = new auto_focus_key_return();
         retval.start = input.LT(1);
@@ -14192,30 +14284,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1468:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1468:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1470:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1470:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "auto_focus_key", "(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.FOCUS))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_auto_focus_key5125); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_auto_focus_key5149); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_auto_focus_key5129); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_auto_focus_key5153); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_auto_focus_key5133); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_auto_focus_key5157); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14238,7 +14330,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1472:3: -> VK_AUTO_FOCUS[$start, text]
+            // 1474:3: -> VK_AUTO_FOCUS[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AUTO_FOCUS, ((Token)retval.start),  text));
 
@@ -14271,7 +14363,7 @@
     };
 
     // $ANTLR start activation_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1475:1: activation_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1477:1: activation_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] ;
     public final activation_group_key_return activation_group_key() throws RecognitionException {
         activation_group_key_return retval = new activation_group_key_return();
         retval.start = input.LT(1);
@@ -14285,30 +14377,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1478:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1478:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1480:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1480:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "activation_group_key", "(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.GROUP))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_activation_group_key5165); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_activation_group_key5189); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_activation_group_key5169); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_activation_group_key5193); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_activation_group_key5173); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_activation_group_key5197); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14331,7 +14423,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1482:3: -> VK_ACTIVATION_GROUP[$start, text]
+            // 1484:3: -> VK_ACTIVATION_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTIVATION_GROUP, ((Token)retval.start),  text));
 
@@ -14364,7 +14456,7 @@
     };
 
     // $ANTLR start agenda_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1485:1: agenda_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1487:1: agenda_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] ;
     public final agenda_group_key_return agenda_group_key() throws RecognitionException {
         agenda_group_key_return retval = new agenda_group_key_return();
         retval.start = input.LT(1);
@@ -14378,30 +14470,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1488:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1488:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1490:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1490:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "agenda_group_key", "(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.GROUP))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_agenda_group_key5205); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5229); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_agenda_group_key5209); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_agenda_group_key5233); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_agenda_group_key5213); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5237); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14424,7 +14516,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1492:3: -> VK_AGENDA_GROUP[$start, text]
+            // 1494:3: -> VK_AGENDA_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AGENDA_GROUP, ((Token)retval.start),  text));
 
@@ -14457,7 +14549,7 @@
     };
 
     // $ANTLR start ruleflow_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1495:1: ruleflow_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1497:1: ruleflow_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] ;
     public final ruleflow_group_key_return ruleflow_group_key() throws RecognitionException {
         ruleflow_group_key_return retval = new ruleflow_group_key_return();
         retval.start = input.LT(1);
@@ -14471,30 +14563,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1498:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1498:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1500:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1500:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "ruleflow_group_key", "(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.GROUP))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5245); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5269); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key5249); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key5273); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5253); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5277); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14517,7 +14609,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1502:3: -> VK_RULEFLOW_GROUP[$start, text]
+            // 1504:3: -> VK_RULEFLOW_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULEFLOW_GROUP, ((Token)retval.start),  text));
 
@@ -14550,7 +14642,7 @@
     };
 
     // $ANTLR start entry_point_key
-    // src/main/resources/org/drools/lang/DRL.g:1505:1: entry_point_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1507:1: entry_point_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] ;
     public final entry_point_key_return entry_point_key() throws RecognitionException {
         entry_point_key_return retval = new entry_point_key_return();
         retval.start = input.LT(1);
@@ -14564,30 +14656,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
 
-
+        
         	String text = "";
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1508:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] )
-            // src/main/resources/org/drools/lang/DRL.g:1508:5: {...}? =>id1= ID mis1= MISC id2= ID
+            // src/main/resources/org/drools/lang/DRL.g:1510:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1510:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "entry_point_key", "(validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.POINT))");
             }
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_entry_point_key5285); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_entry_point_key5309); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_entry_point_key5289); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_entry_point_key5313); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_entry_point_key5293); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_entry_point_key5317); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14610,7 +14702,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1512:3: -> VK_ENTRY_POINT[$start, text]
+            // 1514:3: -> VK_ENTRY_POINT[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ENTRY_POINT, ((Token)retval.start),  text));
 
@@ -14643,7 +14735,7 @@
     };
 
     // $ANTLR start duration_key
-    // src/main/resources/org/drools/lang/DRL.g:1515:1: duration_key : {...}? =>id= ID -> VK_DURATION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1517:1: duration_key : {...}? =>id= ID -> VK_DURATION[$id] ;
     public final duration_key_return duration_key() throws RecognitionException {
         duration_key_return retval = new duration_key_return();
         retval.start = input.LT(1);
@@ -14656,15 +14748,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1516:2: ({...}? =>id= ID -> VK_DURATION[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1516:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1518:2: ({...}? =>id= ID -> VK_DURATION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1518:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "duration_key", "(validateIdentifierKey(DroolsSoftKeywords.DURATION))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_duration_key5322); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_duration_key5346); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14682,7 +14774,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1518:3: -> VK_DURATION[$id]
+            // 1520:3: -> VK_DURATION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DURATION, id));
 
@@ -14715,7 +14807,7 @@
     };
 
     // $ANTLR start package_key
-    // src/main/resources/org/drools/lang/DRL.g:1521:1: package_key : {...}? =>id= ID -> VK_PACKAGE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1523:1: package_key : {...}? =>id= ID -> VK_PACKAGE[$id] ;
     public final package_key_return package_key() throws RecognitionException {
         package_key_return retval = new package_key_return();
         retval.start = input.LT(1);
@@ -14728,15 +14820,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1522:2: ({...}? =>id= ID -> VK_PACKAGE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1522:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1524:2: ({...}? =>id= ID -> VK_PACKAGE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1524:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.PACKAGE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "package_key", "(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_package_key5349); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_package_key5373); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14754,7 +14846,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1524:3: -> VK_PACKAGE[$id]
+            // 1526:3: -> VK_PACKAGE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_PACKAGE, id));
 
@@ -14787,7 +14879,7 @@
     };
 
     // $ANTLR start import_key
-    // src/main/resources/org/drools/lang/DRL.g:1527:1: import_key : {...}? =>id= ID -> VK_IMPORT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1529:1: import_key : {...}? =>id= ID -> VK_IMPORT[$id] ;
     public final import_key_return import_key() throws RecognitionException {
         import_key_return retval = new import_key_return();
         retval.start = input.LT(1);
@@ -14800,15 +14892,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1528:2: ({...}? =>id= ID -> VK_IMPORT[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1528:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1530:2: ({...}? =>id= ID -> VK_IMPORT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1530:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.IMPORT))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "import_key", "(validateIdentifierKey(DroolsSoftKeywords.IMPORT))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_import_key5376); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_import_key5400); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14826,7 +14918,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1530:3: -> VK_IMPORT[$id]
+            // 1532:3: -> VK_IMPORT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IMPORT, id));
 
@@ -14859,7 +14951,7 @@
     };
 
     // $ANTLR start dialect_key
-    // src/main/resources/org/drools/lang/DRL.g:1533:1: dialect_key : {...}? =>id= ID -> VK_DIALECT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1535:1: dialect_key : {...}? =>id= ID -> VK_DIALECT[$id] ;
     public final dialect_key_return dialect_key() throws RecognitionException {
         dialect_key_return retval = new dialect_key_return();
         retval.start = input.LT(1);
@@ -14872,15 +14964,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1534:2: ({...}? =>id= ID -> VK_DIALECT[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1534:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1536:2: ({...}? =>id= ID -> VK_DIALECT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1536:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.DIALECT))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "dialect_key", "(validateIdentifierKey(DroolsSoftKeywords.DIALECT))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_dialect_key5403); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_dialect_key5427); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14898,7 +14990,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1536:3: -> VK_DIALECT[$id]
+            // 1538:3: -> VK_DIALECT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DIALECT, id));
 
@@ -14931,7 +15023,7 @@
     };
 
     // $ANTLR start salience_key
-    // src/main/resources/org/drools/lang/DRL.g:1539:1: salience_key : {...}? =>id= ID -> VK_SALIENCE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1541:1: salience_key : {...}? =>id= ID -> VK_SALIENCE[$id] ;
     public final salience_key_return salience_key() throws RecognitionException {
         salience_key_return retval = new salience_key_return();
         retval.start = input.LT(1);
@@ -14944,15 +15036,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1540:2: ({...}? =>id= ID -> VK_SALIENCE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1540:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1542:2: ({...}? =>id= ID -> VK_SALIENCE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1542:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "salience_key", "(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_salience_key5430); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_salience_key5454); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14970,7 +15062,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1542:3: -> VK_SALIENCE[$id]
+            // 1544:3: -> VK_SALIENCE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SALIENCE, id));
 
@@ -15003,7 +15095,7 @@
     };
 
     // $ANTLR start enabled_key
-    // src/main/resources/org/drools/lang/DRL.g:1545:1: enabled_key : {...}? =>id= ID -> VK_ENABLED[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1547:1: enabled_key : {...}? =>id= ID -> VK_ENABLED[$id] ;
     public final enabled_key_return enabled_key() throws RecognitionException {
         enabled_key_return retval = new enabled_key_return();
         retval.start = input.LT(1);
@@ -15016,15 +15108,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1546:2: ({...}? =>id= ID -> VK_ENABLED[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1546:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1548:2: ({...}? =>id= ID -> VK_ENABLED[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1548:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "enabled_key", "(validateIdentifierKey(DroolsSoftKeywords.ENABLED))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_enabled_key5457); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_enabled_key5481); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15042,7 +15134,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1548:3: -> VK_ENABLED[$id]
+            // 1550:3: -> VK_ENABLED[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ENABLED, id));
 
@@ -15075,7 +15167,7 @@
     };
 
     // $ANTLR start attributes_key
-    // src/main/resources/org/drools/lang/DRL.g:1551:1: attributes_key : {...}? =>id= ID -> VK_ATTRIBUTES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1553:1: attributes_key : {...}? =>id= ID -> VK_ATTRIBUTES[$id] ;
     public final attributes_key_return attributes_key() throws RecognitionException {
         attributes_key_return retval = new attributes_key_return();
         retval.start = input.LT(1);
@@ -15088,15 +15180,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1552:2: ({...}? =>id= ID -> VK_ATTRIBUTES[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1552:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1554:2: ({...}? =>id= ID -> VK_ATTRIBUTES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1554:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "attributes_key", "(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_attributes_key5484); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_attributes_key5508); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15114,7 +15206,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1554:3: -> VK_ATTRIBUTES[$id]
+            // 1556:3: -> VK_ATTRIBUTES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ATTRIBUTES, id));
 
@@ -15147,7 +15239,7 @@
     };
 
     // $ANTLR start rule_key
-    // src/main/resources/org/drools/lang/DRL.g:1557:1: rule_key : {...}? =>id= ID -> VK_RULE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1559:1: rule_key : {...}? =>id= ID -> VK_RULE[$id] ;
     public final rule_key_return rule_key() throws RecognitionException {
         rule_key_return retval = new rule_key_return();
         retval.start = input.LT(1);
@@ -15160,15 +15252,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1558:2: ({...}? =>id= ID -> VK_RULE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1558:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1560:2: ({...}? =>id= ID -> VK_RULE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1560:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.RULE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "rule_key", "(validateIdentifierKey(DroolsSoftKeywords.RULE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_rule_key5511); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_rule_key5535); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15186,7 +15278,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1560:3: -> VK_RULE[$id]
+            // 1562:3: -> VK_RULE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULE, id));
 
@@ -15219,7 +15311,7 @@
     };
 
     // $ANTLR start template_key
-    // src/main/resources/org/drools/lang/DRL.g:1563:1: template_key : {...}? =>id= ID -> VK_TEMPLATE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1565:1: template_key : {...}? =>id= ID -> VK_TEMPLATE[$id] ;
     public final template_key_return template_key() throws RecognitionException {
         template_key_return retval = new template_key_return();
         retval.start = input.LT(1);
@@ -15232,15 +15324,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1564:2: ({...}? =>id= ID -> VK_TEMPLATE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1564:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1566:2: ({...}? =>id= ID -> VK_TEMPLATE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1566:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.TEMPLATE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "template_key", "(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_template_key5538); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_template_key5562); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15258,7 +15350,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1566:3: -> VK_TEMPLATE[$id]
+            // 1568:3: -> VK_TEMPLATE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_TEMPLATE, id));
 
@@ -15291,7 +15383,7 @@
     };
 
     // $ANTLR start query_key
-    // src/main/resources/org/drools/lang/DRL.g:1569:1: query_key : {...}? =>id= ID -> VK_QUERY[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1571:1: query_key : {...}? =>id= ID -> VK_QUERY[$id] ;
     public final query_key_return query_key() throws RecognitionException {
         query_key_return retval = new query_key_return();
         retval.start = input.LT(1);
@@ -15304,15 +15396,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1570:2: ({...}? =>id= ID -> VK_QUERY[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1570:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1572:2: ({...}? =>id= ID -> VK_QUERY[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1572:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.QUERY))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "query_key", "(validateIdentifierKey(DroolsSoftKeywords.QUERY))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_query_key5565); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_query_key5589); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15330,7 +15422,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1572:3: -> VK_QUERY[$id]
+            // 1574:3: -> VK_QUERY[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_QUERY, id));
 
@@ -15363,7 +15455,7 @@
     };
 
     // $ANTLR start declare_key
-    // src/main/resources/org/drools/lang/DRL.g:1575:1: declare_key : {...}? =>id= ID -> VK_DECLARE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1577:1: declare_key : {...}? =>id= ID -> VK_DECLARE[$id] ;
     public final declare_key_return declare_key() throws RecognitionException {
         declare_key_return retval = new declare_key_return();
         retval.start = input.LT(1);
@@ -15376,15 +15468,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1576:2: ({...}? =>id= ID -> VK_DECLARE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1576:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1578:2: ({...}? =>id= ID -> VK_DECLARE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1578:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.DECLARE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "declare_key", "(validateIdentifierKey(DroolsSoftKeywords.DECLARE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_declare_key5592); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_declare_key5616); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15402,7 +15494,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1578:3: -> VK_DECLARE[$id]
+            // 1580:3: -> VK_DECLARE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DECLARE, id));
 
@@ -15435,7 +15527,7 @@
     };
 
     // $ANTLR start function_key
-    // src/main/resources/org/drools/lang/DRL.g:1581:1: function_key : {...}? =>id= ID -> VK_FUNCTION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1583:1: function_key : {...}? =>id= ID -> VK_FUNCTION[$id] ;
     public final function_key_return function_key() throws RecognitionException {
         function_key_return retval = new function_key_return();
         retval.start = input.LT(1);
@@ -15448,15 +15540,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1582:2: ({...}? =>id= ID -> VK_FUNCTION[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1582:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1584:2: ({...}? =>id= ID -> VK_FUNCTION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1584:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.FUNCTION))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "function_key", "(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_function_key5619); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function_key5643); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15474,7 +15566,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1584:3: -> VK_FUNCTION[$id]
+            // 1586:3: -> VK_FUNCTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FUNCTION, id));
 
@@ -15507,7 +15599,7 @@
     };
 
     // $ANTLR start global_key
-    // src/main/resources/org/drools/lang/DRL.g:1587:1: global_key : {...}? =>id= ID -> VK_GLOBAL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1589:1: global_key : {...}? =>id= ID -> VK_GLOBAL[$id] ;
     public final global_key_return global_key() throws RecognitionException {
         global_key_return retval = new global_key_return();
         retval.start = input.LT(1);
@@ -15520,15 +15612,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1588:2: ({...}? =>id= ID -> VK_GLOBAL[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1588:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1590:2: ({...}? =>id= ID -> VK_GLOBAL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1590:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.GLOBAL))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "global_key", "(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_global_key5646); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_global_key5670); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15546,7 +15638,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1590:3: -> VK_GLOBAL[$id]
+            // 1592:3: -> VK_GLOBAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_GLOBAL, id));
 
@@ -15579,7 +15671,7 @@
     };
 
     // $ANTLR start eval_key
-    // src/main/resources/org/drools/lang/DRL.g:1593:1: eval_key : {...}? =>id= ID -> VK_EVAL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1595:1: eval_key : {...}? =>id= ID -> VK_EVAL[$id] ;
     public final eval_key_return eval_key() throws RecognitionException {
         eval_key_return retval = new eval_key_return();
         retval.start = input.LT(1);
@@ -15592,15 +15684,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1594:2: ({...}? =>id= ID -> VK_EVAL[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1594:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1596:2: ({...}? =>id= ID -> VK_EVAL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1596:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "eval_key", "(validateIdentifierKey(DroolsSoftKeywords.EVAL))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_eval_key5673); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_eval_key5697); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15618,7 +15710,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1596:3: -> VK_EVAL[$id]
+            // 1598:3: -> VK_EVAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EVAL, id));
 
@@ -15651,7 +15743,7 @@
     };
 
     // $ANTLR start contains_key
-    // src/main/resources/org/drools/lang/DRL.g:1599:1: contains_key : {...}? =>id= ID -> VK_CONTAINS[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1601:1: contains_key : {...}? =>id= ID -> VK_CONTAINS[$id] ;
     public final contains_key_return contains_key() throws RecognitionException {
         contains_key_return retval = new contains_key_return();
         retval.start = input.LT(1);
@@ -15664,15 +15756,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1600:2: ({...}? =>id= ID -> VK_CONTAINS[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1600:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1602:2: ({...}? =>id= ID -> VK_CONTAINS[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1602:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "contains_key", "(validateIdentifierKey(DroolsSoftKeywords.CONTAINS))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_contains_key5700); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_contains_key5724); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15690,7 +15782,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1602:3: -> VK_CONTAINS[$id]
+            // 1604:3: -> VK_CONTAINS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_CONTAINS, id));
 
@@ -15723,7 +15815,7 @@
     };
 
     // $ANTLR start matches_key
-    // src/main/resources/org/drools/lang/DRL.g:1605:1: matches_key : {...}? =>id= ID -> VK_MATCHES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1607:1: matches_key : {...}? =>id= ID -> VK_MATCHES[$id] ;
     public final matches_key_return matches_key() throws RecognitionException {
         matches_key_return retval = new matches_key_return();
         retval.start = input.LT(1);
@@ -15736,15 +15828,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1606:2: ({...}? =>id= ID -> VK_MATCHES[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1606:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1608:2: ({...}? =>id= ID -> VK_MATCHES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1608:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "matches_key", "(validateIdentifierKey(DroolsSoftKeywords.MATCHES))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_matches_key5727); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_matches_key5751); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15762,7 +15854,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1608:3: -> VK_MATCHES[$id]
+            // 1610:3: -> VK_MATCHES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MATCHES, id));
 
@@ -15795,7 +15887,7 @@
     };
 
     // $ANTLR start excludes_key
-    // src/main/resources/org/drools/lang/DRL.g:1611:1: excludes_key : {...}? =>id= ID -> VK_EXCLUDES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1613:1: excludes_key : {...}? =>id= ID -> VK_EXCLUDES[$id] ;
     public final excludes_key_return excludes_key() throws RecognitionException {
         excludes_key_return retval = new excludes_key_return();
         retval.start = input.LT(1);
@@ -15808,15 +15900,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1612:2: ({...}? =>id= ID -> VK_EXCLUDES[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1612:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1614:2: ({...}? =>id= ID -> VK_EXCLUDES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1614:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "excludes_key", "(validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_excludes_key5754); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_excludes_key5778); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15834,7 +15926,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1614:3: -> VK_EXCLUDES[$id]
+            // 1616:3: -> VK_EXCLUDES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXCLUDES, id));
 
@@ -15867,7 +15959,7 @@
     };
 
     // $ANTLR start soundslike_key
-    // src/main/resources/org/drools/lang/DRL.g:1617:1: soundslike_key : {...}? =>id= ID -> VK_SOUNDSLIKE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1619:1: soundslike_key : {...}? =>id= ID -> VK_SOUNDSLIKE[$id] ;
     public final soundslike_key_return soundslike_key() throws RecognitionException {
         soundslike_key_return retval = new soundslike_key_return();
         retval.start = input.LT(1);
@@ -15880,15 +15972,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1618:2: ({...}? =>id= ID -> VK_SOUNDSLIKE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1618:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1620:2: ({...}? =>id= ID -> VK_SOUNDSLIKE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1620:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "soundslike_key", "(validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_soundslike_key5781); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_soundslike_key5805); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15906,7 +15998,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1620:3: -> VK_SOUNDSLIKE[$id]
+            // 1622:3: -> VK_SOUNDSLIKE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SOUNDSLIKE, id));
 
@@ -15939,7 +16031,7 @@
     };
 
     // $ANTLR start memberof_key
-    // src/main/resources/org/drools/lang/DRL.g:1623:1: memberof_key : {...}? =>id= ID -> VK_MEMBEROF[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1625:1: memberof_key : {...}? =>id= ID -> VK_MEMBEROF[$id] ;
     public final memberof_key_return memberof_key() throws RecognitionException {
         memberof_key_return retval = new memberof_key_return();
         retval.start = input.LT(1);
@@ -15952,15 +16044,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1624:2: ({...}? =>id= ID -> VK_MEMBEROF[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1624:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1626:2: ({...}? =>id= ID -> VK_MEMBEROF[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1626:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "memberof_key", "(validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_memberof_key5808); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_memberof_key5832); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15978,7 +16070,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1626:3: -> VK_MEMBEROF[$id]
+            // 1628:3: -> VK_MEMBEROF[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MEMBEROF, id));
 
@@ -16011,7 +16103,7 @@
     };
 
     // $ANTLR start not_key
-    // src/main/resources/org/drools/lang/DRL.g:1629:1: not_key : {...}? =>id= ID -> VK_NOT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1631:1: not_key : {...}? =>id= ID -> VK_NOT[$id] ;
     public final not_key_return not_key() throws RecognitionException {
         not_key_return retval = new not_key_return();
         retval.start = input.LT(1);
@@ -16024,15 +16116,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1630:2: ({...}? =>id= ID -> VK_NOT[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1630:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1632:2: ({...}? =>id= ID -> VK_NOT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1632:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "not_key", "(validateIdentifierKey(DroolsSoftKeywords.NOT))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_not_key5835); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_not_key5859); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16050,7 +16142,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1632:3: -> VK_NOT[$id]
+            // 1634:3: -> VK_NOT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NOT, id));
 
@@ -16083,7 +16175,7 @@
     };
 
     // $ANTLR start in_key
-    // src/main/resources/org/drools/lang/DRL.g:1635:1: in_key : {...}? =>id= ID -> VK_IN[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1637:1: in_key : {...}? =>id= ID -> VK_IN[$id] ;
     public final in_key_return in_key() throws RecognitionException {
         in_key_return retval = new in_key_return();
         retval.start = input.LT(1);
@@ -16096,15 +16188,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1636:2: ({...}? =>id= ID -> VK_IN[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1636:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1638:2: ({...}? =>id= ID -> VK_IN[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1638:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "in_key", "(validateIdentifierKey(DroolsSoftKeywords.IN))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_in_key5862); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_in_key5886); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16122,7 +16214,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1638:3: -> VK_IN[$id]
+            // 1640:3: -> VK_IN[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IN, id));
 
@@ -16155,7 +16247,7 @@
     };
 
     // $ANTLR start or_key
-    // src/main/resources/org/drools/lang/DRL.g:1641:1: or_key : {...}? =>id= ID -> VK_OR[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1643:1: or_key : {...}? =>id= ID -> VK_OR[$id] ;
     public final or_key_return or_key() throws RecognitionException {
         or_key_return retval = new or_key_return();
         retval.start = input.LT(1);
@@ -16168,15 +16260,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1642:2: ({...}? =>id= ID -> VK_OR[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1642:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1644:2: ({...}? =>id= ID -> VK_OR[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1644:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "or_key", "(validateIdentifierKey(DroolsSoftKeywords.OR))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_or_key5889); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_or_key5913); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16194,7 +16286,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1644:3: -> VK_OR[$id]
+            // 1646:3: -> VK_OR[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_OR, id));
 
@@ -16227,7 +16319,7 @@
     };
 
     // $ANTLR start and_key
-    // src/main/resources/org/drools/lang/DRL.g:1647:1: and_key : {...}? =>id= ID -> VK_AND[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1649:1: and_key : {...}? =>id= ID -> VK_AND[$id] ;
     public final and_key_return and_key() throws RecognitionException {
         and_key_return retval = new and_key_return();
         retval.start = input.LT(1);
@@ -16240,15 +16332,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1648:2: ({...}? =>id= ID -> VK_AND[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1648:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1650:2: ({...}? =>id= ID -> VK_AND[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1650:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "and_key", "(validateIdentifierKey(DroolsSoftKeywords.AND))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_and_key5916); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_and_key5940); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16266,7 +16358,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1650:3: -> VK_AND[$id]
+            // 1652:3: -> VK_AND[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AND, id));
 
@@ -16299,7 +16391,7 @@
     };
 
     // $ANTLR start exists_key
-    // src/main/resources/org/drools/lang/DRL.g:1653:1: exists_key : {...}? =>id= ID -> VK_EXISTS[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1655:1: exists_key : {...}? =>id= ID -> VK_EXISTS[$id] ;
     public final exists_key_return exists_key() throws RecognitionException {
         exists_key_return retval = new exists_key_return();
         retval.start = input.LT(1);
@@ -16312,15 +16404,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1654:2: ({...}? =>id= ID -> VK_EXISTS[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1654:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1656:2: ({...}? =>id= ID -> VK_EXISTS[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1656:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.EXISTS))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "exists_key", "(validateIdentifierKey(DroolsSoftKeywords.EXISTS))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_exists_key5943); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_exists_key5967); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16338,7 +16430,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1656:3: -> VK_EXISTS[$id]
+            // 1658:3: -> VK_EXISTS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXISTS, id));
 
@@ -16371,7 +16463,7 @@
     };
 
     // $ANTLR start forall_key
-    // src/main/resources/org/drools/lang/DRL.g:1659:1: forall_key : {...}? =>id= ID -> VK_FORALL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1661:1: forall_key : {...}? =>id= ID -> VK_FORALL[$id] ;
     public final forall_key_return forall_key() throws RecognitionException {
         forall_key_return retval = new forall_key_return();
         retval.start = input.LT(1);
@@ -16384,15 +16476,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1660:2: ({...}? =>id= ID -> VK_FORALL[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1660:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1662:2: ({...}? =>id= ID -> VK_FORALL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1662:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.FORALL))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "forall_key", "(validateIdentifierKey(DroolsSoftKeywords.FORALL))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_forall_key5970); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_forall_key5994); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16410,7 +16502,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1662:3: -> VK_FORALL[$id]
+            // 1664:3: -> VK_FORALL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FORALL, id));
 
@@ -16443,7 +16535,7 @@
     };
 
     // $ANTLR start action_key
-    // src/main/resources/org/drools/lang/DRL.g:1665:1: action_key : {...}? =>id= ID -> VK_ACTION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1667:1: action_key : {...}? =>id= ID -> VK_ACTION[$id] ;
     public final action_key_return action_key() throws RecognitionException {
         action_key_return retval = new action_key_return();
         retval.start = input.LT(1);
@@ -16456,15 +16548,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1666:2: ({...}? =>id= ID -> VK_ACTION[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1666:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1668:2: ({...}? =>id= ID -> VK_ACTION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1668:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.ACTION))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "action_key", "(validateIdentifierKey(DroolsSoftKeywords.ACTION))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_action_key5997); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_action_key6021); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16482,7 +16574,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1668:3: -> VK_ACTION[$id]
+            // 1670:3: -> VK_ACTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTION, id));
 
@@ -16515,7 +16607,7 @@
     };
 
     // $ANTLR start reverse_key
-    // src/main/resources/org/drools/lang/DRL.g:1671:1: reverse_key : {...}? =>id= ID -> VK_REVERSE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1673:1: reverse_key : {...}? =>id= ID -> VK_REVERSE[$id] ;
     public final reverse_key_return reverse_key() throws RecognitionException {
         reverse_key_return retval = new reverse_key_return();
         retval.start = input.LT(1);
@@ -16528,15 +16620,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1672:2: ({...}? =>id= ID -> VK_REVERSE[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1672:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1674:2: ({...}? =>id= ID -> VK_REVERSE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1674:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "reverse_key", "(validateIdentifierKey(DroolsSoftKeywords.REVERSE))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_reverse_key6024); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_reverse_key6048); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16554,7 +16646,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1674:3: -> VK_REVERSE[$id]
+            // 1676:3: -> VK_REVERSE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_REVERSE, id));
 
@@ -16587,7 +16679,7 @@
     };
 
     // $ANTLR start result_key
-    // src/main/resources/org/drools/lang/DRL.g:1677:1: result_key : {...}? =>id= ID -> VK_RESULT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1679:1: result_key : {...}? =>id= ID -> VK_RESULT[$id] ;
     public final result_key_return result_key() throws RecognitionException {
         result_key_return retval = new result_key_return();
         retval.start = input.LT(1);
@@ -16600,15 +16692,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1678:2: ({...}? =>id= ID -> VK_RESULT[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:1678:4: {...}? =>id= ID
+            // src/main/resources/org/drools/lang/DRL.g:1680:2: ({...}? =>id= ID -> VK_RESULT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1680:4: {...}? =>id= ID
             {
             if ( !((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {
                 if (backtracking>0) {failed=true; return retval;}
                 throw new FailedPredicateException(input, "result_key", "(validateIdentifierKey(DroolsSoftKeywords.RESULT))");
             }
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_result_key6051); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_result_key6075); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16626,7 +16718,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1680:3: -> VK_RESULT[$id]
+            // 1682:3: -> VK_RESULT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RESULT, id));
 
@@ -16655,11 +16747,11 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:816:5: ( LEFT_PAREN or_key )
-        // src/main/resources/org/drools/lang/DRL.g:816:6: LEFT_PAREN or_key
+        // src/main/resources/org/drools/lang/DRL.g:818:5: ( LEFT_PAREN or_key )
+        // src/main/resources/org/drools/lang/DRL.g:818:6: LEFT_PAREN or_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred12045); if (failed) return ;
-        pushFollow(FOLLOW_or_key_in_synpred12047);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred12069); if (failed) return ;
+        pushFollow(FOLLOW_or_key_in_synpred12071);
         or_key();
         _fsp--;
         if (failed) return ;
@@ -16670,28 +16762,28 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:824:5: ( or_key | DOUBLE_PIPE )
-        int alt102=2;
-        int LA102_0 = input.LA(1);
+        // src/main/resources/org/drools/lang/DRL.g:826:5: ( or_key | DOUBLE_PIPE )
+        int alt103=2;
+        int LA103_0 = input.LA(1);
 
-        if ( (LA102_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-            alt102=1;
+        if ( (LA103_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+            alt103=1;
         }
-        else if ( (LA102_0==DOUBLE_PIPE) ) {
-            alt102=2;
+        else if ( (LA103_0==DOUBLE_PIPE) ) {
+            alt103=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("824:5: synpred2 : ( or_key | DOUBLE_PIPE );", 102, 0, input);
+                new NoViableAltException("826:5: synpred2 : ( or_key | DOUBLE_PIPE );", 103, 0, input);
 
             throw nvae;
         }
-        switch (alt102) {
+        switch (alt103) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:824:6: or_key
+                // src/main/resources/org/drools/lang/DRL.g:826:6: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred22114);
+                pushFollow(FOLLOW_or_key_in_synpred22138);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16699,9 +16791,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:824:13: DOUBLE_PIPE
+                // src/main/resources/org/drools/lang/DRL.g:826:13: DOUBLE_PIPE
                 {
-                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred22116); if (failed) return ;
+                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred22140); if (failed) return ;
 
                 }
                 break;
@@ -16711,11 +16803,11 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:833:5: ( LEFT_PAREN and_key )
-        // src/main/resources/org/drools/lang/DRL.g:833:6: LEFT_PAREN and_key
+        // src/main/resources/org/drools/lang/DRL.g:835:5: ( LEFT_PAREN and_key )
+        // src/main/resources/org/drools/lang/DRL.g:835:6: LEFT_PAREN and_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred32173); if (failed) return ;
-        pushFollow(FOLLOW_and_key_in_synpred32175);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred32197); if (failed) return ;
+        pushFollow(FOLLOW_and_key_in_synpred32199);
         and_key();
         _fsp--;
         if (failed) return ;
@@ -16726,28 +16818,28 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:841:5: ( and_key | DOUBLE_AMPER )
-        int alt103=2;
-        int LA103_0 = input.LA(1);
+        // src/main/resources/org/drools/lang/DRL.g:843:5: ( and_key | DOUBLE_AMPER )
+        int alt104=2;
+        int LA104_0 = input.LA(1);
 
-        if ( (LA103_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-            alt103=1;
+        if ( (LA104_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+            alt104=1;
         }
-        else if ( (LA103_0==DOUBLE_AMPER) ) {
-            alt103=2;
+        else if ( (LA104_0==DOUBLE_AMPER) ) {
+            alt104=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("841:5: synpred4 : ( and_key | DOUBLE_AMPER );", 103, 0, input);
+                new NoViableAltException("843:5: synpred4 : ( and_key | DOUBLE_AMPER );", 104, 0, input);
 
             throw nvae;
         }
-        switch (alt103) {
+        switch (alt104) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:841:6: and_key
+                // src/main/resources/org/drools/lang/DRL.g:843:6: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred42243);
+                pushFollow(FOLLOW_and_key_in_synpred42267);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16755,9 +16847,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:841:14: DOUBLE_AMPER
+                // src/main/resources/org/drools/lang/DRL.g:843:14: DOUBLE_AMPER
                 {
-                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42245); if (failed) return ;
+                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42269); if (failed) return ;
 
                 }
                 break;
@@ -16767,10 +16859,10 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:858:4: ( SEMICOLON )
-        // src/main/resources/org/drools/lang/DRL.g:858:5: SEMICOLON
+        // src/main/resources/org/drools/lang/DRL.g:860:4: ( SEMICOLON )
+        // src/main/resources/org/drools/lang/DRL.g:860:5: SEMICOLON
         {
-        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52368); if (failed) return ;
+        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52392); if (failed) return ;
 
         }
     }
@@ -16778,27 +16870,27 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:864:12: ( LEFT_PAREN ( or_key | and_key ) )
-        // src/main/resources/org/drools/lang/DRL.g:864:13: LEFT_PAREN ( or_key | and_key )
+        // src/main/resources/org/drools/lang/DRL.g:866:12: ( LEFT_PAREN ( or_key | and_key ) )
+        // src/main/resources/org/drools/lang/DRL.g:866:13: LEFT_PAREN ( or_key | and_key )
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred62405); if (failed) return ;
-        // src/main/resources/org/drools/lang/DRL.g:864:24: ( or_key | and_key )
-        int alt104=2;
-        int LA104_0 = input.LA(1);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred62429); if (failed) return ;
+        // src/main/resources/org/drools/lang/DRL.g:866:24: ( or_key | and_key )
+        int alt105=2;
+        int LA105_0 = input.LA(1);
 
-        if ( (LA104_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-            int LA104_1 = input.LA(2);
+        if ( (LA105_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
+            int LA105_1 = input.LA(2);
 
             if ( ((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
-                alt104=1;
+                alt105=1;
             }
             else if ( ((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
-                alt104=2;
+                alt105=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("864:24: ( or_key | and_key )", 104, 1, input);
+                    new NoViableAltException("866:24: ( or_key | and_key )", 105, 1, input);
 
                 throw nvae;
             }
@@ -16806,15 +16898,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("864:24: ( or_key | and_key )", 104, 0, input);
+                new NoViableAltException("866:24: ( or_key | and_key )", 105, 0, input);
 
             throw nvae;
         }
-        switch (alt104) {
+        switch (alt105) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:864:25: or_key
+                // src/main/resources/org/drools/lang/DRL.g:866:25: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred62408);
+                pushFollow(FOLLOW_or_key_in_synpred62432);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16822,9 +16914,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:864:32: and_key
+                // src/main/resources/org/drools/lang/DRL.g:866:32: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred62410);
+                pushFollow(FOLLOW_and_key_in_synpred62434);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16841,27 +16933,27 @@
 
     // $ANTLR start synpred7
     public final void synpred7_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:880:5: ( LEFT_PAREN ( or_key | and_key ) )
-        // src/main/resources/org/drools/lang/DRL.g:880:6: LEFT_PAREN ( or_key | and_key )
+        // src/main/resources/org/drools/lang/DRL.g:882:5: ( LEFT_PAREN ( or_key | and_key ) )
+        // src/main/resources/org/drools/lang/DRL.g:882:6: LEFT_PAREN ( or_key | and_key )
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred72533); if (failed) return ;
-        // src/main/resources/org/drools/lang/DRL.g:880:17: ( or_key | and_key )
-        int alt105=2;
-        int LA105_0 = input.LA(1);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred72557); if (failed) return ;
+        // src/main/resources/org/drools/lang/DRL.g:882:17: ( or_key | and_key )
+        int alt106=2;
+        int LA106_0 = input.LA(1);
 
-        if ( (LA105_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-            int LA105_1 = input.LA(2);
+        if ( (LA106_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
+            int LA106_1 = input.LA(2);
 
             if ( ((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
-                alt105=1;
+                alt106=1;
             }
             else if ( ((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
-                alt105=2;
+                alt106=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("880:17: ( or_key | and_key )", 105, 1, input);
+                    new NoViableAltException("882:17: ( or_key | and_key )", 106, 1, input);
 
                 throw nvae;
             }
@@ -16869,15 +16961,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("880:17: ( or_key | and_key )", 105, 0, input);
+                new NoViableAltException("882:17: ( or_key | and_key )", 106, 0, input);
 
             throw nvae;
         }
-        switch (alt105) {
+        switch (alt106) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:880:18: or_key
+                // src/main/resources/org/drools/lang/DRL.g:882:18: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred72536);
+                pushFollow(FOLLOW_or_key_in_synpred72560);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16885,9 +16977,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:880:25: and_key
+                // src/main/resources/org/drools/lang/DRL.g:882:25: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred72538);
+                pushFollow(FOLLOW_and_key_in_synpred72562);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16904,20 +16996,20 @@
 
     // $ANTLR start synpred8
     public final void synpred8_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:1049:5: ( LEFT_PAREN )
-        // src/main/resources/org/drools/lang/DRL.g:1049:6: LEFT_PAREN
+        // src/main/resources/org/drools/lang/DRL.g:1051:5: ( LEFT_PAREN )
+        // src/main/resources/org/drools/lang/DRL.g:1051:6: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred83367); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred83391); if (failed) return ;
 
         }
     }
     // $ANTLR end synpred8
 
-    public final boolean synpred5() {
+    public final boolean synpred4() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred5_fragment(); // can never throw exception
+            synpred4_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -16927,11 +17019,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred6() {
+    public final boolean synpred7() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred6_fragment(); // can never throw exception
+            synpred7_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -16941,11 +17033,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred7() {
+    public final boolean synpred2() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred7_fragment(); // can never throw exception
+            synpred2_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -16955,11 +17047,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred8() {
+    public final boolean synpred3() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred8_fragment(); // can never throw exception
+            synpred3_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -16983,11 +17075,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred2() {
+    public final boolean synpred5() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred2_fragment(); // can never throw exception
+            synpred5_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -16997,11 +17089,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred3() {
+    public final boolean synpred6() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred3_fragment(); // can never throw exception
+            synpred6_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17011,11 +17103,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred4() {
+    public final boolean synpred8() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred4_fragment(); // can never throw exception
+            synpred8_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17029,13 +17121,13 @@
 
     protected DFA12 dfa12 = new DFA12(this);
     protected DFA17 dfa17 = new DFA17(this);
-    protected DFA52 dfa52 = new DFA52(this);
+    protected DFA36 dfa36 = new DFA36(this);
     protected DFA53 dfa53 = new DFA53(this);
-    protected DFA64 dfa64 = new DFA64(this);
-    protected DFA67 dfa67 = new DFA67(this);
-    protected DFA69 dfa69 = new DFA69(this);
-    protected DFA82 dfa82 = new DFA82(this);
+    protected DFA54 dfa54 = new DFA54(this);
+    protected DFA65 dfa65 = new DFA65(this);
+    protected DFA68 dfa68 = new DFA68(this);
     protected DFA83 dfa83 = new DFA83(this);
+    protected DFA84 dfa84 = new DFA84(this);
     static final String DFA12_eotS =
         "\16\uffff";
     static final String DFA12_eofS =
@@ -17153,29 +17245,297 @@
             return "563:4: ( data_type )?";
         }
     }
-    static final String DFA52_eotS =
-        "\u0083\uffff";
-    static final String DFA52_eofS =
-        "\u0083\uffff";
-    static final String DFA52_minS =
-        "\3\123\2\0\1\123\1\0\1\uffff\1\123\1\163\2\uffff\1\124\1\123\1"+
-        "\uffff\1\124\1\130\1\123\1\163\1\123\1\124\1\123\1\124\1\130\1\123"+
-        "\2\0\1\123\1\163\2\123\2\0\1\123\1\0\1\4\11\123\2\uffff\1\124\1"+
-        "\130\1\123\1\0\2\123\1\0\1\4\11\123\2\uffff\1\123\1\uffff\1\4\32"+
-        "\0\1\uffff\4\0\1\uffff\36\0";
-    static final String DFA52_maxS =
-        "\2\130\1\162\2\0\1\130\1\0\1\uffff\1\123\1\163\2\uffff\1\162\1"+
-        "\123\1\uffff\2\162\1\123\1\163\1\132\1\162\1\132\3\162\2\0\1\123"+
-        "\1\163\1\132\1\162\2\0\1\123\1\0\1\u0080\1\123\7\161\1\123\2\uffff"+
-        "\3\162\1\0\1\141\1\123\1\0\1\u0080\1\123\7\161\1\123\2\uffff\1\162"+
-        "\1\uffff\1\u0080\32\0\1\uffff\4\0\1\uffff\36\0";
-    static final String DFA52_acceptS =
-        "\7\uffff\1\1\2\uffff\2\2\2\uffff\1\3\36\uffff\2\3\21\uffff\2\3"+
-        "\1\uffff\1\3\33\uffff\1\3\4\uffff\1\3\36\uffff";
-    static final String DFA52_specialS =
-        "\2\uffff\1\5\1\3\1\4\1\uffff\1\2\22\uffff\1\10\1\0\4\uffff\1\7"+
-        "\1\1\1\uffff\1\12\17\uffff\1\11\2\uffff\1\6\115\uffff}>";
-    static final String[] DFA52_transitionS = {
+    static final String DFA36_eotS =
+        "\31\uffff";
+    static final String DFA36_eofS =
+        "\31\uffff";
+    static final String DFA36_minS =
+        "\1\123\1\127\1\123\1\0\1\4\2\uffff\1\127\2\uffff\1\4\2\0\1\uffff"+
+        "\1\0\2\uffff\1\0\7\uffff";
+    static final String DFA36_maxS =
+        "\1\123\1\167\1\123\1\0\1\u0080\2\uffff\1\167\2\uffff\1\u0080\2\0"+
+        "\1\uffff\1\0\2\uffff\1\0\7\uffff";
+    static final String DFA36_acceptS =
+        "\5\uffff\1\14\1\11\1\uffff\1\1\1\4\3\uffff\1\13\1\uffff\1\2\1\6"+
+        "\1\uffff\1\1\1\3\1\5\1\7\1\10\1\12\1\1";
+    static final String DFA36_specialS =
+        "\1\3\1\6\1\4\1\10\1\12\2\uffff\1\0\2\uffff\1\7\1\1\1\11\1\uffff"+
+        "\1\5\2\uffff\1\2\7\uffff}>";
+    static final String[] DFA36_transitionS = {
+            "\1\1",
+            "\1\5\1\4\6\uffff\1\6\1\3\26\uffff\1\2",
+            "\1\7",
+            "\1\uffff",
+            "\124\12\1\13\1\12\1\14\46\12",
+            "",
+            "",
+            "\1\16\37\uffff\1\15",
+            "",
+            "",
+            "\124\12\1\21\1\12\1\14\46\12",
+            "\1\uffff",
+            "\1\uffff",
+            "",
+            "\1\uffff",
+            "",
+            "",
+            "\1\uffff",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+    };
+
+    static final short[] DFA36_eot = DFA.unpackEncodedString(DFA36_eotS);
+    static final short[] DFA36_eof = DFA.unpackEncodedString(DFA36_eofS);
+    static final char[] DFA36_min = DFA.unpackEncodedStringToUnsignedChars(DFA36_minS);
+    static final char[] DFA36_max = DFA.unpackEncodedStringToUnsignedChars(DFA36_maxS);
+    static final short[] DFA36_accept = DFA.unpackEncodedString(DFA36_acceptS);
+    static final short[] DFA36_special = DFA.unpackEncodedString(DFA36_specialS);
+    static final short[][] DFA36_transition;
+
+    static {
+        int numStates = DFA36_transitionS.length;
+        DFA36_transition = new short[numStates][];
+        for (int i=0; i<numStates; i++) {
+            DFA36_transition[i] = DFA.unpackEncodedString(DFA36_transitionS[i]);
+        }
+    }
+
+    class DFA36 extends DFA {
+
+        public DFA36(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 36;
+            this.eot = DFA36_eot;
+            this.eof = DFA36_eof;
+            this.min = DFA36_min;
+            this.max = DFA36_max;
+            this.accept = DFA36_accept;
+            this.special = DFA36_special;
+            this.transition = DFA36_transition;
+        }
+        public String getDescription() {
+            return "684:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );";
+        }
+        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
+        	int _s = s;
+            switch ( s ) {
+                    case 0 : 
+                        int LA36_7 = input.LA(1);
+
+                         
+                        int index36_7 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_7==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE)))) {s = 13;}
+
+                        else if ( (LA36_7==STRING) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 14;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))) ) {s = 15;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))) ) {s = 16;}
+
+                         
+                        input.seek(index36_7);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA36_11 = input.LA(1);
+
+                         
+                        int index36_11 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 18;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+
+                         
+                        input.seek(index36_11);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
+                        int LA36_17 = input.LA(1);
+
+                         
+                        int index36_17 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 24;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+
+                         
+                        input.seek(index36_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
+                        int LA36_0 = input.LA(1);
+
+                         
+                        int index36_0 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifi!
 erKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 1;}
+
+                         
+                        input.seek(index36_0);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 4 : 
+                        int LA36_2 = input.LA(1);
+
+                         
+                        int index36_2 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_2==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(!
 2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 7;}
+
+                         
+                        input.seek(index36_2);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA36_14 = input.LA(1);
+
+                         
+                        int index36_14 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {s = 19;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {s = 20;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {s = 21;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {s = 22;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {s = 23;}
+
+                         
+                        input.seek(index36_14);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
+                        int LA36_1 = input.LA(1);
+
+                         
+                        int index36_1 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_1==MISC) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateL!
 T(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 2;}
+
+                        else if ( (LA36_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {s = 3;}
+
+                        else if ( (LA36_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 4;}
+
+                        else if ( (LA36_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {s = 5;}
+
+                        else if ( (LA36_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {s = 6;}
+
+                         
+                        input.seek(index36_1);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA36_10 = input.LA(1);
+
+                         
+                        int index36_10 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA36_10==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 12;}
+
+                        else if ( ((LA36_10>=VT_COMPILATION_UNIT && LA36_10<=STRING)||LA36_10==COMMA||(LA36_10>=AT && LA36_10<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 10;}
+
+                        else if ( (LA36_10==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 17;}
+
+                         
+                        input.seek(index36_10);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 8 : 
+                        int LA36_3 = input.LA(1);
+
+                         
+                        int index36_3 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 8;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {s = 9;}
+
+                         
+                        input.seek(index36_3);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 9 : 
+                        int LA36_12 = input.LA(1);
+
+                         
+                        int index36_12 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 8;}
+
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+
+                         
+                        input.seek(index36_12);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA36_4 = input.LA(1);
+
+                         
+                        int index36_4 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((LA36_4>=VT_COMPILATION_UNIT && LA36_4<=STRING)||LA36_4==COMMA||(LA36_4>=AT && LA36_4<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 10;}
+
+                        else if ( (LA36_4==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 11;}
+
+                        else if ( (LA36_4==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 12;}
+
+                         
+                        input.seek(index36_4);
+                        if ( s>=0 ) return s;
+                        break;
+            }
+            if (backtracking>0) {failed=true; return -1;}
+            NoViableAltException nvae =
+                new NoViableAltException(getDescription(), 36, _s, input);
+            error(nvae);
+            throw nvae;
+        }
+    }
+    static final String DFA53_eotS =
+        "\u0082\uffff";
+    static final String DFA53_eofS =
+        "\u0082\uffff";
+    static final String DFA53_minS =
+        "\3\123\2\0\1\123\1\0\1\uffff\1\123\1\163\2\uffff\1\124\1\123\1\uffff"+
+        "\1\124\1\130\1\123\1\163\1\123\1\124\1\123\1\124\1\130\1\123\2\0"+
+        "\1\123\1\163\2\123\2\0\1\123\1\0\1\4\11\123\2\uffff\1\124\1\130"+
+        "\1\123\1\0\2\123\1\4\11\123\1\0\1\uffff\1\123\1\uffff\1\4\32\0\1"+
+        "\uffff\23\0\1\uffff\17\0";
+    static final String DFA53_maxS =
+        "\2\130\1\162\2\0\1\130\1\0\1\uffff\1\123\1\163\2\uffff\1\162\1\123"+
+        "\1\uffff\2\162\1\123\1\163\1\132\1\162\1\132\3\162\2\0\1\123\1\163"+
+        "\1\132\1\162\2\0\1\123\1\0\1\u0080\1\123\7\161\1\123\2\uffff\3\162"+
+        "\1\0\1\141\1\123\1\u0080\1\123\7\161\1\123\1\0\1\uffff\1\162\1\uffff"+
+        "\1\u0080\32\0\1\uffff\23\0\1\uffff\17\0";
+    static final String DFA53_acceptS =
+        "\7\uffff\1\1\2\uffff\2\2\2\uffff\1\3\36\uffff\2\3\21\uffff\1\3\1"+
+        "\uffff\1\3\33\uffff\1\3\23\uffff\1\3\17\uffff";
+    static final String DFA53_specialS =
+        "\2\uffff\1\6\1\3\1\0\1\uffff\1\7\22\uffff\1\11\1\1\4\uffff\1\10"+
+        "\1\2\1\uffff\1\4\17\uffff\1\12\14\uffff\1\5\102\uffff}>";
+    static final String[] DFA53_transitionS = {
             "\1\2\4\uffff\1\1",
             "\1\3\4\uffff\1\4",
             "\1\7\1\10\3\uffff\1\6\3\uffff\1\5\25\uffff\1\11",
@@ -17200,70 +17560,69 @@
             "\1\36\4\uffff\1\37\1\uffff\1\40",
             "\1\21\3\uffff\1\23\31\uffff\1\22",
             "\1\23\31\uffff\1\22",
-            "\1\45\1\44\3\uffff\1\42\3\uffff\1\41\14\uffff\1\46\1\47\1"+
-            "\50\1\51\1\52\1\53\1\54\2\uffff\1\43",
+            "\1\45\1\44\3\uffff\1\42\3\uffff\1\41\14\uffff\1\46\1\47\1\50"+
+            "\1\51\1\52\1\53\1\54\2\uffff\1\43",
             "\1\uffff",
             "\1\uffff",
             "\1\57",
             "\1\60",
             "\1\61\4\uffff\1\62\1\uffff\1\63",
-            "\1\70\1\67\3\uffff\1\65\3\uffff\1\64\14\uffff\1\71\1\72\1"+
-            "\73\1\74\1\75\1\76\1\77\2\uffff\1\66",
+            "\1\67\1\66\3\uffff\1\77\3\uffff\1\64\14\uffff\1\70\1\71\1\72"+
+            "\1\73\1\74\1\75\1\76\2\uffff\1\65",
             "\1\uffff",
             "\1\uffff",
-            "\1\102",
+            "\1\101",
             "\1\uffff",
-            "\156\104\1\105\1\106\15\104",
-            "\1\107",
-            "\1\110\3\uffff\1\111\1\116\6\uffff\1\114\1\112\16\uffff\1"+
-            "\117\1\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\120\3\uffff\1\111\1\121\6\uffff\1\114\1\112\17\uffff\1"+
-            "\113\1\115",
-            "\1\122",
+            "\156\103\1\104\1\105\15\103",
+            "\1\106",
+            "\1\107\3\uffff\1\111\1\116\6\uffff\1\114\1\112\16\uffff\1\110"+
+            "\1\113\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\117\3\uffff\1\111\1\120\6\uffff\1\114\1\112\17\uffff\1\113"+
+            "\1\115",
+            "\1\121",
             "",
             "",
             "\1\33\3\uffff\1\35\31\uffff\1\34",
             "\1\35\31\uffff\1\34",
-            "\1\127\1\126\3\uffff\1\124\3\uffff\1\123\14\uffff\1\130\1"+
-            "\131\1\132\1\133\1\134\1\135\1\136\2\uffff\1\125",
+            "\1\126\1\125\3\uffff\1\123\3\uffff\1\122\14\uffff\1\127\1\130"+
+            "\1\131\1\132\1\133\1\134\1\135\2\uffff\1\124",
             "\1\uffff",
-            "\1\140\6\uffff\1\142\6\uffff\1\141",
-            "\1\143",
+            "\1\137\6\uffff\1\141\6\uffff\1\140",
+            "\1\142",
+            "\156\143\1\144\1\145\15\143",
+            "\1\146",
+            "\1\147\3\uffff\1\151\1\150\6\uffff\1\154\1\152\16\uffff\1\156"+
+            "\1\153\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\157\3\uffff\1\151\1\160\6\uffff\1\154\1\152\17\uffff\1\153"+
+            "\1\155",
+            "\1\161",
             "\1\uffff",
-            "\156\145\1\146\1\147\15\145",
-            "\1\150",
-            "\1\151\3\uffff\1\152\1\157\6\uffff\1\155\1\153\16\uffff\1"+
-            "\160\1\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\161\3\uffff\1\152\1\162\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
+            "",
+            "\1\165\1\164\3\uffff\1\175\1\u0081\1\32\6\uffff\1\u0080\1\177"+
+            "\5\uffff\1\176\1\166\1\167\1\170\1\171\1\172\1\173\1\174\2\uffff"+
             "\1\163",
             "",
-            "",
-            "\1\166\1\165\3\uffff\1\176\1\u0082\1\32\6\uffff\1\u0081\1"+
-            "\u0080\5\uffff\1\177\1\167\1\170\1\171\1\172\1\173\1\174\1\175"+
-            "\2\uffff\1\164",
-            "",
-            "\156\104\1\105\1\106\15\104",
+            "\156\103\1\104\1\105\15\103",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17295,7 +17654,6 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17311,6 +17669,7 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17328,91 +17687,91 @@
             "\1\uffff"
     };
 
-    static final short[] DFA52_eot = DFA.unpackEncodedString(DFA52_eotS);
-    static final short[] DFA52_eof = DFA.unpackEncodedString(DFA52_eofS);
-    static final char[] DFA52_min = DFA.unpackEncodedStringToUnsignedChars(DFA52_minS);
-    static final char[] DFA52_max = DFA.unpackEncodedStringToUnsignedChars(DFA52_maxS);
-    static final short[] DFA52_accept = DFA.unpackEncodedString(DFA52_acceptS);
-    static final short[] DFA52_special = DFA.unpackEncodedString(DFA52_specialS);
-    static final short[][] DFA52_transition;
+    static final short[] DFA53_eot = DFA.unpackEncodedString(DFA53_eotS);
+    static final short[] DFA53_eof = DFA.unpackEncodedString(DFA53_eofS);
+    static final char[] DFA53_min = DFA.unpackEncodedStringToUnsignedChars(DFA53_minS);
+    static final char[] DFA53_max = DFA.unpackEncodedStringToUnsignedChars(DFA53_maxS);
+    static final short[] DFA53_accept = DFA.unpackEncodedString(DFA53_acceptS);
+    static final short[] DFA53_special = DFA.unpackEncodedString(DFA53_specialS);
+    static final short[][] DFA53_transition;
 
     static {
-        int numStates = DFA52_transitionS.length;
-        DFA52_transition = new short[numStates][];
+        int numStates = DFA53_transitionS.length;
+        DFA53_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA52_transition[i] = DFA.unpackEncodedString(DFA52_transitionS[i]);
+            DFA53_transition[i] = DFA.unpackEncodedString(DFA53_transitionS[i]);
         }
     }
 
-    class DFA52 extends DFA {
+    class DFA53 extends DFA {
 
-        public DFA52(BaseRecognizer recognizer) {
+        public DFA53(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 52;
-            this.eot = DFA52_eot;
-            this.eof = DFA52_eof;
-            this.min = DFA52_min;
-            this.max = DFA52_max;
-            this.accept = DFA52_accept;
-            this.special = DFA52_special;
-            this.transition = DFA52_transition;
+            this.decisionNumber = 53;
+            this.eot = DFA53_eot;
+            this.eof = DFA53_eof;
+            this.min = DFA53_min;
+            this.max = DFA53_max;
+            this.accept = DFA53_accept;
+            this.special = DFA53_special;
+            this.transition = DFA53_transition;
         }
         public String getDescription() {
-            return "864:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "866:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA52_26 = input.LA(1);
+                        int LA53_4 = input.LA(1);
 
                          
-                        int index52_26 = input.index();
+                        int index53_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 11;}
 
                          
-                        input.seek(index52_26);
+                        input.seek(index53_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA52_32 = input.LA(1);
+                        int LA53_26 = input.LA(1);
 
                          
-                        int index52_32 = input.index();
+                        int index53_26 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 65;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index52_32);
+                        input.seek(index53_26);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA52_6 = input.LA(1);
+                        int LA53_32 = input.LA(1);
 
                          
-                        int index52_6 = input.index();
+                        int index53_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 14;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index52_6);
+                        input.seek(index53_32);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA52_3 = input.LA(1);
+                        int LA53_3 = input.LA(1);
 
                          
-                        int index52_3 = input.index();
+                        int index53_3 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
@@ -17420,168 +17779,168 @@
                         else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index52_3);
+                        input.seek(index53_3);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA52_4 = input.LA(1);
+                        int LA53_34 = input.LA(1);
 
                          
-                        int index52_4 = input.index();
+                        int index53_34 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (true) ) {s = 66;}
 
                          
-                        input.seek(index52_4);
+                        input.seek(index53_34);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA52_2 = input.LA(1);
+                        int LA53_63 = input.LA(1);
 
                          
-                        int index52_2 = input.index();
+                        int index53_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_2==COLON) ) {s = 5;}
+                        if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (LA52_2==LEFT_PAREN) ) {s = 6;}
+                        else if ( (true) ) {s = 114;}
 
-                        else if ( (LA52_2==ID) && (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierK!
 ey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||((synpred6()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))))) {s = 7;}
-
-                        else if ( (LA52_2==DOT) ) {s = 8;}
-
-                        else if ( (LA52_2==LEFT_SQUARE) ) {s = 9;}
-
                          
-                        input.seek(index52_2);
+                        input.seek(index53_63);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA52_53 = input.LA(1);
+                        int LA53_2 = input.LA(1);
 
                          
-                        int index52_53 = input.index();
+                        int index53_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (LA53_2==COLON) ) {s = 5;}
 
-                        else if ( (true) ) {s = 100;}
+                        else if ( (LA53_2==LEFT_PAREN) ) {s = 6;}
 
+                        else if ( (LA53_2==ID) && (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(!
 DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||((synpred6()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))))) {s = 7;}
+
+                        else if ( (LA53_2==DOT) ) {s = 8;}
+
+                        else if ( (LA53_2==LEFT_SQUARE) ) {s = 9;}
+
                          
-                        input.seek(index52_53);
+                        input.seek(index53_2);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA52_31 = input.LA(1);
+                        int LA53_6 = input.LA(1);
 
                          
-                        int index52_31 = input.index();
+                        int index53_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( ((synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 7;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (true) ) {s = 14;}
 
                          
-                        input.seek(index52_31);
+                        input.seek(index53_6);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA52_25 = input.LA(1);
+                        int LA53_31 = input.LA(1);
 
                          
-                        int index52_25 = input.index();
+                        int index53_31 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 64;}
 
                          
-                        input.seek(index52_25);
+                        input.seek(index53_31);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA52_50 = input.LA(1);
+                        int LA53_25 = input.LA(1);
 
                          
-                        int index52_50 = input.index();
+                        int index53_25 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 95;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index52_50);
+                        input.seek(index53_25);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA52_34 = input.LA(1);
+                        int LA53_50 = input.LA(1);
 
                          
-                        int index52_34 = input.index();
+                        int index53_50 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred6()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 67;}
+                        else if ( (true) ) {s = 94;}
 
                          
-                        input.seek(index52_34);
+                        input.seek(index53_50);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 52, _s, input);
+                new NoViableAltException(getDescription(), 53, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA53_eotS =
-        "\u0083\uffff";
-    static final String DFA53_eofS =
-        "\u0083\uffff";
-    static final String DFA53_minS =
-        "\3\123\2\0\2\123\1\163\1\0\3\uffff\1\124\1\123\1\124\1\130\1\uffff"+
-        "\1\123\1\163\1\123\1\124\1\123\1\124\1\130\1\123\2\0\1\123\1\163"+
-        "\2\123\2\0\1\123\1\4\11\123\1\0\2\uffff\1\124\1\130\1\123\1\0\2"+
-        "\123\1\4\11\123\1\0\2\uffff\1\123\1\4\16\0\1\uffff\14\0\1\uffff"+
-        "\23\0\1\uffff\17\0";
-    static final String DFA53_maxS =
-        "\2\130\1\162\2\0\1\130\1\123\1\163\1\0\3\uffff\1\162\1\123\2\162"+
-        "\1\uffff\1\123\1\163\1\132\1\162\1\132\3\162\2\0\1\123\1\163\1\132"+
-        "\1\162\2\0\1\123\1\u0080\1\123\7\161\1\123\1\0\2\uffff\3\162\1\0"+
-        "\1\141\1\123\1\u0080\1\123\7\161\1\123\1\0\2\uffff\1\162\1\u0080"+
+    static final String DFA54_eotS =
+        "\u0082\uffff";
+    static final String DFA54_eofS =
+        "\u0082\uffff";
+    static final String DFA54_minS =
+        "\3\123\2\0\1\123\1\0\1\uffff\1\123\1\163\2\uffff\1\124\1\123\1\uffff"+
+        "\1\124\1\130\1\123\1\163\1\123\1\124\1\123\1\124\1\130\1\123\2\0"+
+        "\1\123\1\163\2\123\2\0\1\123\1\4\11\123\1\0\2\uffff\1\124\1\130"+
+        "\1\123\1\0\2\123\1\4\11\123\1\0\1\uffff\1\123\1\4\16\0\1\uffff\14"+
+        "\0\1\uffff\23\0\1\uffff\17\0";
+    static final String DFA54_maxS =
+        "\2\130\1\162\2\0\1\130\1\0\1\uffff\1\123\1\163\2\uffff\1\162\1\123"+
+        "\1\uffff\2\162\1\123\1\163\1\132\1\162\1\132\3\162\2\0\1\123\1\163"+
+        "\1\132\1\162\2\0\1\123\1\u0080\1\123\7\161\1\123\1\0\2\uffff\3\162"+
+        "\1\0\1\141\1\123\1\u0080\1\123\7\161\1\123\1\0\1\uffff\1\162\1\u0080"+
         "\16\0\1\uffff\14\0\1\uffff\23\0\1\uffff\17\0";
-    static final String DFA53_acceptS =
-        "\11\uffff\1\1\2\2\4\uffff\1\3\34\uffff\2\3\21\uffff\2\3\20\uffff"+
-        "\1\3\14\uffff\1\3\23\uffff\1\3\17\uffff";
-    static final String DFA53_specialS =
-        "\2\uffff\1\6\1\0\1\4\3\uffff\1\2\20\uffff\1\10\1\1\4\uffff\1\11"+
-        "\1\5\13\uffff\1\7\5\uffff\1\12\14\uffff\1\3\103\uffff}>";
-    static final String[] DFA53_transitionS = {
+    static final String DFA54_acceptS =
+        "\7\uffff\1\1\2\uffff\2\2\2\uffff\1\3\36\uffff\2\3\21\uffff\1\3\20"+
+        "\uffff\1\3\14\uffff\1\3\23\uffff\1\3\17\uffff";
+    static final String DFA54_specialS =
+        "\2\uffff\1\4\1\10\1\0\1\uffff\1\2\22\uffff\1\7\1\12\4\uffff\1\6"+
+        "\1\1\13\uffff\1\11\5\uffff\1\5\14\uffff\1\3\102\uffff}>";
+    static final String[] DFA54_transitionS = {
             "\1\2\4\uffff\1\1",
             "\1\4\4\uffff\1\3",
-            "\1\11\1\6\3\uffff\1\10\3\uffff\1\5\25\uffff\1\7",
+            "\1\7\1\10\3\uffff\1\6\3\uffff\1\5\25\uffff\1\11",
             "\1\uffff",
             "\1\uffff",
             "\1\14\4\uffff\1\15",
-            "\1\16",
-            "\1\17",
             "\1\uffff",
             "",
+            "\1\17",
+            "\1\20",
             "",
             "",
             "\1\21\3\uffff\1\23\31\uffff\1\22",
             "\1\24",
-            "\1\6\3\uffff\1\25\31\uffff\1\7",
-            "\1\25\31\uffff\1\7",
             "",
+            "\1\10\3\uffff\1\25\31\uffff\1\11",
+            "\1\25\31\uffff\1\11",
             "\1\26",
             "\1\27",
             "\1\30\4\uffff\1\31\1\uffff\1\32",
@@ -17589,69 +17948,68 @@
             "\1\36\4\uffff\1\37\1\uffff\1\40",
             "\1\21\3\uffff\1\23\31\uffff\1\22",
             "\1\23\31\uffff\1\22",
-            "\1\44\1\43\3\uffff\1\54\3\uffff\1\41\14\uffff\1\45\1\46\1"+
-            "\47\1\50\1\51\1\52\1\53\2\uffff\1\42",
+            "\1\44\1\43\3\uffff\1\54\3\uffff\1\41\14\uffff\1\45\1\46\1\47"+
+            "\1\50\1\51\1\52\1\53\2\uffff\1\42",
             "\1\uffff",
             "\1\uffff",
             "\1\57",
             "\1\60",
             "\1\61\4\uffff\1\62\1\uffff\1\63",
-            "\1\67\1\66\3\uffff\1\77\3\uffff\1\64\14\uffff\1\70\1\71\1"+
-            "\72\1\73\1\74\1\75\1\76\2\uffff\1\65",
+            "\1\67\1\66\3\uffff\1\77\3\uffff\1\64\14\uffff\1\70\1\71\1\72"+
+            "\1\73\1\74\1\75\1\76\2\uffff\1\65",
             "\1\uffff",
             "\1\uffff",
-            "\1\102",
-            "\156\103\1\104\1\105\15\103",
-            "\1\106",
-            "\1\107\3\uffff\1\110\1\115\6\uffff\1\113\1\111\16\uffff\1"+
-            "\116\1\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\117\3\uffff\1\110\1\120\6\uffff\1\113\1\111\17\uffff\1"+
-            "\112\1\114",
-            "\1\121",
+            "\1\101",
+            "\156\102\1\103\1\104\15\102",
+            "\1\105",
+            "\1\106\3\uffff\1\107\1\114\6\uffff\1\112\1\110\16\uffff\1\115"+
+            "\1\111\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\17\uffff\1\111"+
+            "\1\113",
+            "\1\120",
             "\1\uffff",
             "",
             "",
             "\1\33\3\uffff\1\35\31\uffff\1\34",
             "\1\35\31\uffff\1\34",
-            "\1\126\1\125\3\uffff\1\136\3\uffff\1\123\14\uffff\1\127\1"+
-            "\130\1\131\1\132\1\133\1\134\1\135\2\uffff\1\124",
+            "\1\126\1\125\3\uffff\1\123\3\uffff\1\122\14\uffff\1\127\1\130"+
+            "\1\131\1\132\1\133\1\134\1\135\2\uffff\1\124",
             "\1\uffff",
-            "\1\140\6\uffff\1\142\6\uffff\1\141",
-            "\1\143",
-            "\156\144\1\145\1\146\15\144",
-            "\1\147",
-            "\1\150\3\uffff\1\152\1\157\6\uffff\1\155\1\153\16\uffff\1"+
-            "\151\1\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\160\3\uffff\1\152\1\161\6\uffff\1\155\1\153\17\uffff\1"+
-            "\154\1\156",
-            "\1\162",
+            "\1\137\6\uffff\1\141\6\uffff\1\140",
+            "\1\142",
+            "\156\143\1\144\1\145\15\143",
+            "\1\146",
+            "\1\147\3\uffff\1\150\1\155\6\uffff\1\153\1\151\16\uffff\1\156"+
+            "\1\152\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\17\uffff\1\152"+
+            "\1\154",
+            "\1\161",
             "\1\uffff",
             "",
-            "",
-            "\1\166\1\165\3\uffff\1\176\1\u0082\1\32\6\uffff\1\u0081\1"+
-            "\u0080\5\uffff\1\177\1\167\1\170\1\171\1\172\1\173\1\174\1\175"+
-            "\2\uffff\1\164",
-            "\156\103\1\104\1\105\15\103",
+            "\1\165\1\164\3\uffff\1\175\1\u0081\1\32\6\uffff\1\u0080\1\177"+
+            "\5\uffff\1\176\1\166\1\167\1\170\1\171\1\172\1\173\1\174\2\uffff"+
+            "\1\163",
+            "\156\102\1\103\1\104\15\102",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17717,233 +18075,233 @@
             "\1\uffff"
     };
 
-    static final short[] DFA53_eot = DFA.unpackEncodedString(DFA53_eotS);
-    static final short[] DFA53_eof = DFA.unpackEncodedString(DFA53_eofS);
-    static final char[] DFA53_min = DFA.unpackEncodedStringToUnsignedChars(DFA53_minS);
-    static final char[] DFA53_max = DFA.unpackEncodedStringToUnsignedChars(DFA53_maxS);
-    static final short[] DFA53_accept = DFA.unpackEncodedString(DFA53_acceptS);
-    static final short[] DFA53_special = DFA.unpackEncodedString(DFA53_specialS);
-    static final short[][] DFA53_transition;
+    static final short[] DFA54_eot = DFA.unpackEncodedString(DFA54_eotS);
+    static final short[] DFA54_eof = DFA.unpackEncodedString(DFA54_eofS);
+    static final char[] DFA54_min = DFA.unpackEncodedStringToUnsignedChars(DFA54_minS);
+    static final char[] DFA54_max = DFA.unpackEncodedStringToUnsignedChars(DFA54_maxS);
+    static final short[] DFA54_accept = DFA.unpackEncodedString(DFA54_acceptS);
+    static final short[] DFA54_special = DFA.unpackEncodedString(DFA54_specialS);
+    static final short[][] DFA54_transition;
 
     static {
-        int numStates = DFA53_transitionS.length;
-        DFA53_transition = new short[numStates][];
+        int numStates = DFA54_transitionS.length;
+        DFA54_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA53_transition[i] = DFA.unpackEncodedString(DFA53_transitionS[i]);
+            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
         }
     }
 
-    class DFA53 extends DFA {
+    class DFA54 extends DFA {
 
-        public DFA53(BaseRecognizer recognizer) {
+        public DFA54(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 53;
-            this.eot = DFA53_eot;
-            this.eof = DFA53_eof;
-            this.min = DFA53_min;
-            this.max = DFA53_max;
-            this.accept = DFA53_accept;
-            this.special = DFA53_special;
-            this.transition = DFA53_transition;
+            this.decisionNumber = 54;
+            this.eot = DFA54_eot;
+            this.eof = DFA54_eof;
+            this.min = DFA54_min;
+            this.max = DFA54_max;
+            this.accept = DFA54_accept;
+            this.special = DFA54_special;
+            this.transition = DFA54_transition;
         }
         public String getDescription() {
-            return "880:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "882:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA53_3 = input.LA(1);
+                        int LA54_4 = input.LA(1);
 
                          
-                        int index53_3 = input.index();
+                        int index54_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 10;}
+                        else if ( (true) ) {s = 11;}
 
                          
-                        input.seek(index53_3);
+                        input.seek(index54_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA53_26 = input.LA(1);
+                        int LA54_32 = input.LA(1);
 
                          
-                        int index53_26 = input.index();
+                        int index54_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
                         else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_26);
+                        input.seek(index54_32);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA53_8 = input.LA(1);
+                        int LA54_6 = input.LA(1);
 
                          
-                        int index53_8 = input.index();
+                        int index54_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT))))) ) {s = 9;}
+                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 7;}
 
-                        else if ( (true) ) {s = 16;}
+                        else if ( (true) ) {s = 14;}
 
                          
-                        input.seek(index53_8);
+                        input.seek(index54_6);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA53_63 = input.LA(1);
+                        int LA54_63 = input.LA(1);
 
                          
-                        int index53_63 = input.index();
+                        int index54_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 115;}
+                        else if ( (true) ) {s = 114;}
 
                          
-                        input.seek(index53_63);
+                        input.seek(index54_63);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA53_4 = input.LA(1);
+                        int LA54_2 = input.LA(1);
 
                          
-                        int index53_4 = input.index();
+                        int index54_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (LA54_2==COLON) ) {s = 5;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (LA54_2==LEFT_PAREN) ) {s = 6;}
 
+                        else if ( (LA54_2==ID) && (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||((synpred7()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred!
 7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))))) {s = 7;}
+
+                        else if ( (LA54_2==DOT) ) {s = 8;}
+
+                        else if ( (LA54_2==LEFT_SQUARE) ) {s = 9;}
+
                          
-                        input.seek(index53_4);
+                        input.seek(index54_2);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA53_32 = input.LA(1);
+                        int LA54_50 = input.LA(1);
 
                          
-                        int index53_32 = input.index();
+                        int index54_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 65;}
+                        else if ( (true) ) {s = 94;}
 
                          
-                        input.seek(index53_32);
+                        input.seek(index54_50);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA53_2 = input.LA(1);
+                        int LA54_31 = input.LA(1);
 
                          
-                        int index53_2 = input.index();
+                        int index54_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA53_2==COLON) ) {s = 5;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (LA53_2==DOT) ) {s = 6;}
+                        else if ( (true) ) {s = 64;}
 
-                        else if ( (LA53_2==LEFT_SQUARE) ) {s = 7;}
-
-                        else if ( (LA53_2==LEFT_PAREN) ) {s = 8;}
-
-                        else if ( (LA53_2==ID) && ((((synpred7()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred!
 7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))))) {s = 9;}
-
                          
-                        input.seek(index53_2);
+                        input.seek(index54_31);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA53_44 = input.LA(1);
+                        int LA54_25 = input.LA(1);
 
                          
-                        int index53_44 = input.index();
+                        int index54_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 82;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index53_44);
+                        input.seek(index54_25);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA53_25 = input.LA(1);
+                        int LA54_3 = input.LA(1);
 
                          
-                        int index53_25 = input.index();
+                        int index54_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index53_25);
+                        input.seek(index54_3);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA53_31 = input.LA(1);
+                        int LA54_44 = input.LA(1);
 
                          
-                        int index53_31 = input.index();
+                        int index54_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (true) ) {s = 81;}
 
                          
-                        input.seek(index53_31);
+                        input.seek(index54_44);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA53_50 = input.LA(1);
+                        int LA54_26 = input.LA(1);
 
                          
-                        int index53_50 = input.index();
+                        int index54_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 9;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 95;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_50);
+                        input.seek(index54_26);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 53, _s, input);
+                new NoViableAltException(getDescription(), 54, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA64_eotS =
+    static final String DFA65_eotS =
         "\13\uffff";
-    static final String DFA64_eofS =
+    static final String DFA65_eofS =
         "\13\uffff";
-    static final String DFA64_minS =
+    static final String DFA65_minS =
         "\1\123\1\130\2\4\1\0\1\123\1\0\4\uffff";
-    static final String DFA64_maxS =
+    static final String DFA65_maxS =
         "\1\123\1\130\2\u0080\1\0\1\132\1\0\4\uffff";
-    static final String DFA64_acceptS =
+    static final String DFA65_acceptS =
         "\7\uffff\1\1\1\2\1\1\1\2";
-    static final String DFA64_specialS =
-        "\1\2\1\4\1\6\1\0\1\5\1\1\1\3\4\uffff}>";
-    static final String[] DFA64_transitionS = {
+    static final String DFA65_specialS =
+        "\1\0\1\6\1\3\1\4\1\5\1\1\1\2\4\uffff}>";
+    static final String[] DFA65_transitionS = {
             "\1\1",
             "\1\2",
             "\124\3\1\4\1\3\1\5\46\3",
@@ -17957,119 +18315,123 @@
             ""
     };
 
-    static final short[] DFA64_eot = DFA.unpackEncodedString(DFA64_eotS);
-    static final short[] DFA64_eof = DFA.unpackEncodedString(DFA64_eofS);
-    static final char[] DFA64_min = DFA.unpackEncodedStringToUnsignedChars(DFA64_minS);
-    static final char[] DFA64_max = DFA.unpackEncodedStringToUnsignedChars(DFA64_maxS);
-    static final short[] DFA64_accept = DFA.unpackEncodedString(DFA64_acceptS);
-    static final short[] DFA64_special = DFA.unpackEncodedString(DFA64_specialS);
-    static final short[][] DFA64_transition;
+    static final short[] DFA65_eot = DFA.unpackEncodedString(DFA65_eotS);
+    static final short[] DFA65_eof = DFA.unpackEncodedString(DFA65_eofS);
+    static final char[] DFA65_min = DFA.unpackEncodedStringToUnsignedChars(DFA65_minS);
+    static final char[] DFA65_max = DFA.unpackEncodedStringToUnsignedChars(DFA65_maxS);
+    static final short[] DFA65_accept = DFA.unpackEncodedString(DFA65_acceptS);
+    static final short[] DFA65_special = DFA.unpackEncodedString(DFA65_specialS);
+    static final short[][] DFA65_transition;
 
     static {
-        int numStates = DFA64_transitionS.length;
-        DFA64_transition = new short[numStates][];
+        int numStates = DFA65_transitionS.length;
+        DFA65_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA64_transition[i] = DFA.unpackEncodedString(DFA64_transitionS[i]);
+            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
         }
     }
 
-    class DFA64 extends DFA {
+    class DFA65 extends DFA {
 
-        public DFA64(BaseRecognizer recognizer) {
+        public DFA65(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 64;
-            this.eot = DFA64_eot;
-            this.eof = DFA64_eof;
-            this.min = DFA64_min;
-            this.max = DFA64_max;
-            this.accept = DFA64_accept;
-            this.special = DFA64_special;
-            this.transition = DFA64_transition;
+            this.decisionNumber = 65;
+            this.eot = DFA65_eot;
+            this.eof = DFA65_eof;
+            this.min = DFA65_min;
+            this.max = DFA65_max;
+            this.accept = DFA65_accept;
+            this.special = DFA65_special;
+            this.transition = DFA65_transition;
         }
         public String getDescription() {
-            return "974:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?";
+            return "976:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA64_3 = input.LA(1);
+                        int LA65_0 = input.LA(1);
 
                          
-                        int index64_3 = input.index();
+                        int index65_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA64_3==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+                        if ( (LA65_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 1;}
 
-                        else if ( ((LA64_3>=VT_COMPILATION_UNIT && LA64_3<=STRING)||LA64_3==COMMA||(LA64_3>=AT && LA64_3<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
-
-                        else if ( (LA64_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 6;}
-
                          
-                        input.seek(index64_3);
+                        input.seek(index65_0);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA64_5 = input.LA(1);
+                        int LA65_5 = input.LA(1);
 
                          
-                        int index64_5 = input.index();
+                        int index65_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA64_5==ID||LA64_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {s = 9;}
+                        if ( (LA65_5==ID||LA65_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {s = 9;}
 
-                        else if ( (LA64_5==RIGHT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.RESULT)))) {s = 10;}
+                        else if ( (LA65_5==RIGHT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.RESULT)))) {s = 10;}
 
                          
-                        input.seek(index64_5);
+                        input.seek(index65_5);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA64_0 = input.LA(1);
+                        int LA65_6 = input.LA(1);
 
                          
-                        int index64_0 = input.index();
+                        int index65_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA64_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 1;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 9;}
 
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 10;}
+
                          
-                        input.seek(index64_0);
+                        input.seek(index65_6);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA64_6 = input.LA(1);
+                        int LA65_2 = input.LA(1);
 
                          
-                        int index64_6 = input.index();
+                        int index65_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 9;}
+                        if ( ((LA65_2>=VT_COMPILATION_UNIT && LA65_2<=STRING)||LA65_2==COMMA||(LA65_2>=AT && LA65_2<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 10;}
+                        else if ( (LA65_2==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 4;}
 
+                        else if ( (LA65_2==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+
                          
-                        input.seek(index64_6);
+                        input.seek(index65_2);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA64_1 = input.LA(1);
+                        int LA65_3 = input.LA(1);
 
                          
-                        int index64_1 = input.index();
+                        int index65_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA64_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 2;}
+                        if ( (LA65_3==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
 
+                        else if ( ((LA65_3>=VT_COMPILATION_UNIT && LA65_3<=STRING)||LA65_3==COMMA||(LA65_3>=AT && LA65_3<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
+
+                        else if ( (LA65_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 6;}
+
                          
-                        input.seek(index64_1);
+                        input.seek(index65_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA64_4 = input.LA(1);
+                        int LA65_4 = input.LA(1);
 
                          
-                        int index64_4 = input.index();
+                        int index65_4 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 7;}
@@ -18077,173 +18439,171 @@
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 8;}
 
                          
-                        input.seek(index64_4);
+                        input.seek(index65_4);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA64_2 = input.LA(1);
+                        int LA65_1 = input.LA(1);
 
                          
-                        int index64_2 = input.index();
+                        int index65_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA64_2>=VT_COMPILATION_UNIT && LA64_2<=STRING)||LA64_2==COMMA||(LA64_2>=AT && LA64_2<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
+                        if ( (LA65_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 2;}
 
-                        else if ( (LA64_2==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 4;}
-
-                        else if ( (LA64_2==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
-
                          
-                        input.seek(index64_2);
+                        input.seek(index65_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 64, _s, input);
+                new NoViableAltException(getDescription(), 65, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA67_eotS =
+    static final String DFA68_eotS =
         "\25\uffff";
-    static final String DFA67_eofS =
+    static final String DFA68_eofS =
         "\25\uffff";
-    static final String DFA67_minS =
-        "\1\122\1\4\1\uffff\1\4\1\0\2\uffff\1\4\2\0\3\4\1\0\1\4\1\uffff"+
-        "\1\4\4\0";
-    static final String DFA67_maxS =
-        "\1\164\1\u0080\1\uffff\1\u0080\1\0\2\uffff\1\u0080\2\0\3\u0080"+
-        "\1\0\1\u0080\1\uffff\1\u0080\4\0";
-    static final String DFA67_acceptS =
+    static final String DFA68_minS =
+        "\1\122\1\4\1\uffff\1\4\1\0\2\uffff\1\4\2\0\3\4\1\0\1\4\1\uffff\1"+
+        "\4\4\0";
+    static final String DFA68_maxS =
+        "\1\164\1\u0080\1\uffff\1\u0080\1\0\2\uffff\1\u0080\2\0\3\u0080\1"+
+        "\0\1\u0080\1\uffff\1\u0080\4\0";
+    static final String DFA68_acceptS =
         "\2\uffff\1\2\2\uffff\2\1\10\uffff\1\1\5\uffff";
-    static final String DFA67_specialS =
-        "\1\uffff\1\7\1\uffff\1\13\1\3\2\uffff\1\1\1\5\1\4\1\12\1\2\1\0"+
-        "\1\6\1\10\1\uffff\1\11\4\uffff}>";
-    static final String[] DFA67_transitionS = {
+    static final String DFA68_specialS =
+        "\1\uffff\1\5\1\uffff\1\0\1\10\2\uffff\1\12\1\3\1\11\1\4\1\6\1\1"+
+        "\1\2\1\13\1\uffff\1\7\4\uffff}>";
+    static final String[] DFA68_transitionS = {
             "\3\2\1\uffff\1\2\1\uffff\1\1\2\2\6\uffff\2\2\3\uffff\1\2\15"+
             "\uffff\1\2",
-            "\117\5\1\3\4\5\1\4\1\5\1\6\46\5",
+            "\117\6\1\3\4\6\1\4\1\6\1\5\46\6",
             "",
-            "\117\5\1\11\1\12\3\5\1\10\1\5\1\6\1\5\1\7\25\5\1\13\16\5",
+            "\117\6\1\11\1\12\3\6\1\10\1\6\1\5\1\6\1\7\25\6\1\13\16\6",
             "\1\uffff",
             "",
             "",
-            "\117\5\1\14\4\5\1\15\1\5\1\6\46\5",
+            "\117\6\1\14\4\6\1\15\1\6\1\5\46\6",
             "\1\uffff",
             "\1\uffff",
-            "\117\5\1\16\4\5\1\17\1\5\1\6\46\5",
-            "\124\5\1\17\1\5\1\6\30\5\1\20\15\5",
-            "\120\5\1\21\3\5\1\23\1\5\1\6\27\5\1\22\16\5",
+            "\117\6\1\16\4\6\1\17\1\6\1\5\46\6",
+            "\124\6\1\17\1\6\1\5\30\6\1\20\15\6",
+            "\120\6\1\21\3\6\1\23\1\6\1\5\27\6\1\22\16\6",
             "\1\uffff",
-            "\120\5\1\12\3\5\1\24\1\5\1\6\27\5\1\13\16\5",
+            "\120\6\1\12\3\6\1\24\1\6\1\5\27\6\1\13\16\6",
             "",
-            "\124\5\1\24\1\5\1\6\27\5\1\13\16\5",
+            "\124\6\1\24\1\6\1\5\27\6\1\13\16\6",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff"
     };
 
-    static final short[] DFA67_eot = DFA.unpackEncodedString(DFA67_eotS);
-    static final short[] DFA67_eof = DFA.unpackEncodedString(DFA67_eofS);
-    static final char[] DFA67_min = DFA.unpackEncodedStringToUnsignedChars(DFA67_minS);
-    static final char[] DFA67_max = DFA.unpackEncodedStringToUnsignedChars(DFA67_maxS);
-    static final short[] DFA67_accept = DFA.unpackEncodedString(DFA67_acceptS);
-    static final short[] DFA67_special = DFA.unpackEncodedString(DFA67_specialS);
-    static final short[][] DFA67_transition;
+    static final short[] DFA68_eot = DFA.unpackEncodedString(DFA68_eotS);
+    static final short[] DFA68_eof = DFA.unpackEncodedString(DFA68_eofS);
+    static final char[] DFA68_min = DFA.unpackEncodedStringToUnsignedChars(DFA68_minS);
+    static final char[] DFA68_max = DFA.unpackEncodedStringToUnsignedChars(DFA68_maxS);
+    static final short[] DFA68_accept = DFA.unpackEncodedString(DFA68_acceptS);
+    static final short[] DFA68_special = DFA.unpackEncodedString(DFA68_specialS);
+    static final short[][] DFA68_transition;
 
     static {
-        int numStates = DFA67_transitionS.length;
-        DFA67_transition = new short[numStates][];
+        int numStates = DFA68_transitionS.length;
+        DFA68_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA67_transition[i] = DFA.unpackEncodedString(DFA67_transitionS[i]);
+            DFA68_transition[i] = DFA.unpackEncodedString(DFA68_transitionS[i]);
         }
     }
 
-    class DFA67 extends DFA {
+    class DFA68 extends DFA {
 
-        public DFA67(BaseRecognizer recognizer) {
+        public DFA68(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 67;
-            this.eot = DFA67_eot;
-            this.eof = DFA67_eof;
-            this.min = DFA67_min;
-            this.max = DFA67_max;
-            this.accept = DFA67_accept;
-            this.special = DFA67_special;
-            this.transition = DFA67_transition;
+            this.decisionNumber = 68;
+            this.eot = DFA68_eot;
+            this.eof = DFA68_eof;
+            this.min = DFA68_min;
+            this.max = DFA68_max;
+            this.accept = DFA68_accept;
+            this.special = DFA68_special;
+            this.transition = DFA68_transition;
         }
         public String getDescription() {
-            return "1049:3: ( ( LEFT_PAREN )=>args= paren_chunk )?";
+            return "1051:3: ( ( LEFT_PAREN )=>args= paren_chunk )?";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA67_12 = input.LA(1);
+                        int LA68_3 = input.LA(1);
 
                          
-                        int index67_12 = input.index();
+                        int index68_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_12==DOT) ) {s = 17;}
+                        if ( (LA68_3==COLON) ) {s = 7;}
 
-                        else if ( (LA67_12==LEFT_SQUARE) ) {s = 18;}
+                        else if ( (LA68_3==LEFT_PAREN) ) {s = 8;}
 
-                        else if ( (LA67_12==LEFT_PAREN) ) {s = 19;}
+                        else if ( (LA68_3==ID) ) {s = 9;}
 
-                        else if ( (LA67_12==RIGHT_PAREN) && (synpred8())) {s = 6;}
+                        else if ( (LA68_3==DOT) ) {s = 10;}
 
-                        else if ( ((LA67_12>=VT_COMPILATION_UNIT && LA67_12<=ID)||(LA67_12>=DOT_STAR && LA67_12<=STRING)||LA67_12==COMMA||(LA67_12>=AT && LA67_12<=NULL)||(LA67_12>=RIGHT_SQUARE && LA67_12<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+                        else if ( (LA68_3==LEFT_SQUARE) ) {s = 11;}
 
+                        else if ( (LA68_3==RIGHT_PAREN) && (synpred8())) {s = 5;}
+
+                        else if ( ((LA68_3>=VT_COMPILATION_UNIT && LA68_3<=SEMICOLON)||(LA68_3>=DOT_STAR && LA68_3<=STRING)||LA68_3==COMMA||LA68_3==AT||(LA68_3>=EQUALS && LA68_3<=NULL)||(LA68_3>=RIGHT_SQUARE && LA68_3<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
+
                          
-                        input.seek(index67_12);
+                        input.seek(index68_3);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA67_7 = input.LA(1);
+                        int LA68_12 = input.LA(1);
 
                          
-                        int index67_7 = input.index();
+                        int index68_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_7==ID) ) {s = 12;}
+                        if ( (LA68_12==DOT) ) {s = 17;}
 
-                        else if ( (LA67_7==LEFT_PAREN) ) {s = 13;}
+                        else if ( (LA68_12==LEFT_SQUARE) ) {s = 18;}
 
-                        else if ( (LA67_7==RIGHT_PAREN) && (synpred8())) {s = 6;}
+                        else if ( (LA68_12==LEFT_PAREN) ) {s = 19;}
 
-                        else if ( ((LA67_7>=VT_COMPILATION_UNIT && LA67_7<=SEMICOLON)||(LA67_7>=DOT && LA67_7<=STRING)||LA67_7==COMMA||(LA67_7>=AT && LA67_7<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+                        else if ( (LA68_12==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
+                        else if ( ((LA68_12>=VT_COMPILATION_UNIT && LA68_12<=ID)||(LA68_12>=DOT_STAR && LA68_12<=STRING)||LA68_12==COMMA||(LA68_12>=AT && LA68_12<=NULL)||(LA68_12>=RIGHT_SQUARE && LA68_12<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
+
                          
-                        input.seek(index67_7);
+                        input.seek(index68_12);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA67_11 = input.LA(1);
+                        int LA68_13 = input.LA(1);
 
                          
-                        int index67_11 = input.index();
+                        int index68_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_11==RIGHT_SQUARE) ) {s = 16;}
+                        if ( (synpred8()) ) {s = 15;}
 
-                        else if ( (LA67_11==RIGHT_PAREN) && (synpred8())) {s = 6;}
+                        else if ( (true) ) {s = 2;}
 
-                        else if ( ((LA67_11>=VT_COMPILATION_UNIT && LA67_11<=STRING)||LA67_11==COMMA||(LA67_11>=AT && LA67_11<=LEFT_SQUARE)||(LA67_11>=THEN && LA67_11<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
-
-                        else if ( (LA67_11==LEFT_PAREN) && (synpred8())) {s = 15;}
-
                          
-                        input.seek(index67_11);
+                        input.seek(index68_13);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA67_4 = input.LA(1);
+                        int LA68_8 = input.LA(1);
 
                          
-                        int index67_4 = input.index();
+                        int index68_8 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred8()) ) {s = 6;}
@@ -18251,390 +18611,198 @@
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index67_4);
+                        input.seek(index68_8);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA67_9 = input.LA(1);
+                        int LA68_10 = input.LA(1);
 
                          
-                        int index67_9 = input.index();
+                        int index68_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (LA68_10==ID) ) {s = 14;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA68_10==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
+                        else if ( ((LA68_10>=VT_COMPILATION_UNIT && LA68_10<=SEMICOLON)||(LA68_10>=DOT && LA68_10<=STRING)||LA68_10==COMMA||(LA68_10>=AT && LA68_10<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
+
+                        else if ( (LA68_10==LEFT_PAREN) && (synpred8())) {s = 15;}
+
                          
-                        input.seek(index67_9);
+                        input.seek(index68_10);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA67_8 = input.LA(1);
+                        int LA68_1 = input.LA(1);
 
                          
-                        int index67_8 = input.index();
+                        int index68_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (LA68_1==ID) ) {s = 3;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA68_1==LEFT_PAREN) ) {s = 4;}
 
+                        else if ( (LA68_1==RIGHT_PAREN) && (synpred8())) {s = 5;}
+
+                        else if ( ((LA68_1>=VT_COMPILATION_UNIT && LA68_1<=SEMICOLON)||(LA68_1>=DOT && LA68_1<=STRING)||LA68_1==COMMA||(LA68_1>=AT && LA68_1<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
+
                          
-                        input.seek(index67_8);
+                        input.seek(index68_1);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA67_13 = input.LA(1);
+                        int LA68_11 = input.LA(1);
 
                          
-                        int index67_13 = input.index();
+                        int index68_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 15;}
+                        if ( (LA68_11==RIGHT_SQUARE) ) {s = 16;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA68_11==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
+                        else if ( ((LA68_11>=VT_COMPILATION_UNIT && LA68_11<=STRING)||LA68_11==COMMA||(LA68_11>=AT && LA68_11<=LEFT_SQUARE)||(LA68_11>=THEN && LA68_11<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
+
+                        else if ( (LA68_11==LEFT_PAREN) && (synpred8())) {s = 15;}
+
                          
-                        input.seek(index67_13);
+                        input.seek(index68_11);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA67_1 = input.LA(1);
+                        int LA68_16 = input.LA(1);
 
                          
-                        int index67_1 = input.index();
+                        int index68_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_1==ID) ) {s = 3;}
+                        if ( (LA68_16==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (LA67_1==LEFT_PAREN) ) {s = 4;}
+                        else if ( (LA68_16==LEFT_SQUARE) ) {s = 11;}
 
-                        else if ( ((LA67_1>=VT_COMPILATION_UNIT && LA67_1<=SEMICOLON)||(LA67_1>=DOT && LA67_1<=STRING)||LA67_1==COMMA||(LA67_1>=AT && LA67_1<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+                        else if ( (LA68_16==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
-                        else if ( (LA67_1==RIGHT_PAREN) && (synpred8())) {s = 6;}
+                        else if ( ((LA68_16>=VT_COMPILATION_UNIT && LA68_16<=STRING)||LA68_16==COMMA||(LA68_16>=AT && LA68_16<=NULL)||(LA68_16>=RIGHT_SQUARE && LA68_16<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
 
                          
-                        input.seek(index67_1);
+                        input.seek(index68_16);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA67_14 = input.LA(1);
+                        int LA68_4 = input.LA(1);
 
                          
-                        int index67_14 = input.index();
+                        int index68_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_14==LEFT_SQUARE) ) {s = 11;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (LA67_14==LEFT_PAREN) ) {s = 20;}
+                        else if ( (true) ) {s = 2;}
 
-                        else if ( (LA67_14==DOT) ) {s = 10;}
-
-                        else if ( (LA67_14==RIGHT_PAREN) && (synpred8())) {s = 6;}
-
-                        else if ( ((LA67_14>=VT_COMPILATION_UNIT && LA67_14<=ID)||(LA67_14>=DOT_STAR && LA67_14<=STRING)||LA67_14==COMMA||(LA67_14>=AT && LA67_14<=NULL)||(LA67_14>=RIGHT_SQUARE && LA67_14<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
-
                          
-                        input.seek(index67_14);
+                        input.seek(index68_4);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA67_16 = input.LA(1);
+                        int LA68_9 = input.LA(1);
 
                          
-                        int index67_16 = input.index();
+                        int index68_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_16==LEFT_PAREN) ) {s = 20;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (LA67_16==LEFT_SQUARE) ) {s = 11;}
+                        else if ( (true) ) {s = 2;}
 
-                        else if ( (LA67_16==RIGHT_PAREN) && (synpred8())) {s = 6;}
-
-                        else if ( ((LA67_16>=VT_COMPILATION_UNIT && LA67_16<=STRING)||LA67_16==COMMA||(LA67_16>=AT && LA67_16<=NULL)||(LA67_16>=RIGHT_SQUARE && LA67_16<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
-
                          
-                        input.seek(index67_16);
+                        input.seek(index68_9);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA67_10 = input.LA(1);
+                        int LA68_7 = input.LA(1);
 
                          
-                        int index67_10 = input.index();
+                        int index68_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_10==ID) ) {s = 14;}
+                        if ( (LA68_7==ID) ) {s = 12;}
 
-                        else if ( (LA67_10==RIGHT_PAREN) && (synpred8())) {s = 6;}
+                        else if ( (LA68_7==LEFT_PAREN) ) {s = 13;}
 
-                        else if ( ((LA67_10>=VT_COMPILATION_UNIT && LA67_10<=SEMICOLON)||(LA67_10>=DOT && LA67_10<=STRING)||LA67_10==COMMA||(LA67_10>=AT && LA67_10<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+                        else if ( (LA68_7==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
-                        else if ( (LA67_10==LEFT_PAREN) && (synpred8())) {s = 15;}
+                        else if ( ((LA68_7>=VT_COMPILATION_UNIT && LA68_7<=SEMICOLON)||(LA68_7>=DOT && LA68_7<=STRING)||LA68_7==COMMA||(LA68_7>=AT && LA68_7<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
 
                          
-                        input.seek(index67_10);
+                        input.seek(index68_7);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA67_3 = input.LA(1);
+                        int LA68_14 = input.LA(1);
 
                          
-                        int index67_3 = input.index();
+                        int index68_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA67_3==COLON) ) {s = 7;}
+                        if ( (LA68_14==LEFT_SQUARE) ) {s = 11;}
 
-                        else if ( (LA67_3==LEFT_PAREN) ) {s = 8;}
+                        else if ( (LA68_14==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (LA67_3==ID) ) {s = 9;}
+                        else if ( (LA68_14==DOT) ) {s = 10;}
 
-                        else if ( (LA67_3==DOT) ) {s = 10;}
+                        else if ( (LA68_14==RIGHT_PAREN) && (synpred8())) {s = 5;}
 
-                        else if ( (LA67_3==LEFT_SQUARE) ) {s = 11;}
+                        else if ( ((LA68_14>=VT_COMPILATION_UNIT && LA68_14<=ID)||(LA68_14>=DOT_STAR && LA68_14<=STRING)||LA68_14==COMMA||(LA68_14>=AT && LA68_14<=NULL)||(LA68_14>=RIGHT_SQUARE && LA68_14<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 6;}
 
-                        else if ( (LA67_3==RIGHT_PAREN) && (synpred8())) {s = 6;}
-
-                        else if ( ((LA67_3>=VT_COMPILATION_UNIT && LA67_3<=SEMICOLON)||(LA67_3>=DOT_STAR && LA67_3<=STRING)||LA67_3==COMMA||LA67_3==AT||(LA67_3>=EQUALS && LA67_3<=NULL)||(LA67_3>=RIGHT_SQUARE && LA67_3<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
-
                          
-                        input.seek(index67_3);
+                        input.seek(index68_14);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 67, _s, input);
+                new NoViableAltException(getDescription(), 68, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA69_eotS =
-        "\27\uffff";
-    static final String DFA69_eofS =
-        "\27\uffff";
-    static final String DFA69_minS =
-        "\1\122\1\4\2\uffff\1\4\1\0\1\uffff\1\4\2\0\3\4\1\0\3\4\1\0\1\4"+
-        "\2\0\1\4\1\0";
-    static final String DFA69_maxS =
-        "\1\164\1\u0080\2\uffff\1\u0080\1\0\1\uffff\1\u0080\2\0\3\u0080"+
-        "\1\0\3\u0080\1\0\1\u0080\2\0\1\u0080\1\0";
-    static final String DFA69_acceptS =
-        "\2\uffff\1\2\1\3\2\uffff\1\1\20\uffff";
-    static final String DFA69_specialS =
-        "\5\uffff\1\6\2\uffff\1\1\1\0\3\uffff\1\2\3\uffff\1\4\1\uffff\1"+
-        "\3\1\5\2\uffff}>";
-    static final String[] DFA69_transitionS = {
-            "\3\3\1\uffff\1\3\1\uffff\1\1\2\3\6\uffff\2\3\3\uffff\1\3\13"+
-            "\uffff\1\2\1\uffff\1\3",
-            "\117\6\1\4\4\6\1\5\50\6",
-            "",
-            "",
-            "\117\6\1\11\1\12\3\6\1\10\3\6\1\7\25\6\1\13\16\6",
-            "\1\uffff",
-            "",
-            "\117\6\1\14\4\6\1\15\50\6",
-            "\1\uffff",
-            "\1\uffff",
-            "\117\6\1\16\55\6",
-            "\157\6\1\17\15\6",
-            "\120\6\1\20\3\6\1\21\31\6\1\22\16\6",
-            "\1\uffff",
-            "\120\6\1\12\3\6\1\23\31\6\1\13\16\6",
-            "\124\6\1\24\31\6\1\13\16\6",
-            "\117\6\1\25\55\6",
-            "\1\uffff",
-            "\157\6\1\26\15\6",
-            "\1\uffff",
-            "\1\uffff",
-            "\120\6\1\20\3\6\1\21\31\6\1\22\16\6",
-            "\1\uffff"
-    };
-
-    static final short[] DFA69_eot = DFA.unpackEncodedString(DFA69_eotS);
-    static final short[] DFA69_eof = DFA.unpackEncodedString(DFA69_eofS);
-    static final char[] DFA69_min = DFA.unpackEncodedStringToUnsignedChars(DFA69_minS);
-    static final char[] DFA69_max = DFA.unpackEncodedStringToUnsignedChars(DFA69_maxS);
-    static final short[] DFA69_accept = DFA.unpackEncodedString(DFA69_acceptS);
-    static final short[] DFA69_special = DFA.unpackEncodedString(DFA69_specialS);
-    static final short[][] DFA69_transition;
-
-    static {
-        int numStates = DFA69_transitionS.length;
-        DFA69_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA69_transition[i] = DFA.unpackEncodedString(DFA69_transitionS[i]);
-        }
-    }
-
-    class DFA69 extends DFA {
-
-        public DFA69(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 69;
-            this.eot = DFA69_eot;
-            this.eof = DFA69_eof;
-            this.min = DFA69_min;
-            this.max = DFA69_max;
-            this.accept = DFA69_accept;
-            this.special = DFA69_special;
-            this.transition = DFA69_transition;
-        }
-        public String getDescription() {
-            return "1063:4: ({...}? paren_chunk | square_chunk )?";
-        }
-        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA69_9 = input.LA(1);
-
-                         
-                        int index69_9 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_9);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA69_8 = input.LA(1);
-
-                         
-                        int index69_8 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_8);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA69_13 = input.LA(1);
-
-                         
-                        int index69_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA69_19 = input.LA(1);
-
-                         
-                        int index69_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA69_17 = input.LA(1);
-
-                         
-                        int index69_17 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_17);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA69_20 = input.LA(1);
-
-                         
-                        int index69_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA69_5 = input.LA(1);
-
-                         
-                        int index69_5 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (input.LA(1) == LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (true) ) {s = 3;}
-
-                         
-                        input.seek(index69_5);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (backtracking>0) {failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 69, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA82_eotS =
+    static final String DFA83_eotS =
         "\40\uffff";
-    static final String DFA82_eofS =
+    static final String DFA83_eofS =
         "\40\uffff";
-    static final String DFA82_minS =
-        "\1\131\1\uffff\2\123\1\uffff\1\0\1\123\1\0\1\123\1\4\6\0\1\162"+
-        "\1\4\2\0\1\4\13\0";
-    static final String DFA82_maxS =
-        "\1\142\1\uffff\1\157\1\162\1\uffff\1\0\1\162\1\0\1\123\1\u0080"+
-        "\6\0\1\162\1\u0080\2\0\1\u0080\13\0";
-    static final String DFA82_acceptS =
+    static final String DFA83_minS =
+        "\1\131\1\uffff\2\123\1\uffff\1\0\1\123\1\0\1\123\6\0\1\4\1\162\1"+
+        "\4\2\0\1\4\13\0";
+    static final String DFA83_maxS =
+        "\1\142\1\uffff\1\157\1\162\1\uffff\1\0\1\162\1\0\1\123\6\0\1\u0080"+
+        "\1\162\1\u0080\2\0\1\u0080\13\0";
+    static final String DFA83_acceptS =
         "\1\uffff\1\2\2\uffff\1\1\33\uffff";
-    static final String DFA82_specialS =
-        "\2\uffff\1\14\1\12\1\uffff\1\13\1\11\1\2\2\uffff\1\7\1\3\1\1\1"+
-        "\5\1\4\1\10\2\uffff\1\6\1\0\14\uffff}>";
-    static final String[] DFA82_transitionS = {
+    static final String DFA83_specialS =
+        "\2\uffff\1\1\1\4\1\uffff\1\7\1\13\1\6\1\uffff\1\3\1\11\1\2\1\14"+
+        "\1\5\1\10\3\uffff\1\0\1\12\14\uffff}>";
+    static final String[] DFA83_transitionS = {
             "\2\1\6\uffff\1\2\1\1",
             "",
             "\1\3\4\uffff\1\5\20\uffff\7\4",
-            "\1\6\1\1\2\uffff\1\4\1\7\3\uffff\1\1\2\uffff\2\4\10\uffff"+
-            "\6\1\1\10\2\4\1\1",
+            "\1\6\1\1\2\uffff\1\4\1\7\3\uffff\1\1\2\uffff\2\4\10\uffff\6"+
+            "\1\1\10\2\4\1\1",
             "",
             "\1\uffff",
-            "\1\12\1\4\2\uffff\1\13\1\11\2\4\4\uffff\1\16\1\14\2\4\14\uffff"+
-            "\1\1\1\15\1\17\1\4",
+            "\1\11\1\4\2\uffff\1\12\1\17\2\4\4\uffff\1\15\1\13\2\4\14\uffff"+
+            "\1\1\1\14\1\16\1\4",
             "\1\uffff",
             "\1\20",
-            "\117\31\1\21\3\31\1\24\1\22\1\31\1\23\4\31\1\27\1\25\17\31"+
-            "\1\26\1\30\17\31",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "\117\31\1\21\3\31\1\24\1\22\1\31\1\23\4\31\1\27\1\25\17\31\1"+
+            "\26\1\30\17\31",
             "\1\32",
             "\120\31\1\36\3\31\1\35\1\37\1\33\27\31\1\34\16\31",
             "\1\uffff",
@@ -18653,46 +18821,46 @@
             "\1\uffff"
     };
 
-    static final short[] DFA82_eot = DFA.unpackEncodedString(DFA82_eotS);
-    static final short[] DFA82_eof = DFA.unpackEncodedString(DFA82_eofS);
-    static final char[] DFA82_min = DFA.unpackEncodedStringToUnsignedChars(DFA82_minS);
-    static final char[] DFA82_max = DFA.unpackEncodedStringToUnsignedChars(DFA82_maxS);
-    static final short[] DFA82_accept = DFA.unpackEncodedString(DFA82_acceptS);
-    static final short[] DFA82_special = DFA.unpackEncodedString(DFA82_specialS);
-    static final short[][] DFA82_transition;
+    static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);
+    static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);
+    static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);
+    static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);
+    static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);
+    static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);
+    static final short[][] DFA83_transition;
 
     static {
-        int numStates = DFA82_transitionS.length;
-        DFA82_transition = new short[numStates][];
+        int numStates = DFA83_transitionS.length;
+        DFA83_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA82_transition[i] = DFA.unpackEncodedString(DFA82_transitionS[i]);
+            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
         }
     }
 
-    class DFA82 extends DFA {
+    class DFA83 extends DFA {
 
-        public DFA82(BaseRecognizer recognizer) {
+        public DFA83(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 82;
-            this.eot = DFA82_eot;
-            this.eof = DFA82_eof;
-            this.min = DFA82_min;
-            this.max = DFA82_max;
-            this.accept = DFA82_accept;
-            this.special = DFA82_special;
-            this.transition = DFA82_transition;
+            this.decisionNumber = 83;
+            this.eot = DFA83_eot;
+            this.eof = DFA83_eof;
+            this.min = DFA83_min;
+            this.max = DFA83_max;
+            this.accept = DFA83_accept;
+            this.special = DFA83_special;
+            this.transition = DFA83_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1173:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
+            return "()* loopback of 1175:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA82_19 = input.LA(1);
+                        int LA83_18 = input.LA(1);
 
                          
-                        int index82_19 = input.index();
+                        int index83_18 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18700,29 +18868,31 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_19);
+                        input.seek(index83_18);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA82_12 = input.LA(1);
+                        int LA83_2 = input.LA(1);
 
                          
-                        int index82_12 = input.index();
+                        int index83_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA83_2==ID) ) {s = 3;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( ((LA83_2>=EQUAL && LA83_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
+                        else if ( (LA83_2==LEFT_PAREN) ) {s = 5;}
+
                          
-                        input.seek(index82_12);
+                        input.seek(index83_2);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA82_7 = input.LA(1);
+                        int LA83_11 = input.LA(1);
 
                          
-                        int index82_7 = input.index();
+                        int index83_11 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18730,14 +18900,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_7);
+                        input.seek(index83_11);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA82_11 = input.LA(1);
+                        int LA83_9 = input.LA(1);
 
                          
-                        int index82_11 = input.index();
+                        int index83_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18745,29 +18915,35 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_11);
+                        input.seek(index83_9);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA82_14 = input.LA(1);
+                        int LA83_3 = input.LA(1);
 
                          
-                        int index82_14 = input.index();
+                        int index83_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA83_3==DOT||LA83_3==COLON||(LA83_3>=EQUAL && LA83_3<=NOT_EQUAL)||LA83_3==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA83_3==ID) ) {s = 6;}
 
+                        else if ( (LA83_3==STRING||(LA83_3>=BOOL && LA83_3<=INT)||(LA83_3>=FLOAT && LA83_3<=NULL)) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA83_3==LEFT_PAREN) ) {s = 7;}
+
+                        else if ( (LA83_3==GRAVE_ACCENT) ) {s = 8;}
+
                          
-                        input.seek(index82_14);
+                        input.seek(index83_3);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA82_13 = input.LA(1);
+                        int LA83_13 = input.LA(1);
 
                          
-                        int index82_13 = input.index();
+                        int index83_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18775,14 +18951,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_13);
+                        input.seek(index83_13);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA82_18 = input.LA(1);
+                        int LA83_7 = input.LA(1);
 
                          
-                        int index82_18 = input.index();
+                        int index83_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18790,14 +18966,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_18);
+                        input.seek(index83_7);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA82_10 = input.LA(1);
+                        int LA83_5 = input.LA(1);
 
                          
-                        int index82_10 = input.index();
+                        int index83_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18805,14 +18981,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_10);
+                        input.seek(index83_5);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA82_15 = input.LA(1);
+                        int LA83_14 = input.LA(1);
 
                          
-                        int index82_15 = input.index();
+                        int index83_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18820,145 +18996,137 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_15);
+                        input.seek(index83_14);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA82_6 = input.LA(1);
+                        int LA83_10 = input.LA(1);
 
                          
-                        int index82_6 = input.index();
+                        int index83_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA82_6==LEFT_PAREN) ) {s = 9;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA82_6==ID) ) {s = 10;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA82_6==STRING) ) {s = 11;}
-
-                        else if ( (LA82_6==INT) ) {s = 12;}
-
-                        else if ( (LA82_6==FLOAT) ) {s = 13;}
-
-                        else if ( (LA82_6==BOOL) ) {s = 14;}
-
-                        else if ( (LA82_6==NULL) ) {s = 15;}
-
-                        else if ( (LA82_6==GRAVE_ACCENT) ) {s = 1;}
-
-                        else if ( (LA82_6==DOT||(LA82_6>=COMMA && LA82_6<=RIGHT_PAREN)||(LA82_6>=DOUBLE_PIPE && LA82_6<=DOUBLE_AMPER)||LA82_6==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
-
                          
-                        input.seek(index82_6);
+                        input.seek(index83_10);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA82_3 = input.LA(1);
+                        int LA83_19 = input.LA(1);
 
                          
-                        int index82_3 = input.index();
+                        int index83_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA82_3==DOT||LA82_3==COLON||(LA82_3>=EQUAL && LA82_3<=NOT_EQUAL)||LA82_3==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA82_3==ID) ) {s = 6;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA82_3==STRING||(LA82_3>=BOOL && LA82_3<=INT)||(LA82_3>=FLOAT && LA82_3<=NULL)) && ((validateRestr()))) {s = 4;}
-
-                        else if ( (LA82_3==LEFT_PAREN) ) {s = 7;}
-
-                        else if ( (LA82_3==GRAVE_ACCENT) ) {s = 8;}
-
                          
-                        input.seek(index82_3);
+                        input.seek(index83_19);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA82_5 = input.LA(1);
+                        int LA83_6 = input.LA(1);
 
                          
-                        int index82_5 = input.index();
+                        int index83_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA83_6==ID) ) {s = 9;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA83_6==STRING) ) {s = 10;}
 
+                        else if ( (LA83_6==INT) ) {s = 11;}
+
+                        else if ( (LA83_6==FLOAT) ) {s = 12;}
+
+                        else if ( (LA83_6==BOOL) ) {s = 13;}
+
+                        else if ( (LA83_6==NULL) ) {s = 14;}
+
+                        else if ( (LA83_6==LEFT_PAREN) ) {s = 15;}
+
+                        else if ( (LA83_6==DOT||(LA83_6>=COMMA && LA83_6<=RIGHT_PAREN)||(LA83_6>=DOUBLE_PIPE && LA83_6<=DOUBLE_AMPER)||LA83_6==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA83_6==GRAVE_ACCENT) ) {s = 1;}
+
                          
-                        input.seek(index82_5);
+                        input.seek(index83_6);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA82_2 = input.LA(1);
+                        int LA83_12 = input.LA(1);
 
                          
-                        int index82_2 = input.index();
+                        int index83_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA82_2==ID) ) {s = 3;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( ((LA82_2>=EQUAL && LA82_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA82_2==LEFT_PAREN) ) {s = 5;}
-
                          
-                        input.seek(index82_2);
+                        input.seek(index83_12);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 82, _s, input);
+                new NoViableAltException(getDescription(), 83, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA83_eotS =
+    static final String DFA84_eotS =
         "\75\uffff";
-    static final String DFA83_eofS =
+    static final String DFA84_eofS =
         "\75\uffff";
-    static final String DFA83_minS =
-        "\1\131\1\uffff\3\123\1\uffff\2\123\1\4\1\123\7\0\1\4\1\162\3\4"+
-        "\47\0";
-    static final String DFA83_maxS =
-        "\1\142\1\uffff\1\157\1\162\1\157\1\uffff\1\162\1\123\1\u0080\1"+
-        "\162\7\0\1\u0080\1\162\3\u0080\47\0";
-    static final String DFA83_acceptS =
-        "\1\uffff\1\2\3\uffff\1\1\67\uffff";
-    static final String DFA83_specialS =
-        "\2\uffff\1\5\1\11\1\1\1\uffff\1\0\2\uffff\1\12\1\3\1\13\1\4\1\2"+
-        "\1\6\1\7\1\10\54\uffff}>";
-    static final String[] DFA83_transitionS = {
+    static final String DFA84_minS =
+        "\1\131\1\uffff\2\123\1\uffff\3\123\1\4\1\123\1\0\1\4\6\0\1\162\1"+
+        "\4\2\0\2\4\45\0";
+    static final String DFA84_maxS =
+        "\1\142\1\uffff\1\157\1\162\1\uffff\1\157\1\162\1\123\1\u0080\1\162"+
+        "\1\0\1\u0080\6\0\1\162\1\u0080\2\0\2\u0080\45\0";
+    static final String DFA84_acceptS =
+        "\1\uffff\1\2\2\uffff\1\1\70\uffff";
+    static final String DFA84_specialS =
+        "\2\uffff\1\2\1\7\1\uffff\1\5\1\12\2\uffff\1\10\1\4\1\uffff\1\6\1"+
+        "\0\1\3\1\14\1\1\1\13\2\uffff\1\15\1\11\47\uffff}>";
+    static final String[] DFA84_transitionS = {
             "\2\1\6\uffff\1\1\1\2",
             "",
-            "\1\3\4\uffff\1\4\20\uffff\7\5",
-            "\1\6\1\1\2\uffff\1\5\1\10\3\uffff\1\1\2\uffff\2\5\10\uffff"+
-            "\6\1\1\7\2\5\1\1",
-            "\1\11\4\uffff\1\12\20\uffff\7\5",
+            "\1\3\4\uffff\1\5\20\uffff\7\4",
+            "\1\6\1\1\2\uffff\1\4\1\10\3\uffff\1\1\2\uffff\2\4\10\uffff\6"+
+            "\1\1\7\2\4\1\1",
             "",
-            "\1\13\1\5\2\uffff\1\14\1\21\2\5\4\uffff\1\17\1\15\2\5\14\uffff"+
-            "\1\1\1\16\1\20\1\5",
+            "\1\11\4\uffff\1\12\20\uffff\7\4",
+            "\1\14\1\4\2\uffff\1\15\1\13\2\4\4\uffff\1\20\1\16\2\4\14\uffff"+
+            "\1\1\1\17\1\21\1\4",
             "\1\22",
-            "\117\42\1\23\3\42\1\24\1\31\1\42\1\33\4\42\1\27\1\25\10\42"+
-            "\1\32\1\34\1\35\1\36\1\37\1\40\1\41\1\26\1\30\17\42",
-            "\1\44\1\1\2\uffff\1\5\1\43\3\uffff\1\1\2\uffff\2\5\10\uffff"+
-            "\6\1\1\45\2\5\1\1",
+            "\117\42\1\23\3\42\1\26\1\24\1\42\1\25\4\42\1\31\1\27\10\42\1"+
+            "\33\1\34\1\35\1\36\1\37\1\40\1\41\1\30\1\32\17\42",
+            "\1\44\1\1\2\uffff\1\4\1\43\3\uffff\1\1\2\uffff\2\4\10\uffff"+
+            "\6\1\1\45\2\4\1\1",
             "\1\uffff",
+            "\117\55\1\46\3\55\1\47\1\54\1\55\1\56\4\55\1\52\1\50\17\55\1"+
+            "\51\1\53\17\55",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\117\55\1\46\3\55\1\47\1\54\1\55\1\56\4\55\1\52\1\50\17\55"+
-            "\1\51\1\53\17\55",
             "\1\57",
-            "\117\42\1\61\1\72\2\42\1\62\1\60\1\73\1\67\4\42\1\65\1\63"+
-            "\16\42\1\70\1\64\1\66\1\71\16\42",
-            "\124\42\1\74\1\73\1\67\46\42",
-            "\124\42\1\74\1\73\1\67\46\42",
+            "\117\42\1\61\1\71\2\42\1\63\1\62\1\72\1\60\4\42\1\66\1\64\16"+
+            "\42\1\73\1\65\1\67\1\70\16\42",
             "\1\uffff",
             "\1\uffff",
+            "\124\42\1\74\1\72\1\60\46\42",
+            "\124\42\1\74\1\72\1\60\46\42",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18998,255 +19166,285 @@
             "\1\uffff"
     };
 
-    static final short[] DFA83_eot = DFA.unpackEncodedString(DFA83_eotS);
-    static final short[] DFA83_eof = DFA.unpackEncodedString(DFA83_eofS);
-    static final char[] DFA83_min = DFA.unpackEncodedStringToUnsignedChars(DFA83_minS);
-    static final char[] DFA83_max = DFA.unpackEncodedStringToUnsignedChars(DFA83_maxS);
-    static final short[] DFA83_accept = DFA.unpackEncodedString(DFA83_acceptS);
-    static final short[] DFA83_special = DFA.unpackEncodedString(DFA83_specialS);
-    static final short[][] DFA83_transition;
+    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
+    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
+    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
+    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
+    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
+    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
+    static final short[][] DFA84_transition;
 
     static {
-        int numStates = DFA83_transitionS.length;
-        DFA83_transition = new short[numStates][];
+        int numStates = DFA84_transitionS.length;
+        DFA84_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
+            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
         }
     }
 
-    class DFA83 extends DFA {
+    class DFA84 extends DFA {
 
-        public DFA83(BaseRecognizer recognizer) {
+        public DFA84(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 83;
-            this.eot = DFA83_eot;
-            this.eof = DFA83_eof;
-            this.min = DFA83_min;
-            this.max = DFA83_max;
-            this.accept = DFA83_accept;
-            this.special = DFA83_special;
-            this.transition = DFA83_transition;
+            this.decisionNumber = 84;
+            this.eot = DFA84_eot;
+            this.eof = DFA84_eof;
+            this.min = DFA84_min;
+            this.max = DFA84_max;
+            this.accept = DFA84_accept;
+            this.special = DFA84_special;
+            this.transition = DFA84_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1178:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
+            return "()* loopback of 1180:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA83_6 = input.LA(1);
+                        int LA84_13 = input.LA(1);
 
                          
-                        int index83_6 = input.index();
+                        int index84_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_6==ID) ) {s = 11;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA83_6==STRING) ) {s = 12;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_6==INT) ) {s = 13;}
-
-                        else if ( (LA83_6==FLOAT) ) {s = 14;}
-
-                        else if ( (LA83_6==BOOL) ) {s = 15;}
-
-                        else if ( (LA83_6==NULL) ) {s = 16;}
-
-                        else if ( (LA83_6==LEFT_PAREN) ) {s = 17;}
-
-                        else if ( (LA83_6==GRAVE_ACCENT) ) {s = 1;}
-
-                        else if ( (LA83_6==DOT||(LA83_6>=COMMA && LA83_6<=RIGHT_PAREN)||(LA83_6>=DOUBLE_PIPE && LA83_6<=DOUBLE_AMPER)||LA83_6==LEFT_SQUARE) && ((validateRestr()))) {s = 5;}
-
                          
-                        input.seek(index83_6);
+                        input.seek(index84_13);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA83_4 = input.LA(1);
+                        int LA84_16 = input.LA(1);
 
                          
-                        int index83_4 = input.index();
+                        int index84_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_4==ID) ) {s = 9;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( ((LA83_4>=EQUAL && LA83_4<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 5;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_4==LEFT_PAREN) ) {s = 10;}
-
                          
-                        input.seek(index83_4);
+                        input.seek(index84_16);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA83_13 = input.LA(1);
+                        int LA84_2 = input.LA(1);
 
                          
-                        int index83_13 = input.index();
+                        int index84_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( (LA84_2==ID) ) {s = 3;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( ((LA84_2>=EQUAL && LA84_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
+                        else if ( (LA84_2==LEFT_PAREN) ) {s = 5;}
+
                          
-                        input.seek(index83_13);
+                        input.seek(index84_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA83_10 = input.LA(1);
+                        int LA84_14 = input.LA(1);
 
                          
-                        int index83_10 = input.index();
+                        int index84_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_10);
+                        input.seek(index84_14);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA83_12 = input.LA(1);
+                        int LA84_10 = input.LA(1);
 
                          
-                        int index83_12 = input.index();
+                        int index84_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_12);
+                        input.seek(index84_10);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA83_2 = input.LA(1);
+                        int LA84_5 = input.LA(1);
 
                          
-                        int index83_2 = input.index();
+                        int index84_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_2==ID) ) {s = 3;}
+                        if ( (LA84_5==ID) ) {s = 9;}
 
-                        else if ( (LA83_2==LEFT_PAREN) ) {s = 4;}
+                        else if ( (LA84_5==LEFT_PAREN) ) {s = 10;}
 
-                        else if ( ((LA83_2>=EQUAL && LA83_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 5;}
+                        else if ( ((LA84_5>=EQUAL && LA84_5<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
                          
-                        input.seek(index83_2);
+                        input.seek(index84_5);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA83_14 = input.LA(1);
+                        int LA84_12 = input.LA(1);
 
                          
-                        int index83_14 = input.index();
+                        int index84_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_14);
+                        input.seek(index84_12);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA83_15 = input.LA(1);
+                        int LA84_3 = input.LA(1);
 
                          
-                        int index83_15 = input.index();
+                        int index84_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( (LA84_3==DOT||LA84_3==COLON||(LA84_3>=EQUAL && LA84_3<=NOT_EQUAL)||LA84_3==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA84_3==ID) ) {s = 6;}
 
+                        else if ( (LA84_3==GRAVE_ACCENT) ) {s = 7;}
+
+                        else if ( (LA84_3==LEFT_PAREN) ) {s = 8;}
+
+                        else if ( (LA84_3==STRING||(LA84_3>=BOOL && LA84_3<=INT)||(LA84_3>=FLOAT && LA84_3<=NULL)) && ((validateRestr()))) {s = 4;}
+
                          
-                        input.seek(index83_15);
+                        input.seek(index84_3);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA83_16 = input.LA(1);
+                        int LA84_9 = input.LA(1);
 
                          
-                        int index83_16 = input.index();
+                        int index84_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( (LA84_9==DOT||LA84_9==COLON||(LA84_9>=EQUAL && LA84_9<=NOT_EQUAL)||LA84_9==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA84_9==LEFT_PAREN) ) {s = 35;}
 
+                        else if ( (LA84_9==ID) ) {s = 36;}
+
+                        else if ( (LA84_9==STRING||(LA84_9>=BOOL && LA84_9<=INT)||(LA84_9>=FLOAT && LA84_9<=NULL)) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA84_9==GRAVE_ACCENT) ) {s = 37;}
+
                          
-                        input.seek(index83_16);
+                        input.seek(index84_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA83_3 = input.LA(1);
+                        int LA84_21 = input.LA(1);
 
                          
-                        int index83_3 = input.index();
+                        int index84_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_3==DOT||LA83_3==COLON||(LA83_3>=EQUAL && LA83_3<=NOT_EQUAL)||LA83_3==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA83_3==ID) ) {s = 6;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_3==GRAVE_ACCENT) ) {s = 7;}
+                         
+                        input.seek(index84_21);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 10 : 
+                        int LA84_6 = input.LA(1);
 
-                        else if ( (LA83_3==LEFT_PAREN) ) {s = 8;}
+                         
+                        int index84_6 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( (LA84_6==LEFT_PAREN) ) {s = 11;}
 
-                        else if ( (LA83_3==STRING||(LA83_3>=BOOL && LA83_3<=INT)||(LA83_3>=FLOAT && LA83_3<=NULL)) && ((validateRestr()))) {s = 5;}
+                        else if ( (LA84_6==ID) ) {s = 12;}
 
+                        else if ( (LA84_6==STRING) ) {s = 13;}
+
+                        else if ( (LA84_6==INT) ) {s = 14;}
+
+                        else if ( (LA84_6==FLOAT) ) {s = 15;}
+
+                        else if ( (LA84_6==BOOL) ) {s = 16;}
+
+                        else if ( (LA84_6==NULL) ) {s = 17;}
+
+                        else if ( (LA84_6==DOT||(LA84_6>=COMMA && LA84_6<=RIGHT_PAREN)||(LA84_6>=DOUBLE_PIPE && LA84_6<=DOUBLE_AMPER)||LA84_6==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA84_6==GRAVE_ACCENT) ) {s = 1;}
+
                          
-                        input.seek(index83_3);
+                        input.seek(index84_6);
                         if ( s>=0 ) return s;
                         break;
-                    case 10 : 
-                        int LA83_9 = input.LA(1);
+                    case 11 : 
+                        int LA84_17 = input.LA(1);
 
                          
-                        int index83_9 = input.index();
+                        int index84_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_9==DOT||LA83_9==COLON||(LA83_9>=EQUAL && LA83_9<=NOT_EQUAL)||LA83_9==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA83_9==LEFT_PAREN) ) {s = 35;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_9==ID) ) {s = 36;}
+                         
+                        input.seek(index84_17);
+                        if ( s>=0 ) return s;
+                        break;
+                    case 12 : 
+                        int LA84_15 = input.LA(1);
 
-                        else if ( (LA83_9==GRAVE_ACCENT) ) {s = 37;}
+                         
+                        int index84_15 = input.index();
+                        input.rewind();
+                        s = -1;
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA83_9==STRING||(LA83_9>=BOOL && LA83_9<=INT)||(LA83_9>=FLOAT && LA83_9<=NULL)) && ((validateRestr()))) {s = 5;}
+                        else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_9);
+                        input.seek(index84_15);
                         if ( s>=0 ) return s;
                         break;
-                    case 11 : 
-                        int LA83_11 = input.LA(1);
+                    case 13 : 
+                        int LA84_20 = input.LA(1);
 
                          
-                        int index83_11 = input.index();
+                        int index84_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 5;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_11);
+                        input.seek(index84_20);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 83, _s, input);
+                new NoViableAltException(getDescription(), 84, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -19370,330 +19568,331 @@
     public static final BitSet FOLLOW_STRING_in_date_effective1759 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_date_expires_key_in_date_expires1773 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
     public static final BitSet FOLLOW_STRING_in_date_expires1778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_key_in_enabled1793 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1798 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_salience_key_in_salience1813 = new BitSet(new long[]{0x0000000000000000L,0x0000000101000000L});
-    public static final BitSet FOLLOW_INT_in_salience1822 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_salience1831 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_key_in_no_loop1846 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_key_in_auto_focus1866 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_key_in_activation_group1888 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1893 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_key_in_ruleflow_group1907 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_key_in_agenda_group1926 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1931 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_key_in_duration1945 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
-    public static final BitSet FOLLOW_INT_in_duration1950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_key_in_dialect1966 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    public static final BitSet FOLLOW_STRING_in_dialect1971 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_key_in_lock_on_active1989 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1994 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block2009 = new BitSet(new long[]{0x0000000000000002L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs2030 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2054 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_or_key_in_lhs_or2064 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2072 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2078 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2101 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
-    public static final BitSet FOLLOW_or_key_in_lhs_or2123 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_lhs_or2130 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2141 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2182 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_and_key_in_lhs_and2192 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2200 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2230 = new BitSet(new long[]{0x0000000000000002L,0x0000000400080000L});
-    public static final BitSet FOLLOW_and_key_in_lhs_and2252 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_lhs_and2259 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2270 = new BitSet(new long[]{0x0000000000000002L,0x0000000400080000L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2301 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_lhs_not_binding_in_lhs_unary2309 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2315 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2321 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2327 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2333 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2344 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2350 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2358 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_lhs_unary2372 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_exists_key_in_lhs_exist2388 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2422 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2430 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2452 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_not_key_in_lhs_not_binding2498 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_not_binding2500 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_not_key_in_lhs_not2523 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2552 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2561 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2577 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_eval_key_in_lhs_eval2616 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2625 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_forall_key_in_lhs_forall2652 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2657 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2665 = new BitSet(new long[]{0x0000000000000000L,0x0000000004080000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2671 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2707 = new BitSet(new long[]{0x0000000000000002L,0x0000001800000000L});
-    public static final BitSet FOLLOW_over_clause_in_pattern_source2711 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
-    public static final BitSet FOLLOW_FROM_in_pattern_source2721 = new BitSet(new long[]{0x0000000000000000L,0x000000A000080000L});
-    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_collect_statement_in_pattern_source2757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2774 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_pattern_source2790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OVER_in_over_clause2822 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_over_elements_in_over_clause2827 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_COMMA_in_over_clause2834 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_over_elements_in_over_clause2839 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ID_in_over_elements2854 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_over_elements2861 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_over_elements2870 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_over_elements2877 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2903 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2912 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2920 = new BitSet(new long[]{0x0000000000000000L,0x0000004002080000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2925 = new BitSet(new long[]{0x0000000000000000L,0x0000004000080000L});
-    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_statement2935 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_statement2941 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2949 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause2995 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3006 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3011 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_action_key_in_accumulate_init_clause3022 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3026 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3031 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_reverse_key_in_accumulate_init_clause3044 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3048 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3053 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_result_key_in_accumulate_init_clause3068 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3074 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3132 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3156 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_accumulate_paren_chunk_data3168 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3184 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3195 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_accumulate_id_clause3211 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_id_clause3217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_collect_statement3239 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3248 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_pattern_source_in_collect_statement3255 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3260 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_entry_point_key_in_entrypoint_statement3287 = new BitSet(new long[]{0x0000000000000000L,0x0000000000880000L});
-    public static final BitSet FOLLOW_entrypoint_id_in_entrypoint_statement3295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_entrypoint_id3321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_entrypoint_id3338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_source3358 = new BitSet(new long[]{0x0000000000000002L,0x0000000001100000L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source3373 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source3380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOT_in_expression_chain3413 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_expression_chain3420 = new BitSet(new long[]{0x0000000000000002L,0x0004000001100000L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3436 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain3450 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain3461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern3494 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_pattern3507 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_label_in_fact_binding3527 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3533 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3540 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_fact_binding_expression_in_fact_binding3548 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3556 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_fact_binding_expression3597 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
-    public static final BitSet FOLLOW_or_key_in_fact_binding_expression3609 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3615 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_fact_in_fact_binding_expression3620 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
-    public static final BitSet FOLLOW_pattern_type_in_fact3660 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3665 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
-    public static final BitSet FOLLOW_constraints_in_fact3676 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3682 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints3716 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_COMMA_in_constraints3720 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_constraint_in_constraints3727 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_or_constr_in_constraint3741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3752 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3756 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3763 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3778 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3782 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3789 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_eval_key_in_unary_constr3822 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_unary_constr3825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_unary_constr3830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3836 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
-    public static final BitSet FOLLOW_or_constr_in_unary_constr3846 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_label_in_field_constraint3871 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3873 = new BitSet(new long[]{0x0000000000000002L,0x0000FF0001080000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3880 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ARROW_in_field_constraint3886 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_field_constraint3890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3944 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3946 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_label3971 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_label3978 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3999 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective4005 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4013 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4028 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective4034 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4041 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression4063 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression4068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression4073 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4082 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4087 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EQUAL_in_simple_operator4116 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_GREATER_in_simple_operator4124 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_GREATER_EQUAL_in_simple_operator4132 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_LESS_in_simple_operator4140 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_LESS_EQUAL_in_simple_operator4148 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_NOT_EQUAL_in_simple_operator4156 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_not_key_in_simple_operator4164 = new BitSet(new long[]{0x0000000000000000L,0x0000800000080000L});
-    public static final BitSet FOLLOW_contains_key_in_simple_operator4171 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4178 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_matches_key_in_simple_operator4185 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_memberof_key_in_simple_operator4192 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4201 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4212 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4220 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4226 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_contains_key_in_simple_operator4232 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_excludes_key_in_simple_operator4238 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_matches_key_in_simple_operator4244 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4250 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_memberof_key_in_simple_operator4256 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4264 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4274 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4282 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4288 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator4295 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_in_key_in_compound_operator4313 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_not_key_in_compound_operator4318 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_in_key_in_compound_operator4320 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4331 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4339 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator4343 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4348 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_expression_value4377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value4382 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_value4388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint4407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint4414 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4421 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint4428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint4435 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_pattern_type4450 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
-    public static final BitSet FOLLOW_DOT_in_pattern_type4456 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_pattern_type4460 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
-    public static final BitSet FOLLOW_dimension_definition_in_pattern_type4475 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_ID_in_data_type4503 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
-    public static final BitSet FOLLOW_DOT_in_data_type4509 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_data_type4513 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
-    public static final BitSet FOLLOW_dimension_definition_in_data_type4518 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dimension_definition4547 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dimension_definition4554 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4568 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_DOT_in_accessor_path4572 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4576 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_ID_in_accessor_element4600 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_accessor_element4606 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_data_in_rhs_chunk4635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk_data4654 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_rhs_chunk_data4667 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_END_in_rhs_chunk_data4680 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_rhs_chunk_data4686 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk4705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk_data4728 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_curly_chunk_data4740 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk_data4756 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk_data4767 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk4788 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk_data4812 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_paren_chunk_data4824 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk_data4840 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk_data4851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk4872 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk_data4895 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_square_chunk_data4907 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk_data4922 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk_data4933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4957 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4961 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4965 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4969 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_date_effective_key5005 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_date_effective_key5009 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_date_effective_key5013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_date_expires_key5045 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_date_expires_key5049 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_date_expires_key5053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_no_loop_key5085 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_no_loop_key5089 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_no_loop_key5093 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_auto_focus_key5125 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_auto_focus_key5129 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_auto_focus_key5133 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_activation_group_key5165 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_activation_group_key5169 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_activation_group_key5173 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_agenda_group_key5205 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_agenda_group_key5209 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_agenda_group_key5213 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5245 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_ruleflow_group_key5249 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_entry_point_key5285 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_entry_point_key5289 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_entry_point_key5293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_duration_key5322 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_package_key5349 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_key5376 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_dialect_key5403 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_salience_key5430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_enabled_key5457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_attributes_key5484 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_rule_key5511 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_template_key5538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_query_key5565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_declare_key5592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_function_key5619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_global_key5646 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_eval_key5673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_contains_key5700 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_matches_key5727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_excludes_key5754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_soundslike_key5781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_memberof_key5808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_not_key5835 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_in_key5862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_or_key5889 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_and_key5916 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_exists_key5943 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_forall_key5970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_action_key5997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_reverse_key6024 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_result_key6051 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred12045 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_or_key_in_synpred12047 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_or_key_in_synpred22114 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred22116 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred32173 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_and_key_in_synpred32175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred42243 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred42245 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SEMICOLON_in_synpred52368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred62405 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_or_key_in_synpred62408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred62410 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred72533 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_or_key_in_synpred72536 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred72538 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred83367 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_key_in_enabled1793 = new BitSet(new long[]{0x0000000000000000L,0x0000000081000000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1806 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_enabled1817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_salience_key_in_salience1837 = new BitSet(new long[]{0x0000000000000000L,0x0000000101000000L});
+    public static final BitSet FOLLOW_INT_in_salience1846 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1855 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_key_in_no_loop1870 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1875 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_key_in_auto_focus1890 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1895 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_key_in_activation_group1912 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1917 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_key_in_ruleflow_group1931 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1936 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_key_in_agenda_group1950 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1955 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_key_in_duration1969 = new BitSet(new long[]{0x0000000000000000L,0x0000000100000000L});
+    public static final BitSet FOLLOW_INT_in_duration1974 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_key_in_dialect1990 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_STRING_in_dialect1995 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_key_in_lock_on_active2013 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active2018 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block2033 = new BitSet(new long[]{0x0000000000000002L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs2054 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2078 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2088 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2096 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2102 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2125 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2147 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_lhs_or2154 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2165 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2206 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2216 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2224 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2230 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2254 = new BitSet(new long[]{0x0000000000000002L,0x0000000400080000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2276 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_lhs_and2283 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2294 = new BitSet(new long[]{0x0000000000000002L,0x0000000400080000L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2325 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_lhs_not_binding_in_lhs_unary2333 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2339 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2345 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2351 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2357 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2368 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2374 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2382 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_lhs_unary2396 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_exists_key_in_lhs_exist2412 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2439 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2446 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2454 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2461 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2476 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not_binding2522 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_not_binding2524 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not2547 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2569 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2576 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2585 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2591 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2601 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_eval_key_in_lhs_eval2640 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2649 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_forall_key_in_lhs_forall2676 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2681 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2689 = new BitSet(new long[]{0x0000000000000000L,0x0000000004080000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2695 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2731 = new BitSet(new long[]{0x0000000000000002L,0x0000001800000000L});
+    public static final BitSet FOLLOW_over_clause_in_pattern_source2735 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2745 = new BitSet(new long[]{0x0000000000000000L,0x000000A000080000L});
+    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_collect_statement_in_pattern_source2781 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2798 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_pattern_source2814 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OVER_in_over_clause2846 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2851 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
+    public static final BitSet FOLLOW_COMMA_in_over_clause2858 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2863 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2878 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_COLON_in_over_elements2885 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2894 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_over_elements2901 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2927 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2936 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2944 = new BitSet(new long[]{0x0000000000000000L,0x0000004002080000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2949 = new BitSet(new long[]{0x0000000000000000L,0x0000004000080000L});
+    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_statement2959 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_statement2965 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2973 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause3019 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3030 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3035 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_action_key_in_accumulate_init_clause3046 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3050 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3055 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_reverse_key_in_accumulate_init_clause3068 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3072 = new BitSet(new long[]{0x0000000000000000L,0x0000000002080000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3077 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_result_key_in_accumulate_init_clause3092 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3098 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3156 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3180 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_accumulate_paren_chunk_data3192 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3208 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3219 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_accumulate_id_clause3235 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_id_clause3241 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement3263 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3272 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_pattern_source_in_collect_statement3279 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3284 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entry_point_key_in_entrypoint_statement3311 = new BitSet(new long[]{0x0000000000000000L,0x0000000000880000L});
+    public static final BitSet FOLLOW_entrypoint_id_in_entrypoint_statement3319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entrypoint_id3345 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_entrypoint_id3362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source3382 = new BitSet(new long[]{0x0000000000000002L,0x0000000001100000L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source3397 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source3404 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOT_in_expression_chain3437 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_expression_chain3444 = new BitSet(new long[]{0x0000000000000002L,0x0004000001100000L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3460 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain3474 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain3485 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern3518 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern3531 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_fact_binding3551 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3557 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3564 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_fact_binding_expression_in_fact_binding3572 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3621 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
+    public static final BitSet FOLLOW_or_key_in_fact_binding_expression3633 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3639 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3644 = new BitSet(new long[]{0x0000000000000002L,0x0000000200080000L});
+    public static final BitSet FOLLOW_pattern_type_in_fact3684 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3689 = new BitSet(new long[]{0x0000000000000000L,0x0000000005080000L});
+    public static final BitSet FOLLOW_constraints_in_fact3700 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3706 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints3740 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
+    public static final BitSet FOLLOW_COMMA_in_constraints3744 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_constraint_in_constraints3751 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
+    public static final BitSet FOLLOW_or_constr_in_constraint3765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3776 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3780 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3787 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3802 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3806 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3813 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_eval_key_in_unary_constr3846 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_unary_constr3849 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr3854 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3860 = new BitSet(new long[]{0x0000000000000000L,0x0000000001080000L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr3870 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3875 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_field_constraint3895 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3897 = new BitSet(new long[]{0x0000000000000002L,0x0000FF0001080000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ARROW_in_field_constraint3910 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_field_constraint3914 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3968 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3970 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_label3995 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
+    public static final BitSet FOLLOW_COLON_in_label4002 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4023 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective4029 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4037 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4052 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective4058 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4065 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression4087 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression4092 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression4097 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0001080000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4106 = new BitSet(new long[]{0x0000000000000000L,0x0000000004000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4111 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EQUAL_in_simple_operator4140 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_GREATER_in_simple_operator4148 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_GREATER_EQUAL_in_simple_operator4156 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_LESS_in_simple_operator4164 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_LESS_EQUAL_in_simple_operator4172 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_NOT_EQUAL_in_simple_operator4180 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_not_key_in_simple_operator4188 = new BitSet(new long[]{0x0000000000000000L,0x0000800000080000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4195 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4202 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4209 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4216 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4225 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4236 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4244 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4250 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4256 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_excludes_key_in_simple_operator4262 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4268 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4274 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4280 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4288 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4298 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4306 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4312 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator4319 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4337 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_not_key_in_compound_operator4342 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4344 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4355 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4363 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator4367 = new BitSet(new long[]{0x0000000000000000L,0x0003000181880000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4372 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_expression_value4401 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value4406 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_value4412 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint4431 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint4438 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint4452 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint4459 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4474 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
+    public static final BitSet FOLLOW_DOT_in_pattern_type4480 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4484 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
+    public static final BitSet FOLLOW_dimension_definition_in_pattern_type4499 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_ID_in_data_type4527 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
+    public static final BitSet FOLLOW_DOT_in_data_type4533 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_data_type4537 = new BitSet(new long[]{0x0000000000000002L,0x0004000000100000L});
+    public static final BitSet FOLLOW_dimension_definition_in_data_type4542 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dimension_definition4571 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dimension_definition4578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4592 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_DOT_in_accessor_path4596 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4600 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_accessor_element4624 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_accessor_element4630 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_data_in_rhs_chunk4659 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk_data4678 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_rhs_chunk_data4691 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_END_in_rhs_chunk_data4704 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_rhs_chunk_data4710 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk4729 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk_data4752 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_curly_chunk_data4764 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk_data4780 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk_data4791 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk4812 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk_data4836 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_paren_chunk_data4848 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk_data4864 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk_data4875 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk4896 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk_data4919 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_square_chunk_data4931 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk_data4946 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk_data4957 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4981 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4985 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4989 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4993 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4997 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key5029 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_effective_key5033 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key5037 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key5069 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_expires_key5073 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key5077 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key5109 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_no_loop_key5113 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key5117 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key5149 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_auto_focus_key5153 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key5157 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5189 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_activation_group_key5193 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5197 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5229 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_agenda_group_key5233 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5237 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5269 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_ruleflow_group_key5273 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5277 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5309 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_entry_point_key5313 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5317 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_duration_key5346 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_package_key5373 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_key5400 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_dialect_key5427 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_salience_key5454 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_enabled_key5481 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_attributes_key5508 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_rule_key5535 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_template_key5562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_query_key5589 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_declare_key5616 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_function_key5643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_global_key5670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_eval_key5697 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_contains_key5724 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_matches_key5751 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_excludes_key5778 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_soundslike_key5805 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_memberof_key5832 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_not_key5859 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_in_key5886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_or_key5913 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_and_key5940 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_exists_key5967 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_forall_key5994 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_action_key6021 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_reverse_key6048 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_result_key6075 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred12069 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_or_key_in_synpred12071 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_or_key_in_synpred22138 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred22140 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred32197 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_and_key_in_synpred32199 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred42267 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred42269 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SEMICOLON_in_synpred52392 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred62429 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_or_key_in_synpred62432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred62434 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred72557 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_or_key_in_synpred72560 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred72562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred83391 = new BitSet(new long[]{0x0000000000000002L});
 
-}
\ No newline at end of file
+}

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-10-16 18:53:59
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-10-17 12:12:29
 
 	package org.drools.lang;
 
@@ -38,132 +38,132 @@
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "VT_COMPILATION_UNIT", "VT_FUNCTION_IMPORT", "VT_FACT", "VT_CONSTRAINTS", "VT_LABEL", "VT_QUERY_ID", "VT_TEMPLATE_ID", "VT_TYPE_DECLARE_ID", "VT_RULE_ID", "VT_ENTRYPOINT_ID", "VT_SLOT_ID", "VT_SLOT", "VT_RULE_ATTRIBUTES", "VT_RHS_CHUNK", "VT_CURLY_CHUNK", "VT_SQUARE_CHUNK", "VT_PAREN_CHUNK", "VT_BEHAVIOR", "VT_AND_IMPLICIT", "VT_AND_PREFIX", "VT_OR_PREFIX", "VT_AND_INFIX", "VT_OR_INFIX", "VT_ACCUMULATE_INIT_CLAUSE", "VT_ACCUMULATE_ID_CLAUSE", "VT_FROM_SOURCE", "VT_EXPRESSION_CHAIN", "VT_PATTERN", "VT_FACT_BINDING", "VT_FACT_OR", "VT_BIND_FIELD", "VT_FIELD", "VT_ACCESSOR_PATH", "VT_ACCESSOR_ELEMENT", "VT_DATA_TYPE", "VT_PATTERN_TYPE", "VT_PACKAGE_ID", "VT_IMPORT_ID", "VT_GLOBAL_ID", "VT_FUNCTION_ID", "VT_PARAM_LIST", "VK_DATE_EFFECTIVE", "VK_DATE_EXPIRES", "VK_LOCK_ON_ACTIVE", "VK_NO_LOOP", "VK_AUTO_FOCUS", "VK_ACTIVATION_GROUP", "VK_AGENDA_GROUP", "VK_RULEFLOW_GROUP", "VK_DURATION", "VK_DIALECT", "VK_SALIENCE", "VK_ENABLED", "!
 VK_ATTRIBUTES", "VK_RULE", "VK_IMPORT", "VK_PACKAGE", "VK_TEMPLATE", "VK_QUERY", "VK_DECLARE", "VK_FUNCTION", "VK_GLOBAL", "VK_EVAL", "VK_CONTAINS", "VK_MATCHES", "VK_EXCLUDES", "VK_SOUNDSLIKE", "VK_MEMBEROF", "VK_ENTRY_POINT", "VK_NOT", "VK_IN", "VK_OR", "VK_AND", "VK_EXISTS", "VK_FORALL", "VK_ACTION", "VK_REVERSE", "VK_RESULT", "SEMICOLON", "ID", "DOT", "DOT_STAR", "END", "STRING", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "AT", "COLON", "EQUALS", "WHEN", "BOOL", "INT", "DOUBLE_PIPE", "DOUBLE_AMPER", "FROM", "OVER", "ACCUMULATE", "INIT", "COLLECT", "ARROW", "EQUAL", "GREATER", "GREATER_EQUAL", "LESS", "LESS_EQUAL", "NOT_EQUAL", "GRAVE_ACCENT", "FLOAT", "NULL", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "LEFT_CURLY", "RIGHT_CURLY", "MISC", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT"
     };
-    public static final int VT_ACCESSOR_ELEMENT=37;
-    public static final int ACCUMULATE=101;
-    public static final int VT_DATA_TYPE=38;
-    public static final int DOT_STAR=85;
+    public static final int COMMA=89;
+    public static final int VT_PATTERN_TYPE=39;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_DIALECT=54;
     public static final int VK_FUNCTION=64;
-    public static final int VK_GLOBAL=65;
-    public static final int VK_AND=76;
-    public static final int EQUALS=93;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int END=86;
+    public static final int HexDigit=123;
+    public static final int VK_ATTRIBUTES=57;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int MISC=119;
+    public static final int VT_AND_PREFIX=23;
+    public static final int VK_QUERY=62;
+    public static final int THEN=116;
     public static final int VK_AUTO_FOCUS=49;
-    public static final int VK_SALIENCE=55;
-    public static final int EOF=-1;
-    public static final int VT_PATTERN_TYPE=39;
-    public static final int VT_FUNCTION_IMPORT=5;
-    public static final int VT_OR_INFIX=26;
-    public static final int DOUBLE_AMPER=98;
-    public static final int EOL=120;
-    public static final int GREATER=106;
+    public static final int DOT=84;
     public static final int VK_IMPORT=59;
-    public static final int NOT_EQUAL=110;
-    public static final int VK_ACTION=79;
-    public static final int VK_RULE=58;
-    public static final int VK_MEMBEROF=71;
-    public static final int LESS=108;
-    public static final int GRAVE_ACCENT=111;
     public static final int VT_SLOT=15;
-    public static final int VK_OR=75;
-    public static final int VT_AND_PREFIX=23;
-    public static final int NULL=113;
-    public static final int BOOL=95;
-    public static final int VK_QUERY=62;
-    public static final int SEMICOLON=82;
-    public static final int INT=96;
-    public static final int VT_FUNCTION_ID=43;
-    public static final int VT_RHS_CHUNK=17;
-    public static final int VT_FACT_BINDING=32;
-    public static final int VK_ENTRY_POINT=72;
-    public static final int VK_RULEFLOW_GROUP=52;
-    public static final int VK_RESULT=81;
     public static final int VT_PACKAGE_ID=40;
+    public static final int LEFT_SQUARE=114;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=126;
+    public static final int VT_DATA_TYPE=38;
+    public static final int VK_MATCHES=68;
+    public static final int VT_FACT=6;
+    public static final int LEFT_CURLY=117;
+    public static final int AT=91;
+    public static final int LEFT_PAREN=88;
+    public static final int DOUBLE_AMPER=98;
+    public static final int VT_QUERY_ID=9;
+    public static final int VT_ACCESSOR_PATH=36;
     public static final int VT_LABEL=8;
+    public static final int WHEN=94;
+    public static final int VT_ENTRYPOINT_ID=13;
+    public static final int VK_SOUNDSLIKE=70;
+    public static final int VK_SALIENCE=55;
+    public static final int VT_FIELD=35;
     public static final int WS=121;
-    public static final int VK_NO_LOOP=48;
-    public static final int LEFT_CURLY=117;
-    public static final int VT_FACT=6;
-    public static final int VT_PATTERN=31;
-    public static final int VK_IN=74;
-    public static final int LEFT_PAREN=88;
-    public static final int LESS_EQUAL=109;
-    public static final int VT_IMPORT_ID=41;
-    public static final int VT_RULE_ID=12;
-    public static final int MISC=119;
-    public static final int FROM=99;
-    public static final int END=86;
+    public static final int OVER=100;
+    public static final int STRING=87;
+    public static final int VK_AND=76;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
+    public static final int VT_BEHAVIOR=21;
+    public static final int GRAVE_ACCENT=111;
+    public static final int VK_DURATION=53;
+    public static final int VT_SQUARE_CHUNK=19;
+    public static final int VK_FORALL=78;
+    public static final int VT_PAREN_CHUNK=20;
+    public static final int VT_COMPILATION_UNIT=4;
     public static final int COLLECT=103;
-    public static final int INIT=102;
-    public static final int EscapeSequence=122;
-    public static final int VK_ACTIVATION_GROUP=50;
     public static final int VK_ENABLED=56;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    public static final int EQUALS=93;
+    public static final int VK_RESULT=81;
+    public static final int UnicodeEscape=124;
     public static final int VK_PACKAGE=60;
-    public static final int OVER=100;
+    public static final int VT_RULE_ID=12;
+    public static final int EQUAL=105;
+    public static final int VK_NO_LOOP=48;
+    public static final int SEMICOLON=82;
+    public static final int VK_TEMPLATE=61;
+    public static final int VT_AND_IMPLICIT=22;
+    public static final int NULL=113;
+    public static final int COLON=92;
+    public static final int MULTI_LINE_COMMENT=128;
+    public static final int VT_RULE_ATTRIBUTES=16;
     public static final int RIGHT_SQUARE=115;
-    public static final int RIGHT_CURLY=118;
-    public static final int VK_MATCHES=68;
+    public static final int VK_AGENDA_GROUP=51;
     public static final int VT_FACT_OR=33;
-    public static final int VT_FIELD=35;
+    public static final int VK_NOT=73;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ARROW=104;
     public static final int FLOAT=112;
-    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int INIT=102;
+    public static final int VT_SLOT_ID=14;
+    public static final int VT_CURLY_CHUNK=18;
+    public static final int VT_OR_PREFIX=24;
+    public static final int DOUBLE_PIPE=97;
+    public static final int LESS=108;
+    public static final int VT_TYPE_DECLARE_ID=11;
+    public static final int VT_PATTERN=31;
+    public static final int VK_DATE_EFFECTIVE=45;
+    public static final int EscapeSequence=122;
     public static final int VK_EXISTS=77;
-    public static final int VK_DATE_EXPIRES=46;
+    public static final int INT=96;
+    public static final int VT_BIND_FIELD=34;
+    public static final int VK_RULE=58;
+    public static final int VK_EVAL=66;
+    public static final int GREATER=106;
+    public static final int VT_FACT_BINDING=32;
     public static final int ID=83;
-    public static final int HexDigit=123;
-    public static final int VT_OR_PREFIX=24;
-    public static final int VK_EVAL=66;
-    public static final int DOUBLE_PIPE=97;
-    public static final int AT=91;
-    public static final int RIGHT_PAREN=90;
-    public static final int THEN=116;
-    public static final int VT_COMPILATION_UNIT=4;
-    public static final int VT_EXPRESSION_CHAIN=30;
-    public static final int COMMA=89;
-    public static final int EQUAL=105;
-    public static final int VT_BEHAVIOR=21;
-    public static final int VT_QUERY_ID=9;
-    public static final int VK_DIALECT=54;
-    public static final int DOT=84;
-    public static final int VT_GLOBAL_ID=42;
-    public static final int VK_NOT=73;
+    public static final int FROM=99;
+    public static final int NOT_EQUAL=110;
+    public static final int RIGHT_CURLY=118;
+    public static final int VK_ENTRY_POINT=72;
+    public static final int VT_PARAM_LIST=44;
+    public static final int VT_AND_INFIX=25;
+    public static final int BOOL=95;
     public static final int VT_FROM_SOURCE=29;
-    public static final int VK_DECLARE=63;
-    public static final int VT_ENTRYPOINT_ID=13;
-    public static final int VT_PAREN_CHUNK=20;
     public static final int VK_CONTAINS=67;
-    public static final int VT_TYPE_DECLARE_ID=11;
-    public static final int VK_REVERSE=80;
     public static final int VK_LOCK_ON_ACTIVE=47;
-    public static final int VK_TEMPLATE=61;
-    public static final int VK_DURATION=53;
-    public static final int VT_RULE_ATTRIBUTES=16;
-    public static final int VT_AND_INFIX=25;
-    public static final int VT_ACCESSOR_PATH=36;
-    public static final int MULTI_LINE_COMMENT=128;
-    public static final int VK_FORALL=78;
-    public static final int COLON=92;
+    public static final int VT_FUNCTION_IMPORT=5;
+    public static final int VK_IN=74;
+    public static final int VT_RHS_CHUNK=17;
+    public static final int VK_MEMBEROF=71;
+    public static final int GREATER_EQUAL=107;
+    public static final int VT_OR_INFIX=26;
+    public static final int DOT_STAR=85;
+    public static final int VK_OR=75;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int LESS_EQUAL=109;
+    public static final int ACCUMULATE=101;
+    public static final int VK_RULEFLOW_GROUP=52;
+    public static final int VT_FUNCTION_ID=43;
+    public static final int EOF=-1;
+    public static final int VT_CONSTRAINTS=7;
+    public static final int VT_IMPORT_ID=41;
+    public static final int EOL=120;
+    public static final int VK_ACTIVATION_GROUP=50;
+    public static final int OctalEscape=125;
+    public static final int VK_ACTION=79;
     public static final int VK_EXCLUDES=69;
-    public static final int VK_SOUNDSLIKE=70;
-    public static final int VT_AND_IMPLICIT=22;
-    public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
-    public static final int VT_CURLY_CHUNK=18;
-    public static final int VT_SLOT_ID=14;
-    public static final int VK_ATTRIBUTES=57;
-    public static final int WHEN=94;
-    public static final int UnicodeEscape=124;
-    public static final int VT_SQUARE_CHUNK=19;
-    public static final int VK_DATE_EFFECTIVE=45;
+    public static final int RIGHT_PAREN=90;
     public static final int VT_TEMPLATE_ID=10;
-    public static final int VT_PARAM_LIST=44;
-    public static final int ARROW=104;
-    public static final int VT_BIND_FIELD=34;
-    public static final int VK_AGENDA_GROUP=51;
-    public static final int VT_CONSTRAINTS=7;
-    public static final int LEFT_SQUARE=114;
-    public static final int GREATER_EQUAL=107;
-    public static final int OctalEscape=125;
-    public static final int STRING=87;
+    public static final int VK_DECLARE=63;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
 
         public DescrBuilderTree(TreeNodeStream input) {
             super(input);
@@ -1753,7 +1753,7 @@
 
 
     // $ANTLR start rule_attribute
-    // src/main/resources/org/drools/lang/DescrBuilderTree.g:193:1: rule_attribute returns [AttributeDescr attributeDescr] : ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED value= BOOL ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) ) ;
+    // src/main/resources/org/drools/lang/DescrBuilderTree.g:193:1: rule_attribute returns [AttributeDescr attributeDescr] : ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) ) ;
     public final AttributeDescr rule_attribute() throws RecognitionException {
         AttributeDescr attributeDescr = null;
 
@@ -1761,80 +1761,80 @@
         DroolsTree value=null;
 
         try {
-            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:2: ( ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED value= BOOL ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) ) )
-            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED value= BOOL ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:2: ( ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) ) )
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )
             {
-            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED value= BOOL ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )
-            int alt26=12;
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )
+            int alt27=12;
             switch ( input.LA(1) ) {
             case VK_SALIENCE:
                 {
-                alt26=1;
+                alt27=1;
                 }
                 break;
             case VK_NO_LOOP:
                 {
-                alt26=2;
+                alt27=2;
                 }
                 break;
             case VK_AGENDA_GROUP:
                 {
-                alt26=3;
+                alt27=3;
                 }
                 break;
             case VK_DURATION:
                 {
-                alt26=4;
+                alt27=4;
                 }
                 break;
             case VK_ACTIVATION_GROUP:
                 {
-                alt26=5;
+                alt27=5;
                 }
                 break;
             case VK_AUTO_FOCUS:
                 {
-                alt26=6;
+                alt27=6;
                 }
                 break;
             case VK_DATE_EFFECTIVE:
                 {
-                alt26=7;
+                alt27=7;
                 }
                 break;
             case VK_DATE_EXPIRES:
                 {
-                alt26=8;
+                alt27=8;
                 }
                 break;
             case VK_ENABLED:
                 {
-                alt26=9;
+                alt27=9;
                 }
                 break;
             case VK_RULEFLOW_GROUP:
                 {
-                alt26=10;
+                alt27=10;
                 }
                 break;
             case VK_LOCK_ON_ACTIVE:
                 {
-                alt26=11;
+                alt27=11;
                 }
                 break;
             case VK_DIALECT:
                 {
-                alt26=12;
+                alt27=12;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED value= BOOL ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )", 26, 0, input);
+                    new NoViableAltException("194:4: ( ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_NO_LOOP (value= BOOL )? ) | ^(attrName= VK_AGENDA_GROUP value= STRING ) | ^(attrName= VK_DURATION value= INT ) | ^(attrName= VK_ACTIVATION_GROUP value= STRING ) | ^(attrName= VK_AUTO_FOCUS (value= BOOL )? ) | ^(attrName= VK_DATE_EFFECTIVE value= STRING ) | ^(attrName= VK_DATE_EXPIRES value= STRING ) | ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) ) | ^(attrName= VK_RULEFLOW_GROUP value= STRING ) | ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? ) | ^(attrName= VK_DIALECT value= STRING ) )", 27, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt26) {
+            switch (alt27) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:194:5: ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) )
                     {
@@ -2020,15 +2020,49 @@
                     }
                     break;
                 case 9 :
-                    // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:4: ^(attrName= VK_ENABLED value= BOOL )
+                    // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:4: ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) )
                     {
                     attrName=(DroolsTree)input.LT(1);
                     match(input,VK_ENABLED,FOLLOW_VK_ENABLED_in_rule_attribute976); 
 
                     match(input, Token.DOWN, null); 
-                    value=(DroolsTree)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_rule_attribute980); 
+                    // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:26: (value= BOOL | value= VT_PAREN_CHUNK )
+                    int alt25=2;
+                    int LA25_0 = input.LA(1);
 
+                    if ( (LA25_0==BOOL) ) {
+                        alt25=1;
+                    }
+                    else if ( (LA25_0==VT_PAREN_CHUNK) ) {
+                        alt25=2;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("202:26: (value= BOOL | value= VT_PAREN_CHUNK )", 25, 0, input);
+
+                        throw nvae;
+                    }
+                    switch (alt25) {
+                        case 1 :
+                            // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:27: value= BOOL
+                            {
+                            value=(DroolsTree)input.LT(1);
+                            match(input,BOOL,FOLLOW_BOOL_in_rule_attribute981); 
+
+                            }
+                            break;
+                        case 2 :
+                            // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:38: value= VT_PAREN_CHUNK
+                            {
+                            value=(DroolsTree)input.LT(1);
+                            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_rule_attribute985); 
+
+                            }
+                            break;
+
+                    }
+
+
                     match(input, Token.UP, null); 
 
                     }
@@ -2037,11 +2071,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:203:4: ^(attrName= VK_RULEFLOW_GROUP value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_RULEFLOW_GROUP,FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute990); 
+                    match(input,VK_RULEFLOW_GROUP,FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute996); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute994); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1000); 
 
                     match(input, Token.UP, null); 
 
@@ -2051,23 +2085,23 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:204:4: ^(attrName= VK_LOCK_ON_ACTIVE (value= BOOL )? )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_LOCK_ON_ACTIVE,FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1004); 
+                    match(input,VK_LOCK_ON_ACTIVE,FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1010); 
 
                     if ( input.LA(1)==Token.DOWN ) {
                         match(input, Token.DOWN, null); 
                         // src/main/resources/org/drools/lang/DescrBuilderTree.g:204:38: (value= BOOL )?
-                        int alt25=2;
-                        int LA25_0 = input.LA(1);
+                        int alt26=2;
+                        int LA26_0 = input.LA(1);
 
-                        if ( (LA25_0==BOOL) ) {
-                            alt25=1;
+                        if ( (LA26_0==BOOL) ) {
+                            alt26=1;
                         }
-                        switch (alt25) {
+                        switch (alt26) {
                             case 1 :
                                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:204:38: value= BOOL
                                 {
                                 value=(DroolsTree)input.LT(1);
-                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute1008); 
+                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute1014); 
 
                                 }
                                 break;
@@ -2084,11 +2118,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:205:4: ^(attrName= VK_DIALECT value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_DIALECT,FOLLOW_VK_DIALECT_in_rule_attribute1018); 
+                    match(input,VK_DIALECT,FOLLOW_VK_DIALECT_in_rule_attribute1024); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1022); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1028); 
 
                     match(input, Token.UP, null); 
 
@@ -2128,26 +2162,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:212:3: ( ^( VT_AND_IMPLICIT (dt= lhs )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:212:5: ^( VT_AND_IMPLICIT (dt= lhs )* )
             {
-            match(input,VT_AND_IMPLICIT,FOLLOW_VT_AND_IMPLICIT_in_lhs_block1047); 
+            match(input,VT_AND_IMPLICIT,FOLLOW_VT_AND_IMPLICIT_in_lhs_block1053); 
 
             if ( input.LA(1)==Token.DOWN ) {
                 match(input, Token.DOWN, null); 
                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:212:23: (dt= lhs )*
-                loop27:
+                loop28:
                 do {
-                    int alt27=2;
-                    int LA27_0 = input.LA(1);
+                    int alt28=2;
+                    int LA28_0 = input.LA(1);
 
-                    if ( ((LA27_0>=VT_AND_PREFIX && LA27_0<=VT_OR_INFIX)||LA27_0==VT_PATTERN||LA27_0==VK_EVAL||LA27_0==VK_NOT||(LA27_0>=VK_EXISTS && LA27_0<=VK_FORALL)||LA27_0==FROM) ) {
-                        alt27=1;
+                    if ( ((LA28_0>=VT_AND_PREFIX && LA28_0<=VT_OR_INFIX)||LA28_0==VT_PATTERN||LA28_0==VK_EVAL||LA28_0==VK_NOT||(LA28_0>=VK_EXISTS && LA28_0<=VK_FORALL)||LA28_0==FROM) ) {
+                        alt28=1;
                     }
 
 
-                    switch (alt27) {
+                    switch (alt28) {
                 	case 1 :
                 	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:212:24: dt= lhs
                 	    {
-                	    pushFollow(FOLLOW_lhs_in_lhs_block1052);
+                	    pushFollow(FOLLOW_lhs_in_lhs_block1058);
                 	    dt=lhs();
                 	    _fsp--;
 
@@ -2157,7 +2191,7 @@
                 	    break;
 
                 	default :
-                	    break loop27;
+                	    break loop28;
                     }
                 } while (true);
 
@@ -2206,90 +2240,90 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:218:3: ( ^(start= VT_OR_PREFIX (dt= lhs )+ ) | ^(start= VT_OR_INFIX dt1= lhs dt2= lhs ) | ^(start= VT_AND_PREFIX (dt= lhs )+ ) | ^(start= VT_AND_INFIX dt1= lhs dt2= lhs ) | ^(start= VK_EXISTS dt= lhs ) | ^(start= VK_NOT dt= lhs ) | ^(start= VK_EVAL pc= VT_PAREN_CHUNK ) | ^(start= VK_FORALL (dt= lhs )+ ) | ^( FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern )
-            int alt31=10;
+            int alt32=10;
             switch ( input.LA(1) ) {
             case VT_OR_PREFIX:
                 {
-                alt31=1;
+                alt32=1;
                 }
                 break;
             case VT_OR_INFIX:
                 {
-                alt31=2;
+                alt32=2;
                 }
                 break;
             case VT_AND_PREFIX:
                 {
-                alt31=3;
+                alt32=3;
                 }
                 break;
             case VT_AND_INFIX:
                 {
-                alt31=4;
+                alt32=4;
                 }
                 break;
             case VK_EXISTS:
                 {
-                alt31=5;
+                alt32=5;
                 }
                 break;
             case VK_NOT:
                 {
-                alt31=6;
+                alt32=6;
                 }
                 break;
             case VK_EVAL:
                 {
-                alt31=7;
+                alt32=7;
                 }
                 break;
             case VK_FORALL:
                 {
-                alt31=8;
+                alt32=8;
                 }
                 break;
             case FROM:
                 {
-                alt31=9;
+                alt32=9;
                 }
                 break;
             case VT_PATTERN:
                 {
-                alt31=10;
+                alt32=10;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("215:1: lhs returns [BaseDescr baseDescr] : ( ^(start= VT_OR_PREFIX (dt= lhs )+ ) | ^(start= VT_OR_INFIX dt1= lhs dt2= lhs ) | ^(start= VT_AND_PREFIX (dt= lhs )+ ) | ^(start= VT_AND_INFIX dt1= lhs dt2= lhs ) | ^(start= VK_EXISTS dt= lhs ) | ^(start= VK_NOT dt= lhs ) | ^(start= VK_EVAL pc= VT_PAREN_CHUNK ) | ^(start= VK_FORALL (dt= lhs )+ ) | ^( FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern );", 31, 0, input);
+                    new NoViableAltException("215:1: lhs returns [BaseDescr baseDescr] : ( ^(start= VT_OR_PREFIX (dt= lhs )+ ) | ^(start= VT_OR_INFIX dt1= lhs dt2= lhs ) | ^(start= VT_AND_PREFIX (dt= lhs )+ ) | ^(start= VT_AND_INFIX dt1= lhs dt2= lhs ) | ^(start= VK_EXISTS dt= lhs ) | ^(start= VK_NOT dt= lhs ) | ^(start= VK_EVAL pc= VT_PAREN_CHUNK ) | ^(start= VK_FORALL (dt= lhs )+ ) | ^( FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern );", 32, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt31) {
+            switch (alt32) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:218:5: ^(start= VT_OR_PREFIX (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_OR_PREFIX,FOLLOW_VT_OR_PREFIX_in_lhs1078); 
+                    match(input,VT_OR_PREFIX,FOLLOW_VT_OR_PREFIX_in_lhs1084); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:218:26: (dt= lhs )+
-                    int cnt28=0;
-                    loop28:
+                    int cnt29=0;
+                    loop29:
                     do {
-                        int alt28=2;
-                        int LA28_0 = input.LA(1);
+                        int alt29=2;
+                        int LA29_0 = input.LA(1);
 
-                        if ( ((LA28_0>=VT_AND_PREFIX && LA28_0<=VT_OR_INFIX)||LA28_0==VT_PATTERN||LA28_0==VK_EVAL||LA28_0==VK_NOT||(LA28_0>=VK_EXISTS && LA28_0<=VK_FORALL)||LA28_0==FROM) ) {
-                            alt28=1;
+                        if ( ((LA29_0>=VT_AND_PREFIX && LA29_0<=VT_OR_INFIX)||LA29_0==VT_PATTERN||LA29_0==VK_EVAL||LA29_0==VK_NOT||(LA29_0>=VK_EXISTS && LA29_0<=VK_FORALL)||LA29_0==FROM) ) {
+                            alt29=1;
                         }
 
 
-                        switch (alt28) {
+                        switch (alt29) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:218:27: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1083);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1089);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2299,12 +2333,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt28 >= 1 ) break loop28;
+                    	    if ( cnt29 >= 1 ) break loop29;
                                 EarlyExitException eee =
-                                    new EarlyExitException(28, input);
+                                    new EarlyExitException(29, input);
                                 throw eee;
                         }
-                        cnt28++;
+                        cnt29++;
                     } while (true);
 
 
@@ -2317,14 +2351,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:220:4: ^(start= VT_OR_INFIX dt1= lhs dt2= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_OR_INFIX,FOLLOW_VT_OR_INFIX_in_lhs1099); 
+                    match(input,VT_OR_INFIX,FOLLOW_VT_OR_INFIX_in_lhs1105); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1103);
+                    pushFollow(FOLLOW_lhs_in_lhs1109);
                     dt1=lhs();
                     _fsp--;
 
-                    pushFollow(FOLLOW_lhs_in_lhs1107);
+                    pushFollow(FOLLOW_lhs_in_lhs1113);
                     dt2=lhs();
                     _fsp--;
 
@@ -2340,26 +2374,26 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:224:4: ^(start= VT_AND_PREFIX (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_AND_PREFIX,FOLLOW_VT_AND_PREFIX_in_lhs1119); 
+                    match(input,VT_AND_PREFIX,FOLLOW_VT_AND_PREFIX_in_lhs1125); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:224:26: (dt= lhs )+
-                    int cnt29=0;
-                    loop29:
+                    int cnt30=0;
+                    loop30:
                     do {
-                        int alt29=2;
-                        int LA29_0 = input.LA(1);
+                        int alt30=2;
+                        int LA30_0 = input.LA(1);
 
-                        if ( ((LA29_0>=VT_AND_PREFIX && LA29_0<=VT_OR_INFIX)||LA29_0==VT_PATTERN||LA29_0==VK_EVAL||LA29_0==VK_NOT||(LA29_0>=VK_EXISTS && LA29_0<=VK_FORALL)||LA29_0==FROM) ) {
-                            alt29=1;
+                        if ( ((LA30_0>=VT_AND_PREFIX && LA30_0<=VT_OR_INFIX)||LA30_0==VT_PATTERN||LA30_0==VK_EVAL||LA30_0==VK_NOT||(LA30_0>=VK_EXISTS && LA30_0<=VK_FORALL)||LA30_0==FROM) ) {
+                            alt30=1;
                         }
 
 
-                        switch (alt29) {
+                        switch (alt30) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:224:27: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1124);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1130);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2369,12 +2403,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt29 >= 1 ) break loop29;
+                    	    if ( cnt30 >= 1 ) break loop30;
                                 EarlyExitException eee =
-                                    new EarlyExitException(29, input);
+                                    new EarlyExitException(30, input);
                                 throw eee;
                         }
-                        cnt29++;
+                        cnt30++;
                     } while (true);
 
 
@@ -2387,14 +2421,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:226:4: ^(start= VT_AND_INFIX dt1= lhs dt2= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_AND_INFIX,FOLLOW_VT_AND_INFIX_in_lhs1140); 
+                    match(input,VT_AND_INFIX,FOLLOW_VT_AND_INFIX_in_lhs1146); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1144);
+                    pushFollow(FOLLOW_lhs_in_lhs1150);
                     dt1=lhs();
                     _fsp--;
 
-                    pushFollow(FOLLOW_lhs_in_lhs1148);
+                    pushFollow(FOLLOW_lhs_in_lhs1154);
                     dt2=lhs();
                     _fsp--;
 
@@ -2410,10 +2444,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:230:4: ^(start= VK_EXISTS dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_EXISTS,FOLLOW_VK_EXISTS_in_lhs1160); 
+                    match(input,VK_EXISTS,FOLLOW_VK_EXISTS_in_lhs1166); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1164);
+                    pushFollow(FOLLOW_lhs_in_lhs1170);
                     dt=lhs();
                     _fsp--;
 
@@ -2427,10 +2461,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:232:4: ^(start= VK_NOT dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_NOT,FOLLOW_VK_NOT_in_lhs1176); 
+                    match(input,VK_NOT,FOLLOW_VK_NOT_in_lhs1182); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1180);
+                    pushFollow(FOLLOW_lhs_in_lhs1186);
                     dt=lhs();
                     _fsp--;
 
@@ -2444,11 +2478,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:234:4: ^(start= VK_EVAL pc= VT_PAREN_CHUNK )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_lhs1192); 
+                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_lhs1198); 
 
                     match(input, Token.DOWN, null); 
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_lhs1196); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_lhs1202); 
 
                     match(input, Token.UP, null); 
                     	retval.baseDescr = factory.createEval(start, pc);	
@@ -2459,26 +2493,26 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:236:4: ^(start= VK_FORALL (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_FORALL,FOLLOW_VK_FORALL_in_lhs1208); 
+                    match(input,VK_FORALL,FOLLOW_VK_FORALL_in_lhs1214); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:236:22: (dt= lhs )+
-                    int cnt30=0;
-                    loop30:
+                    int cnt31=0;
+                    loop31:
                     do {
-                        int alt30=2;
-                        int LA30_0 = input.LA(1);
+                        int alt31=2;
+                        int LA31_0 = input.LA(1);
 
-                        if ( ((LA30_0>=VT_AND_PREFIX && LA30_0<=VT_OR_INFIX)||LA30_0==VT_PATTERN||LA30_0==VK_EVAL||LA30_0==VK_NOT||(LA30_0>=VK_EXISTS && LA30_0<=VK_FORALL)||LA30_0==FROM) ) {
-                            alt30=1;
+                        if ( ((LA31_0>=VT_AND_PREFIX && LA31_0<=VT_OR_INFIX)||LA31_0==VT_PATTERN||LA31_0==VK_EVAL||LA31_0==VK_NOT||(LA31_0>=VK_EXISTS && LA31_0<=VK_FORALL)||LA31_0==FROM) ) {
+                            alt31=1;
                         }
 
 
-                        switch (alt30) {
+                        switch (alt31) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:236:23: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1213);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1219);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2488,12 +2522,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt30 >= 1 ) break loop30;
+                    	    if ( cnt31 >= 1 ) break loop31;
                                 EarlyExitException eee =
-                                    new EarlyExitException(30, input);
+                                    new EarlyExitException(31, input);
                                 throw eee;
                         }
-                        cnt30++;
+                        cnt31++;
                     } while (true);
 
 
@@ -2505,14 +2539,14 @@
                 case 9 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:238:4: ^( FROM pn= lhs_pattern fe= from_elements )
                     {
-                    match(input,FROM,FOLLOW_FROM_in_lhs1227); 
+                    match(input,FROM,FOLLOW_FROM_in_lhs1233); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs1231);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs1237);
                     pn=lhs_pattern();
                     _fsp--;
 
-                    pushFollow(FOLLOW_from_elements_in_lhs1235);
+                    pushFollow(FOLLOW_from_elements_in_lhs1241);
                     fe=from_elements();
                     _fsp--;
 
@@ -2525,7 +2559,7 @@
                 case 10 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:240:4: pn= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs1246);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs1252);
                     pn=lhs_pattern();
                     _fsp--;
 
@@ -2567,49 +2601,49 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:245:2: ( ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause )
-            int alt32=4;
+            int alt33=4;
             switch ( input.LA(1) ) {
             case ACCUMULATE:
                 {
-                alt32=1;
+                alt33=1;
                 }
                 break;
             case COLLECT:
                 {
-                alt32=2;
+                alt33=2;
                 }
                 break;
             case VK_ENTRY_POINT:
                 {
-                alt32=3;
+                alt33=3;
                 }
                 break;
             case VT_FROM_SOURCE:
                 {
-                alt32=4;
+                alt33=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("244:1: from_elements returns [PatternSourceDescr patternSourceDescr] : ( ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause );", 32, 0, input);
+                    new NoViableAltException("244:1: from_elements returns [PatternSourceDescr patternSourceDescr] : ( ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause );", 33, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt32) {
+            switch (alt33) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:245:4: ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_from_elements1267); 
+                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_from_elements1273); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_from_elements1271);
+                    pushFollow(FOLLOW_lhs_in_from_elements1277);
                     dt=lhs();
                     _fsp--;
 
                     	retval.patternSourceDescr = factory.createAccumulate(start, dt.baseDescr);	
-                    pushFollow(FOLLOW_accumulate_parts_in_from_elements1281);
+                    pushFollow(FOLLOW_accumulate_parts_in_from_elements1287);
                     ret=accumulate_parts(retval.patternSourceDescr);
                     _fsp--;
 
@@ -2623,10 +2657,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:249:4: ^(start= COLLECT dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,COLLECT,FOLLOW_COLLECT_in_from_elements1294); 
+                    match(input,COLLECT,FOLLOW_COLLECT_in_from_elements1300); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_from_elements1298);
+                    pushFollow(FOLLOW_lhs_in_from_elements1304);
                     dt=lhs();
                     _fsp--;
 
@@ -2640,11 +2674,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:251:4: ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_ENTRY_POINT,FOLLOW_VK_ENTRY_POINT_in_from_elements1310); 
+                    match(input,VK_ENTRY_POINT,FOLLOW_VK_ENTRY_POINT_in_from_elements1316); 
 
                     match(input, Token.DOWN, null); 
                     entryId=(DroolsTree)input.LT(1);
-                    match(input,VT_ENTRYPOINT_ID,FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1314); 
+                    match(input,VT_ENTRYPOINT_ID,FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1320); 
 
                     match(input, Token.UP, null); 
                     	retval.patternSourceDescr = factory.createEntryPoint(start, entryId);	
@@ -2654,7 +2688,7 @@
                 case 4 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:253:4: fs= from_source_clause
                     {
-                    pushFollow(FOLLOW_from_source_clause_in_from_elements1325);
+                    pushFollow(FOLLOW_from_source_clause_in_from_elements1331);
                     fs=from_source_clause();
                     _fsp--;
 
@@ -2688,26 +2722,26 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:258:2: (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] )
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA33_0==VT_ACCUMULATE_INIT_CLAUSE) ) {
-                alt33=1;
+            if ( (LA34_0==VT_ACCUMULATE_INIT_CLAUSE) ) {
+                alt34=1;
             }
-            else if ( (LA33_0==VT_ACCUMULATE_ID_CLAUSE) ) {
-                alt33=2;
+            else if ( (LA34_0==VT_ACCUMULATE_ID_CLAUSE) ) {
+                alt34=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("257:1: accumulate_parts[PatternSourceDescr patternSourceDescr] returns [AccumulateDescr accumulateDescr] : (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] );", 33, 0, input);
+                    new NoViableAltException("257:1: accumulate_parts[PatternSourceDescr patternSourceDescr] returns [AccumulateDescr accumulateDescr] : (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] );", 34, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt34) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:258:4: ac1= accumulate_init_clause[$patternSourceDescr]
                     {
-                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_parts1346);
+                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_parts1352);
                     ac1=accumulate_init_clause(patternSourceDescr);
                     _fsp--;
 
@@ -2718,7 +2752,7 @@
                 case 2 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:260:4: ac2= accumulate_id_clause[$patternSourceDescr]
                     {
-                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_parts1357);
+                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_parts1363);
                     ac2=accumulate_id_clause(patternSourceDescr);
                     _fsp--;
 
@@ -2760,36 +2794,36 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:265:2: ( ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( VK_RESULT pc3= VT_PAREN_CHUNK ) ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:265:4: ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( VK_RESULT pc3= VT_PAREN_CHUNK ) )
             {
-            match(input,VT_ACCUMULATE_INIT_CLAUSE,FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1380); 
+            match(input,VT_ACCUMULATE_INIT_CLAUSE,FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1386); 
 
             match(input, Token.DOWN, null); 
             start=(DroolsTree)input.LT(1);
-            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause1389); 
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause1395); 
 
             match(input, Token.DOWN, null); 
             pc1=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1393); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1399); 
 
             match(input, Token.UP, null); 
-            match(input,VK_ACTION,FOLLOW_VK_ACTION_in_accumulate_init_clause1401); 
+            match(input,VK_ACTION,FOLLOW_VK_ACTION_in_accumulate_init_clause1407); 
 
             match(input, Token.DOWN, null); 
             pc2=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1405); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1411); 
 
             match(input, Token.UP, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:268:7: (rev= accumulate_init_reverse_clause )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA34_0==VK_REVERSE) ) {
-                alt34=1;
+            if ( (LA35_0==VK_REVERSE) ) {
+                alt35=1;
             }
-            switch (alt34) {
+            switch (alt35) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:268:7: rev= accumulate_init_reverse_clause
                     {
-                    pushFollow(FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1414);
+                    pushFollow(FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1420);
                     rev=accumulate_init_reverse_clause();
                     _fsp--;
 
@@ -2799,11 +2833,11 @@
 
             }
 
-            match(input,VK_RESULT,FOLLOW_VK_RESULT_in_accumulate_init_clause1421); 
+            match(input,VK_RESULT,FOLLOW_VK_RESULT_in_accumulate_init_clause1427); 
 
             match(input, Token.DOWN, null); 
             pc3=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1425); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1431); 
 
             match(input, Token.UP, null); 
 
@@ -2846,11 +2880,11 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:278:4: ^(vk= VK_REVERSE pc= VT_PAREN_CHUNK )
             {
             vk=(DroolsTree)input.LT(1);
-            match(input,VK_REVERSE,FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1448); 
+            match(input,VK_REVERSE,FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1454); 
 
             match(input, Token.DOWN, null); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1452); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1458); 
 
             match(input, Token.UP, null); 
             	retval.vkReverse = vk;
@@ -2882,13 +2916,13 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:284:2: ( ^( VT_ACCUMULATE_ID_CLAUSE id= ID pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:284:4: ^( VT_ACCUMULATE_ID_CLAUSE id= ID pc= VT_PAREN_CHUNK )
             {
-            match(input,VT_ACCUMULATE_ID_CLAUSE,FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1474); 
+            match(input,VT_ACCUMULATE_ID_CLAUSE,FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1480); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accumulate_id_clause1478); 
+            match(input,ID,FOLLOW_ID_in_accumulate_id_clause1484); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1482); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1488); 
 
             match(input, Token.UP, null); 
             	accumulateDescr = factory.setupAccumulateId(accumulateParam, id, pc);	
@@ -2930,24 +2964,24 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:291:3: ( ^( VT_FROM_SOURCE id= ID (pc= VT_PAREN_CHUNK )? ( expression_chain )? ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:291:5: ^( VT_FROM_SOURCE id= ID (pc= VT_PAREN_CHUNK )? ( expression_chain )? )
             {
-            match(input,VT_FROM_SOURCE,FOLLOW_VT_FROM_SOURCE_in_from_source_clause1504); 
+            match(input,VT_FROM_SOURCE,FOLLOW_VT_FROM_SOURCE_in_from_source_clause1510); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_source_clause1508); 
+            match(input,ID,FOLLOW_ID_in_from_source_clause1514); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:291:30: (pc= VT_PAREN_CHUNK )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA35_0==VT_PAREN_CHUNK) ) {
-                alt35=1;
+            if ( (LA36_0==VT_PAREN_CHUNK) ) {
+                alt36=1;
             }
-            switch (alt35) {
+            switch (alt36) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:291:30: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1512); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1518); 
 
                     }
                     break;
@@ -2957,17 +2991,17 @@
             	((from_source_clause_scope)from_source_clause_stack.peek()).accessorDescr = factory.createAccessor(id, pc);	
             		retval.retAccessorDescr = ((from_source_clause_scope)from_source_clause_stack.peek()).accessorDescr;	
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:294:3: ( expression_chain )?
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA36_0==VT_EXPRESSION_CHAIN) ) {
-                alt36=1;
+            if ( (LA37_0==VT_EXPRESSION_CHAIN) ) {
+                alt37=1;
             }
-            switch (alt36) {
+            switch (alt37) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:294:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source_clause1521);
+                    pushFollow(FOLLOW_expression_chain_in_from_source_clause1527);
                     expression_chain();
                     _fsp--;
 
@@ -3014,24 +3048,24 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:299:4: ^(start= VT_EXPRESSION_CHAIN id= ID (sc= VT_SQUARE_CHUNK )? (pc= VT_PAREN_CHUNK )? ( expression_chain )? )
             {
             start=(DroolsTree)input.LT(1);
-            match(input,VT_EXPRESSION_CHAIN,FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1540); 
+            match(input,VT_EXPRESSION_CHAIN,FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1546); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_expression_chain1544); 
+            match(input,ID,FOLLOW_ID_in_expression_chain1550); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:299:40: (sc= VT_SQUARE_CHUNK )?
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA37_0==VT_SQUARE_CHUNK) ) {
-                alt37=1;
+            if ( (LA38_0==VT_SQUARE_CHUNK) ) {
+                alt38=1;
             }
-            switch (alt37) {
+            switch (alt38) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:299:40: sc= VT_SQUARE_CHUNK
                     {
                     sc=(DroolsTree)input.LT(1);
-                    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1548); 
+                    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1554); 
 
                     }
                     break;
@@ -3039,18 +3073,18 @@
             }
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:299:60: (pc= VT_PAREN_CHUNK )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA38_0==VT_PAREN_CHUNK) ) {
-                alt38=1;
+            if ( (LA39_0==VT_PAREN_CHUNK) ) {
+                alt39=1;
             }
-            switch (alt38) {
+            switch (alt39) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:299:60: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_expression_chain1553); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_expression_chain1559); 
 
                     }
                     break;
@@ -3060,17 +3094,17 @@
             	DeclarativeInvokerDescr declarativeInvokerResult = factory.createExpressionChain(start, id, sc, pc);	
             		((from_source_clause_scope)from_source_clause_stack.peek()).accessorDescr.addInvoker(declarativeInvokerResult);	
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:302:3: ( expression_chain )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA39_0==VT_EXPRESSION_CHAIN) ) {
-                alt39=1;
+            if ( (LA40_0==VT_EXPRESSION_CHAIN) ) {
+                alt40=1;
             }
-            switch (alt39) {
+            switch (alt40) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:302:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain1561);
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain1567);
                     expression_chain();
                     _fsp--;
 
@@ -3111,27 +3145,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:306:2: ( ^( VT_PATTERN fe= fact_expression ) (oc= over_clause )? )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:306:4: ^( VT_PATTERN fe= fact_expression ) (oc= over_clause )?
             {
-            match(input,VT_PATTERN,FOLLOW_VT_PATTERN_in_lhs_pattern1579); 
+            match(input,VT_PATTERN,FOLLOW_VT_PATTERN_in_lhs_pattern1585); 
 
             match(input, Token.DOWN, null); 
-            pushFollow(FOLLOW_fact_expression_in_lhs_pattern1583);
+            pushFollow(FOLLOW_fact_expression_in_lhs_pattern1589);
             fe=fact_expression();
             _fsp--;
 
 
             match(input, Token.UP, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:306:39: (oc= over_clause )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA40_0==OVER) ) {
-                alt40=1;
+            if ( (LA41_0==OVER) ) {
+                alt41=1;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:306:39: oc= over_clause
                     {
-                    pushFollow(FOLLOW_over_clause_in_lhs_pattern1588);
+                    pushFollow(FOLLOW_over_clause_in_lhs_pattern1594);
                     oc=over_clause();
                     _fsp--;
 
@@ -3170,26 +3204,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:312:2: ( ^( OVER (oe= over_element )+ ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:312:4: ^( OVER (oe= over_element )+ )
             {
-            match(input,OVER,FOLLOW_OVER_in_over_clause1613); 
+            match(input,OVER,FOLLOW_OVER_in_over_clause1619); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:312:11: (oe= over_element )+
-            int cnt41=0;
-            loop41:
+            int cnt42=0;
+            loop42:
             do {
-                int alt41=2;
-                int LA41_0 = input.LA(1);
+                int alt42=2;
+                int LA42_0 = input.LA(1);
 
-                if ( (LA41_0==VT_BEHAVIOR) ) {
-                    alt41=1;
+                if ( (LA42_0==VT_BEHAVIOR) ) {
+                    alt42=1;
                 }
 
 
-                switch (alt41) {
+                switch (alt42) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:312:12: oe= over_element
             	    {
-            	    pushFollow(FOLLOW_over_element_in_over_clause1618);
+            	    pushFollow(FOLLOW_over_element_in_over_clause1624);
             	    oe=over_element();
             	    _fsp--;
 
@@ -3199,12 +3233,12 @@
             	    break;
 
             	default :
-            	    if ( cnt41 >= 1 ) break loop41;
+            	    if ( cnt42 >= 1 ) break loop42;
                         EarlyExitException eee =
-                            new EarlyExitException(41, input);
+                            new EarlyExitException(42, input);
                         throw eee;
                 }
-                cnt41++;
+                cnt42++;
             } while (true);
 
 
@@ -3236,14 +3270,14 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:316:2: ( ^( VT_BEHAVIOR ID id2= ID pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:316:4: ^( VT_BEHAVIOR ID id2= ID pc= VT_PAREN_CHUNK )
             {
-            match(input,VT_BEHAVIOR,FOLLOW_VT_BEHAVIOR_in_over_element1639); 
+            match(input,VT_BEHAVIOR,FOLLOW_VT_BEHAVIOR_in_over_element1645); 
 
             match(input, Token.DOWN, null); 
-            match(input,ID,FOLLOW_ID_in_over_element1641); 
+            match(input,ID,FOLLOW_ID_in_over_element1647); 
             id2=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_element1645); 
+            match(input,ID,FOLLOW_ID_in_over_element1651); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_over_element1649); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_over_element1655); 
 
             match(input, Token.UP, null); 
             	behavior = factory.createBehavior(id2,pc);	
@@ -3302,182 +3336,182 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:323:3: ( ^( VT_FACT pt= pattern_type (fe= fact_expression )* ) | ^( VT_FACT_BINDING label= VT_LABEL fact= fact_expression ) | ^(start= VT_FACT_OR left= fact_expression right= fact_expression ) | ^( VT_FIELD field= field_element (fe= fact_expression )? ) | ^( VT_BIND_FIELD label= VT_LABEL fe= fact_expression ) | ^( VK_EVAL pc= VT_PAREN_CHUNK ) | ^(op= EQUAL fe= fact_expression ) | ^(op= NOT_EQUAL fe= fact_expression ) | ^(op= GREATER fe= fact_expression ) | ^(op= GREATER_EQUAL fe= fact_expression ) | ^(op= LESS fe= fact_expression ) | ^(op= LESS_EQUAL fe= fact_expression ) | ^(op= VK_CONTAINS (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_EXCLUDES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MATCHES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_SOUNDSLIKE (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MEMBEROF (not= VK_NOT )? fe= fact_expression ) | ^(op= ID (not= VK_NOT )? (param= VT_SQUARE_CHUN!
 K )? fe= fact_expression ) | ^( VK_IN (not= VK_NOT )? (fe= fact_expression )+ ) | ^( DOUBLE_PIPE left= fact_expression right= fact_expression ) | ^( DOUBLE_AMPER left= fact_expression right= fact_expression ) | ^( VT_ACCESSOR_PATH (ae= accessor_element )+ ) | s= STRING | i= INT | f= FLOAT | b= BOOL | n= NULL | pc= VT_PAREN_CHUNK )
-            int alt54=28;
+            int alt55=28;
             switch ( input.LA(1) ) {
             case VT_FACT:
                 {
-                alt54=1;
+                alt55=1;
                 }
                 break;
             case VT_FACT_BINDING:
                 {
-                alt54=2;
+                alt55=2;
                 }
                 break;
             case VT_FACT_OR:
                 {
-                alt54=3;
+                alt55=3;
                 }
                 break;
             case VT_FIELD:
                 {
-                alt54=4;
+                alt55=4;
                 }
                 break;
             case VT_BIND_FIELD:
                 {
-                alt54=5;
+                alt55=5;
                 }
                 break;
             case VK_EVAL:
                 {
-                alt54=6;
+                alt55=6;
                 }
                 break;
             case EQUAL:
                 {
-                alt54=7;
+                alt55=7;
                 }
                 break;
             case NOT_EQUAL:
                 {
-                alt54=8;
+                alt55=8;
                 }
                 break;
             case GREATER:
                 {
-                alt54=9;
+                alt55=9;
                 }
                 break;
             case GREATER_EQUAL:
                 {
-                alt54=10;
+                alt55=10;
                 }
                 break;
             case LESS:
                 {
-                alt54=11;
+                alt55=11;
                 }
                 break;
             case LESS_EQUAL:
                 {
-                alt54=12;
+                alt55=12;
                 }
                 break;
             case VK_CONTAINS:
                 {
-                alt54=13;
+                alt55=13;
                 }
                 break;
             case VK_EXCLUDES:
                 {
-                alt54=14;
+                alt55=14;
                 }
                 break;
             case VK_MATCHES:
                 {
-                alt54=15;
+                alt55=15;
                 }
                 break;
             case VK_SOUNDSLIKE:
                 {
-                alt54=16;
+                alt55=16;
                 }
                 break;
             case VK_MEMBEROF:
                 {
-                alt54=17;
+                alt55=17;
                 }
                 break;
             case ID:
                 {
-                alt54=18;
+                alt55=18;
                 }
                 break;
             case VK_IN:
                 {
-                alt54=19;
+                alt55=19;
                 }
                 break;
             case DOUBLE_PIPE:
                 {
-                alt54=20;
+                alt55=20;
                 }
                 break;
             case DOUBLE_AMPER:
                 {
-                alt54=21;
+                alt55=21;
                 }
                 break;
             case VT_ACCESSOR_PATH:
                 {
-                alt54=22;
+                alt55=22;
                 }
                 break;
             case STRING:
                 {
-                alt54=23;
+                alt55=23;
                 }
                 break;
             case INT:
                 {
-                alt54=24;
+                alt55=24;
                 }
                 break;
             case FLOAT:
                 {
-                alt54=25;
+                alt55=25;
                 }
                 break;
             case BOOL:
                 {
-                alt54=26;
+                alt55=26;
                 }
                 break;
             case NULL:
                 {
-                alt54=27;
+                alt55=27;
                 }
                 break;
             case VT_PAREN_CHUNK:
                 {
-                alt54=28;
+                alt55=28;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("320:1: fact_expression returns [BaseDescr descr] : ( ^( VT_FACT pt= pattern_type (fe= fact_expression )* ) | ^( VT_FACT_BINDING label= VT_LABEL fact= fact_expression ) | ^(start= VT_FACT_OR left= fact_expression right= fact_expression ) | ^( VT_FIELD field= field_element (fe= fact_expression )? ) | ^( VT_BIND_FIELD label= VT_LABEL fe= fact_expression ) | ^( VK_EVAL pc= VT_PAREN_CHUNK ) | ^(op= EQUAL fe= fact_expression ) | ^(op= NOT_EQUAL fe= fact_expression ) | ^(op= GREATER fe= fact_expression ) | ^(op= GREATER_EQUAL fe= fact_expression ) | ^(op= LESS fe= fact_expression ) | ^(op= LESS_EQUAL fe= fact_expression ) | ^(op= VK_CONTAINS (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_EXCLUDES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MATCHES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_SOUNDSLIKE (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MEMBEROF (not= VK_NOT )? fe= fact_expression ) | ^(op= ID (not= VK_NOT )? (!
 param= VT_SQUARE_CHUNK )? fe= fact_expression ) | ^( VK_IN (not= VK_NOT )? (fe= fact_expression )+ ) | ^( DOUBLE_PIPE left= fact_expression right= fact_expression ) | ^( DOUBLE_AMPER left= fact_expression right= fact_expression ) | ^( VT_ACCESSOR_PATH (ae= accessor_element )+ ) | s= STRING | i= INT | f= FLOAT | b= BOOL | n= NULL | pc= VT_PAREN_CHUNK );", 54, 0, input);
+                    new NoViableAltException("320:1: fact_expression returns [BaseDescr descr] : ( ^( VT_FACT pt= pattern_type (fe= fact_expression )* ) | ^( VT_FACT_BINDING label= VT_LABEL fact= fact_expression ) | ^(start= VT_FACT_OR left= fact_expression right= fact_expression ) | ^( VT_FIELD field= field_element (fe= fact_expression )? ) | ^( VT_BIND_FIELD label= VT_LABEL fe= fact_expression ) | ^( VK_EVAL pc= VT_PAREN_CHUNK ) | ^(op= EQUAL fe= fact_expression ) | ^(op= NOT_EQUAL fe= fact_expression ) | ^(op= GREATER fe= fact_expression ) | ^(op= GREATER_EQUAL fe= fact_expression ) | ^(op= LESS fe= fact_expression ) | ^(op= LESS_EQUAL fe= fact_expression ) | ^(op= VK_CONTAINS (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_EXCLUDES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MATCHES (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_SOUNDSLIKE (not= VK_NOT )? fe= fact_expression ) | ^(op= VK_MEMBEROF (not= VK_NOT )? fe= fact_expression ) | ^(op= ID (not= VK_NOT )? (!
 param= VT_SQUARE_CHUNK )? fe= fact_expression ) | ^( VK_IN (not= VK_NOT )? (fe= fact_expression )+ ) | ^( DOUBLE_PIPE left= fact_expression right= fact_expression ) | ^( DOUBLE_AMPER left= fact_expression right= fact_expression ) | ^( VT_ACCESSOR_PATH (ae= accessor_element )+ ) | s= STRING | i= INT | f= FLOAT | b= BOOL | n= NULL | pc= VT_PAREN_CHUNK );", 55, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt54) {
+            switch (alt55) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:323:5: ^( VT_FACT pt= pattern_type (fe= fact_expression )* )
                     {
-                    match(input,VT_FACT,FOLLOW_VT_FACT_in_fact_expression1672); 
+                    match(input,VT_FACT,FOLLOW_VT_FACT_in_fact_expression1678); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_pattern_type_in_fact_expression1676);
+                    pushFollow(FOLLOW_pattern_type_in_fact_expression1682);
                     pt=pattern_type();
                     _fsp--;
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:323:31: (fe= fact_expression )*
-                    loop42:
+                    loop43:
                     do {
-                        int alt42=2;
-                        int LA42_0 = input.LA(1);
+                        int alt43=2;
+                        int LA43_0 = input.LA(1);
 
-                        if ( (LA42_0==VT_FACT||LA42_0==VT_PAREN_CHUNK||(LA42_0>=VT_FACT_BINDING && LA42_0<=VT_ACCESSOR_PATH)||(LA42_0>=VK_EVAL && LA42_0<=VK_MEMBEROF)||LA42_0==VK_IN||LA42_0==ID||LA42_0==STRING||(LA42_0>=BOOL && LA42_0<=DOUBLE_AMPER)||(LA42_0>=EQUAL && LA42_0<=NOT_EQUAL)||(LA42_0>=FLOAT && LA42_0<=NULL)) ) {
-                            alt42=1;
+                        if ( (LA43_0==VT_FACT||LA43_0==VT_PAREN_CHUNK||(LA43_0>=VT_FACT_BINDING && LA43_0<=VT_ACCESSOR_PATH)||(LA43_0>=VK_EVAL && LA43_0<=VK_MEMBEROF)||LA43_0==VK_IN||LA43_0==ID||LA43_0==STRING||(LA43_0>=BOOL && LA43_0<=DOUBLE_AMPER)||(LA43_0>=EQUAL && LA43_0<=NOT_EQUAL)||(LA43_0>=FLOAT && LA43_0<=NULL)) ) {
+                            alt43=1;
                         }
 
 
-                        switch (alt42) {
+                        switch (alt43) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:323:32: fe= fact_expression
                     	    {
-                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression1681);
+                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression1687);
                     	    fe=fact_expression();
                     	    _fsp--;
 
@@ -3487,7 +3521,7 @@
                     	    break;
 
                     	default :
-                    	    break loop42;
+                    	    break loop43;
                         }
                     } while (true);
 
@@ -3500,12 +3534,12 @@
                 case 2 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:325:4: ^( VT_FACT_BINDING label= VT_LABEL fact= fact_expression )
                     {
-                    match(input,VT_FACT_BINDING,FOLLOW_VT_FACT_BINDING_in_fact_expression1695); 
+                    match(input,VT_FACT_BINDING,FOLLOW_VT_FACT_BINDING_in_fact_expression1701); 
 
                     match(input, Token.DOWN, null); 
                     label=(DroolsTree)input.LT(1);
-                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1699); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1703);
+                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1705); 
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1709);
                     fact=fact_expression();
                     _fsp--;
 
@@ -3519,14 +3553,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:327:4: ^(start= VT_FACT_OR left= fact_expression right= fact_expression )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_FACT_OR,FOLLOW_VT_FACT_OR_in_fact_expression1715); 
+                    match(input,VT_FACT_OR,FOLLOW_VT_FACT_OR_in_fact_expression1721); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1719);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1725);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1723);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1729);
                     right=fact_expression();
                     _fsp--;
 
@@ -3539,25 +3573,25 @@
                 case 4 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:330:4: ^( VT_FIELD field= field_element (fe= fact_expression )? )
                     {
-                    match(input,VT_FIELD,FOLLOW_VT_FIELD_in_fact_expression1734); 
+                    match(input,VT_FIELD,FOLLOW_VT_FIELD_in_fact_expression1740); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_field_element_in_fact_expression1738);
+                    pushFollow(FOLLOW_field_element_in_fact_expression1744);
                     field=field_element();
                     _fsp--;
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:330:37: (fe= fact_expression )?
-                    int alt43=2;
-                    int LA43_0 = input.LA(1);
+                    int alt44=2;
+                    int LA44_0 = input.LA(1);
 
-                    if ( (LA43_0==VT_FACT||LA43_0==VT_PAREN_CHUNK||(LA43_0>=VT_FACT_BINDING && LA43_0<=VT_ACCESSOR_PATH)||(LA43_0>=VK_EVAL && LA43_0<=VK_MEMBEROF)||LA43_0==VK_IN||LA43_0==ID||LA43_0==STRING||(LA43_0>=BOOL && LA43_0<=DOUBLE_AMPER)||(LA43_0>=EQUAL && LA43_0<=NOT_EQUAL)||(LA43_0>=FLOAT && LA43_0<=NULL)) ) {
-                        alt43=1;
+                    if ( (LA44_0==VT_FACT||LA44_0==VT_PAREN_CHUNK||(LA44_0>=VT_FACT_BINDING && LA44_0<=VT_ACCESSOR_PATH)||(LA44_0>=VK_EVAL && LA44_0<=VK_MEMBEROF)||LA44_0==VK_IN||LA44_0==ID||LA44_0==STRING||(LA44_0>=BOOL && LA44_0<=DOUBLE_AMPER)||(LA44_0>=EQUAL && LA44_0<=NOT_EQUAL)||(LA44_0>=FLOAT && LA44_0<=NULL)) ) {
+                        alt44=1;
                     }
-                    switch (alt43) {
+                    switch (alt44) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:330:37: fe= fact_expression
                             {
-                            pushFollow(FOLLOW_fact_expression_in_fact_expression1742);
+                            pushFollow(FOLLOW_fact_expression_in_fact_expression1748);
                             fe=fact_expression();
                             _fsp--;
 
@@ -3580,12 +3614,12 @@
                 case 5 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:336:4: ^( VT_BIND_FIELD label= VT_LABEL fe= fact_expression )
                     {
-                    match(input,VT_BIND_FIELD,FOLLOW_VT_BIND_FIELD_in_fact_expression1753); 
+                    match(input,VT_BIND_FIELD,FOLLOW_VT_BIND_FIELD_in_fact_expression1759); 
 
                     match(input, Token.DOWN, null); 
                     label=(DroolsTree)input.LT(1);
-                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1757); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1761);
+                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1763); 
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1767);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3598,11 +3632,11 @@
                 case 6 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:339:4: ^( VK_EVAL pc= VT_PAREN_CHUNK )
                     {
-                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_fact_expression1772); 
+                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_fact_expression1778); 
 
                     match(input, Token.DOWN, null); 
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression1776); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression1782); 
 
                     match(input, Token.UP, null); 
                     	retval.descr = factory.createPredicate(pc);	
@@ -3613,10 +3647,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:342:4: ^(op= EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,EQUAL,FOLLOW_EQUAL_in_fact_expression1789); 
+                    match(input,EQUAL,FOLLOW_EQUAL_in_fact_expression1795); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1793);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1799);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3630,10 +3664,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:344:4: ^(op= NOT_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_fact_expression1805); 
+                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_fact_expression1811); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1809);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1815);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3647,10 +3681,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:346:4: ^(op= GREATER fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,GREATER,FOLLOW_GREATER_in_fact_expression1821); 
+                    match(input,GREATER,FOLLOW_GREATER_in_fact_expression1827); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1825);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1831);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3664,10 +3698,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:348:4: ^(op= GREATER_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_fact_expression1837); 
+                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_fact_expression1843); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1841);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1847);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3681,10 +3715,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:350:4: ^(op= LESS fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,LESS,FOLLOW_LESS_in_fact_expression1853); 
+                    match(input,LESS,FOLLOW_LESS_in_fact_expression1859); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1857);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1863);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3698,10 +3732,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:352:4: ^(op= LESS_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_fact_expression1869); 
+                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_fact_expression1875); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1873);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1879);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3715,29 +3749,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:354:4: ^(op= VK_CONTAINS (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_CONTAINS,FOLLOW_VK_CONTAINS_in_fact_expression1885); 
+                    match(input,VK_CONTAINS,FOLLOW_VK_CONTAINS_in_fact_expression1891); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:354:24: (not= VK_NOT )?
-                    int alt44=2;
-                    int LA44_0 = input.LA(1);
+                    int alt45=2;
+                    int LA45_0 = input.LA(1);
 
-                    if ( (LA44_0==VK_NOT) ) {
-                        alt44=1;
+                    if ( (LA45_0==VK_NOT) ) {
+                        alt45=1;
                     }
-                    switch (alt44) {
+                    switch (alt45) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:354:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1889); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1895); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1894);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1900);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3751,29 +3785,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:356:4: ^(op= VK_EXCLUDES (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_EXCLUDES,FOLLOW_VK_EXCLUDES_in_fact_expression1906); 
+                    match(input,VK_EXCLUDES,FOLLOW_VK_EXCLUDES_in_fact_expression1912); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:356:24: (not= VK_NOT )?
-                    int alt45=2;
-                    int LA45_0 = input.LA(1);
+                    int alt46=2;
+                    int LA46_0 = input.LA(1);
 
-                    if ( (LA45_0==VK_NOT) ) {
-                        alt45=1;
+                    if ( (LA46_0==VK_NOT) ) {
+                        alt46=1;
                     }
-                    switch (alt45) {
+                    switch (alt46) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:356:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1910); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1916); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1915);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1921);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3787,29 +3821,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:358:4: ^(op= VK_MATCHES (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_MATCHES,FOLLOW_VK_MATCHES_in_fact_expression1927); 
+                    match(input,VK_MATCHES,FOLLOW_VK_MATCHES_in_fact_expression1933); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:358:23: (not= VK_NOT )?
-                    int alt46=2;
-                    int LA46_0 = input.LA(1);
+                    int alt47=2;
+                    int LA47_0 = input.LA(1);
 
-                    if ( (LA46_0==VK_NOT) ) {
-                        alt46=1;
+                    if ( (LA47_0==VK_NOT) ) {
+                        alt47=1;
                     }
-                    switch (alt46) {
+                    switch (alt47) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:358:23: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1931); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1937); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1936);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1942);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3823,29 +3857,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:360:4: ^(op= VK_SOUNDSLIKE (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_SOUNDSLIKE,FOLLOW_VK_SOUNDSLIKE_in_fact_expression1948); 
+                    match(input,VK_SOUNDSLIKE,FOLLOW_VK_SOUNDSLIKE_in_fact_expression1954); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:360:26: (not= VK_NOT )?
-                    int alt47=2;
-                    int LA47_0 = input.LA(1);
+                    int alt48=2;
+                    int LA48_0 = input.LA(1);
 
-                    if ( (LA47_0==VK_NOT) ) {
-                        alt47=1;
+                    if ( (LA48_0==VK_NOT) ) {
+                        alt48=1;
                     }
-                    switch (alt47) {
+                    switch (alt48) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:360:26: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1952); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1958); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1957);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1963);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3859,29 +3893,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:362:4: ^(op= VK_MEMBEROF (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_MEMBEROF,FOLLOW_VK_MEMBEROF_in_fact_expression1969); 
+                    match(input,VK_MEMBEROF,FOLLOW_VK_MEMBEROF_in_fact_expression1975); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:362:24: (not= VK_NOT )?
-                    int alt48=2;
-                    int LA48_0 = input.LA(1);
+                    int alt49=2;
+                    int LA49_0 = input.LA(1);
 
-                    if ( (LA48_0==VK_NOT) ) {
-                        alt48=1;
+                    if ( (LA49_0==VK_NOT) ) {
+                        alt49=1;
                     }
-                    switch (alt48) {
+                    switch (alt49) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:362:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1973); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1979); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1978);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1984);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3895,22 +3929,22 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:364:4: ^(op= ID (not= VK_NOT )? (param= VT_SQUARE_CHUNK )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_fact_expression1990); 
+                    match(input,ID,FOLLOW_ID_in_fact_expression1996); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:364:15: (not= VK_NOT )?
-                    int alt49=2;
-                    int LA49_0 = input.LA(1);
+                    int alt50=2;
+                    int LA50_0 = input.LA(1);
 
-                    if ( (LA49_0==VK_NOT) ) {
-                        alt49=1;
+                    if ( (LA50_0==VK_NOT) ) {
+                        alt50=1;
                     }
-                    switch (alt49) {
+                    switch (alt50) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:364:15: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1994); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2000); 
 
                             }
                             break;
@@ -3918,25 +3952,25 @@
                     }
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:364:29: (param= VT_SQUARE_CHUNK )?
-                    int alt50=2;
-                    int LA50_0 = input.LA(1);
+                    int alt51=2;
+                    int LA51_0 = input.LA(1);
 
-                    if ( (LA50_0==VT_SQUARE_CHUNK) ) {
-                        alt50=1;
+                    if ( (LA51_0==VT_SQUARE_CHUNK) ) {
+                        alt51=1;
                     }
-                    switch (alt50) {
+                    switch (alt51) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:364:29: param= VT_SQUARE_CHUNK
                             {
                             param=(DroolsTree)input.LT(1);
-                            match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_fact_expression1999); 
+                            match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2005); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2004);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2010);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3949,22 +3983,22 @@
                 case 19 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:367:4: ^( VK_IN (not= VK_NOT )? (fe= fact_expression )+ )
                     {
-                    match(input,VK_IN,FOLLOW_VK_IN_in_fact_expression2015); 
+                    match(input,VK_IN,FOLLOW_VK_IN_in_fact_expression2021); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:367:15: (not= VK_NOT )?
-                    int alt51=2;
-                    int LA51_0 = input.LA(1);
+                    int alt52=2;
+                    int LA52_0 = input.LA(1);
 
-                    if ( (LA51_0==VK_NOT) ) {
-                        alt51=1;
+                    if ( (LA52_0==VK_NOT) ) {
+                        alt52=1;
                     }
-                    switch (alt51) {
+                    switch (alt52) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:367:15: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2019); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2025); 
 
                             }
                             break;
@@ -3972,22 +4006,22 @@
                     }
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:367:24: (fe= fact_expression )+
-                    int cnt52=0;
-                    loop52:
+                    int cnt53=0;
+                    loop53:
                     do {
-                        int alt52=2;
-                        int LA52_0 = input.LA(1);
+                        int alt53=2;
+                        int LA53_0 = input.LA(1);
 
-                        if ( (LA52_0==VT_FACT||LA52_0==VT_PAREN_CHUNK||(LA52_0>=VT_FACT_BINDING && LA52_0<=VT_ACCESSOR_PATH)||(LA52_0>=VK_EVAL && LA52_0<=VK_MEMBEROF)||LA52_0==VK_IN||LA52_0==ID||LA52_0==STRING||(LA52_0>=BOOL && LA52_0<=DOUBLE_AMPER)||(LA52_0>=EQUAL && LA52_0<=NOT_EQUAL)||(LA52_0>=FLOAT && LA52_0<=NULL)) ) {
-                            alt52=1;
+                        if ( (LA53_0==VT_FACT||LA53_0==VT_PAREN_CHUNK||(LA53_0>=VT_FACT_BINDING && LA53_0<=VT_ACCESSOR_PATH)||(LA53_0>=VK_EVAL && LA53_0<=VK_MEMBEROF)||LA53_0==VK_IN||LA53_0==ID||LA53_0==STRING||(LA53_0>=BOOL && LA53_0<=DOUBLE_AMPER)||(LA53_0>=EQUAL && LA53_0<=NOT_EQUAL)||(LA53_0>=FLOAT && LA53_0<=NULL)) ) {
+                            alt53=1;
                         }
 
 
-                        switch (alt52) {
+                        switch (alt53) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:367:25: fe= fact_expression
                     	    {
-                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression2025);
+                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression2031);
                     	    fe=fact_expression();
                     	    _fsp--;
 
@@ -3997,12 +4031,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt52 >= 1 ) break loop52;
+                    	    if ( cnt53 >= 1 ) break loop53;
                                 EarlyExitException eee =
-                                    new EarlyExitException(52, input);
+                                    new EarlyExitException(53, input);
                                 throw eee;
                         }
-                        cnt52++;
+                        cnt53++;
                     } while (true);
 
 
@@ -4014,14 +4048,14 @@
                 case 20 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:370:4: ^( DOUBLE_PIPE left= fact_expression right= fact_expression )
                     {
-                    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_expression2040); 
+                    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_expression2046); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2044);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2050);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2048);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2054);
                     right=fact_expression();
                     _fsp--;
 
@@ -4034,14 +4068,14 @@
                 case 21 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:372:4: ^( DOUBLE_AMPER left= fact_expression right= fact_expression )
                     {
-                    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_fact_expression2058); 
+                    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_fact_expression2064); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2062);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2068);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2066);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2072);
                     right=fact_expression();
                     _fsp--;
 
@@ -4054,26 +4088,26 @@
                 case 22 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:375:4: ^( VT_ACCESSOR_PATH (ae= accessor_element )+ )
                     {
-                    match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2077); 
+                    match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2083); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:375:23: (ae= accessor_element )+
-                    int cnt53=0;
-                    loop53:
+                    int cnt54=0;
+                    loop54:
                     do {
-                        int alt53=2;
-                        int LA53_0 = input.LA(1);
+                        int alt54=2;
+                        int LA54_0 = input.LA(1);
 
-                        if ( (LA53_0==VT_ACCESSOR_ELEMENT) ) {
-                            alt53=1;
+                        if ( (LA54_0==VT_ACCESSOR_ELEMENT) ) {
+                            alt54=1;
                         }
 
 
-                        switch (alt53) {
+                        switch (alt54) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:375:24: ae= accessor_element
                     	    {
-                    	    pushFollow(FOLLOW_accessor_element_in_fact_expression2082);
+                    	    pushFollow(FOLLOW_accessor_element_in_fact_expression2088);
                     	    ae=accessor_element();
                     	    _fsp--;
 
@@ -4083,12 +4117,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt53 >= 1 ) break loop53;
+                    	    if ( cnt54 >= 1 ) break loop54;
                                 EarlyExitException eee =
-                                    new EarlyExitException(53, input);
+                                    new EarlyExitException(54, input);
                                 throw eee;
                         }
-                        cnt53++;
+                        cnt54++;
                     } while (true);
 
 
@@ -4101,7 +4135,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:377:4: s= STRING
                     {
                     s=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_fact_expression2097); 
+                    match(input,STRING,FOLLOW_STRING_in_fact_expression2103); 
                     	retval.descr = factory.createStringLiteralRestriction(s);	
 
                     }
@@ -4110,7 +4144,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:379:4: i= INT
                     {
                     i=(DroolsTree)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_fact_expression2107); 
+                    match(input,INT,FOLLOW_INT_in_fact_expression2113); 
                     	retval.descr = factory.createIntLiteralRestriction(i);	
 
                     }
@@ -4119,7 +4153,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:381:4: f= FLOAT
                     {
                     f=(DroolsTree)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_fact_expression2117); 
+                    match(input,FLOAT,FOLLOW_FLOAT_in_fact_expression2123); 
                     	retval.descr = factory.createFloatLiteralRestriction(f);	
 
                     }
@@ -4128,7 +4162,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:383:4: b= BOOL
                     {
                     b=(DroolsTree)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_fact_expression2127); 
+                    match(input,BOOL,FOLLOW_BOOL_in_fact_expression2133); 
                     	retval.descr = factory.createBoolLiteralRestriction(b);	
 
                     }
@@ -4137,7 +4171,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:385:4: n= NULL
                     {
                     n=(DroolsTree)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_fact_expression2137); 
+                    match(input,NULL,FOLLOW_NULL_in_fact_expression2143); 
                     	retval.descr = factory.createNullLiteralRestriction(n);	
 
                     }
@@ -4146,7 +4180,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:387:4: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression2147); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression2153); 
                     	retval.descr = factory.createReturnValue(pc);	
 
                     }
@@ -4180,26 +4214,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:394:3: ( ^( VT_ACCESSOR_PATH (ae= accessor_element )+ ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:394:5: ^( VT_ACCESSOR_PATH (ae= accessor_element )+ )
             {
-            match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_field_element2169); 
+            match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_field_element2175); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:394:24: (ae= accessor_element )+
-            int cnt55=0;
-            loop55:
+            int cnt56=0;
+            loop56:
             do {
-                int alt55=2;
-                int LA55_0 = input.LA(1);
+                int alt56=2;
+                int LA56_0 = input.LA(1);
 
-                if ( (LA55_0==VT_ACCESSOR_ELEMENT) ) {
-                    alt55=1;
+                if ( (LA56_0==VT_ACCESSOR_ELEMENT) ) {
+                    alt56=1;
                 }
 
 
-                switch (alt55) {
+                switch (alt56) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:394:25: ae= accessor_element
             	    {
-            	    pushFollow(FOLLOW_accessor_element_in_field_element2174);
+            	    pushFollow(FOLLOW_accessor_element_in_field_element2180);
             	    ae=accessor_element();
             	    _fsp--;
 
@@ -4209,12 +4243,12 @@
             	    break;
 
             	default :
-            	    if ( cnt55 >= 1 ) break loop55;
+            	    if ( cnt56 >= 1 ) break loop56;
                         EarlyExitException eee =
-                            new EarlyExitException(55, input);
+                            new EarlyExitException(56, input);
                         throw eee;
                 }
-                cnt55++;
+                cnt56++;
             } while (true);
 
 
@@ -4248,28 +4282,28 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:399:2: ( ^( VT_ACCESSOR_ELEMENT id= ID (sc+= VT_SQUARE_CHUNK )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:399:4: ^( VT_ACCESSOR_ELEMENT id= ID (sc+= VT_SQUARE_CHUNK )* )
             {
-            match(input,VT_ACCESSOR_ELEMENT,FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2198); 
+            match(input,VT_ACCESSOR_ELEMENT,FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2204); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accessor_element2202); 
+            match(input,ID,FOLLOW_ID_in_accessor_element2208); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:399:34: (sc+= VT_SQUARE_CHUNK )*
-            loop56:
+            loop57:
             do {
-                int alt56=2;
-                int LA56_0 = input.LA(1);
+                int alt57=2;
+                int LA57_0 = input.LA(1);
 
-                if ( (LA56_0==VT_SQUARE_CHUNK) ) {
-                    alt56=1;
+                if ( (LA57_0==VT_SQUARE_CHUNK) ) {
+                    alt57=1;
                 }
 
 
-                switch (alt56) {
+                switch (alt57) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:399:34: sc+= VT_SQUARE_CHUNK
             	    {
             	    sc=(DroolsTree)input.LT(1);
-            	    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2206); 
+            	    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2212); 
             	    if (list_sc==null) list_sc=new ArrayList();
             	    list_sc.add(sc);
 
@@ -4278,7 +4312,7 @@
             	    break;
 
             	default :
-            	    break loop56;
+            	    break loop57;
                 }
             } while (true);
 
@@ -4314,27 +4348,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:2: ( ^( VT_PATTERN_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:4: ^( VT_PATTERN_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* )
             {
-            match(input,VT_PATTERN_TYPE,FOLLOW_VT_PATTERN_TYPE_in_pattern_type2227); 
+            match(input,VT_PATTERN_TYPE,FOLLOW_VT_PATTERN_TYPE_in_pattern_type2233); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:28: (idList+= ID )+
-            int cnt57=0;
-            loop57:
+            int cnt58=0;
+            loop58:
             do {
-                int alt57=2;
-                int LA57_0 = input.LA(1);
+                int alt58=2;
+                int LA58_0 = input.LA(1);
 
-                if ( (LA57_0==ID) ) {
-                    alt57=1;
+                if ( (LA58_0==ID) ) {
+                    alt58=1;
                 }
 
 
-                switch (alt57) {
+                switch (alt58) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:28: idList+= ID
             	    {
             	    idList=(DroolsTree)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_pattern_type2231); 
+            	    match(input,ID,FOLLOW_ID_in_pattern_type2237); 
             	    if (list_idList==null) list_idList=new ArrayList();
             	    list_idList.add(idList);
 
@@ -4343,32 +4377,32 @@
             	    break;
 
             	default :
-            	    if ( cnt57 >= 1 ) break loop57;
+            	    if ( cnt58 >= 1 ) break loop58;
                         EarlyExitException eee =
-                            new EarlyExitException(57, input);
+                            new EarlyExitException(58, input);
                         throw eee;
                 }
-                cnt57++;
+                cnt58++;
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:34: ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
-            loop58:
+            loop59:
             do {
-                int alt58=2;
-                int LA58_0 = input.LA(1);
+                int alt59=2;
+                int LA59_0 = input.LA(1);
 
-                if ( (LA58_0==LEFT_SQUARE) ) {
-                    alt58=1;
+                if ( (LA59_0==LEFT_SQUARE) ) {
+                    alt59=1;
                 }
 
 
-                switch (alt58) {
+                switch (alt59) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:404:35: LEFT_SQUARE rightList+= RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern_type2235); 
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern_type2241); 
             	    rightList=(DroolsTree)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern_type2239); 
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern_type2245); 
             	    if (list_rightList==null) list_rightList=new ArrayList();
             	    list_rightList.add(rightList);
 
@@ -4377,7 +4411,7 @@
             	    break;
 
             	default :
-            	    break loop58;
+            	    break loop59;
                 }
             } while (true);
 
@@ -4413,27 +4447,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:2: ( ^( VT_DATA_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:4: ^( VT_DATA_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* )
             {
-            match(input,VT_DATA_TYPE,FOLLOW_VT_DATA_TYPE_in_data_type2261); 
+            match(input,VT_DATA_TYPE,FOLLOW_VT_DATA_TYPE_in_data_type2267); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:25: (idList+= ID )+
-            int cnt59=0;
-            loop59:
+            int cnt60=0;
+            loop60:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt60=2;
+                int LA60_0 = input.LA(1);
 
-                if ( (LA59_0==ID) ) {
-                    alt59=1;
+                if ( (LA60_0==ID) ) {
+                    alt60=1;
                 }
 
 
-                switch (alt59) {
+                switch (alt60) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:25: idList+= ID
             	    {
             	    idList=(DroolsTree)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_data_type2265); 
+            	    match(input,ID,FOLLOW_ID_in_data_type2271); 
             	    if (list_idList==null) list_idList=new ArrayList();
             	    list_idList.add(idList);
 
@@ -4442,32 +4476,32 @@
             	    break;
 
             	default :
-            	    if ( cnt59 >= 1 ) break loop59;
+            	    if ( cnt60 >= 1 ) break loop60;
                         EarlyExitException eee =
-                            new EarlyExitException(59, input);
+                            new EarlyExitException(60, input);
                         throw eee;
                 }
-                cnt59++;
+                cnt60++;
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:31: ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
-            loop60:
+            loop61:
             do {
-                int alt60=2;
-                int LA60_0 = input.LA(1);
+                int alt61=2;
+                int LA61_0 = input.LA(1);
 
-                if ( (LA60_0==LEFT_SQUARE) ) {
-                    alt60=1;
+                if ( (LA61_0==LEFT_SQUARE) ) {
+                    alt61=1;
                 }
 
 
-                switch (alt60) {
+                switch (alt61) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:409:32: LEFT_SQUARE rightList+= RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_data_type2269); 
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_data_type2275); 
             	    rightList=(DroolsTree)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_data_type2273); 
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_data_type2279); 
             	    if (list_rightList==null) list_rightList=new ArrayList();
             	    list_rightList.add(rightList);
 
@@ -4476,7 +4510,7 @@
             	    break;
 
             	default :
-            	    break loop60;
+            	    break loop61;
                 }
             } while (true);
 
@@ -4594,155 +4628,156 @@
     public static final BitSet FOLLOW_VK_DATE_EXPIRES_in_rule_attribute962 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_STRING_in_rule_attribute966 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_ENABLED_in_rule_attribute976 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute980 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute990 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute994 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1004 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute1008 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_DIALECT_in_rule_attribute1018 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute1022 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_AND_IMPLICIT_in_lhs_block1047 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs_block1052 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_OR_PREFIX_in_lhs1078 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1083 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_OR_INFIX_in_lhs1099 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1103 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
-    public static final BitSet FOLLOW_lhs_in_lhs1107 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_AND_PREFIX_in_lhs1119 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1124 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_AND_INFIX_in_lhs1140 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1144 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
-    public static final BitSet FOLLOW_lhs_in_lhs1148 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EXISTS_in_lhs1160 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1164 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_NOT_in_lhs1176 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1180 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EVAL_in_lhs1192 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_lhs1196 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_FORALL_in_lhs1208 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1213 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_FROM_in_lhs1227 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs1231 = new BitSet(new long[]{0x0000000020000000L,0x000000A000000100L});
-    public static final BitSet FOLLOW_from_elements_in_lhs1235 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs1246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_from_elements1267 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_from_elements1271 = new BitSet(new long[]{0x0000000018000000L});
-    public static final BitSet FOLLOW_accumulate_parts_in_from_elements1281 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_COLLECT_in_from_elements1294 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_from_elements1298 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ENTRY_POINT_in_from_elements1310 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1314 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_from_source_clause_in_from_elements1325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_parts1346 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_parts1357 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1380 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause1389 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1393 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ACTION_in_accumulate_init_clause1401 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1405 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1414 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_VK_RESULT_in_accumulate_init_clause1421 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1425 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1448 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1452 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1474 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_accumulate_id_clause1478 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1482 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FROM_SOURCE_in_from_source_clause1504 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_from_source_clause1508 = new BitSet(new long[]{0x0000000040100008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1512 = new BitSet(new long[]{0x0000000040000008L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source_clause1521 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1540 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_expression_chain1544 = new BitSet(new long[]{0x0000000040180008L});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1548 = new BitSet(new long[]{0x0000000040100008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_expression_chain1553 = new BitSet(new long[]{0x0000000040000008L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain1561 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_PATTERN_in_lhs_pattern1579 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_lhs_pattern1583 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_over_clause_in_lhs_pattern1588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OVER_in_over_clause1613 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_over_element_in_over_clause1618 = new BitSet(new long[]{0x0000000000200008L});
-    public static final BitSet FOLLOW_VT_BEHAVIOR_in_over_element1639 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_over_element1641 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_over_element1645 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_over_element1649 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FACT_in_fact_expression1672 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_pattern_type_in_fact_expression1676 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1681 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_VT_FACT_BINDING_in_fact_expression1695 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1699 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1703 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FACT_OR_in_fact_expression1715 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1719 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1723 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FIELD_in_fact_expression1734 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_field_element_in_fact_expression1738 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1742 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_BIND_FIELD_in_fact_expression1753 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1757 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1761 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EVAL_in_fact_expression1772 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression1776 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_EQUAL_in_fact_expression1789 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1793 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_NOT_EQUAL_in_fact_expression1805 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1809 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_GREATER_in_fact_expression1821 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1825 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_GREATER_EQUAL_in_fact_expression1837 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1841 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_LESS_in_fact_expression1853 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1857 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_LESS_EQUAL_in_fact_expression1869 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1873 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_CONTAINS_in_fact_expression1885 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1889 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1894 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EXCLUDES_in_fact_expression1906 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1910 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1915 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_MATCHES_in_fact_expression1927 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1931 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1936 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_SOUNDSLIKE_in_fact_expression1948 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1952 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1957 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_MEMBEROF_in_fact_expression1969 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1973 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1978 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_ID_in_fact_expression1990 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1994 = new BitSet(new long[]{0x0000001F00180040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression1999 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2004 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_IN_in_fact_expression2015 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2019 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2025 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_expression2040 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2044 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2048 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_fact_expression2058 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2062 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2066 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2077 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_accessor_element_in_fact_expression2082 = new BitSet(new long[]{0x0000002000000008L});
-    public static final BitSet FOLLOW_STRING_in_fact_expression2097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_fact_expression2107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_fact_expression2117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_fact_expression2127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_fact_expression2137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression2147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_field_element2169 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_accessor_element_in_field_element2174 = new BitSet(new long[]{0x0000002000000008L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2198 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_accessor_element2202 = new BitSet(new long[]{0x0000000000080008L});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2206 = new BitSet(new long[]{0x0000000000080008L});
-    public static final BitSet FOLLOW_VT_PATTERN_TYPE_in_pattern_type2227 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_pattern_type2231 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern_type2235 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern_type2239 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
-    public static final BitSet FOLLOW_VT_DATA_TYPE_in_data_type2261 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_data_type2265 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_data_type2269 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_data_type2273 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute981 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_rule_attribute985 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute996 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute1000 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1010 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute1014 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_DIALECT_in_rule_attribute1024 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute1028 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_AND_IMPLICIT_in_lhs_block1053 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs_block1058 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
+    public static final BitSet FOLLOW_VT_OR_PREFIX_in_lhs1084 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1089 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
+    public static final BitSet FOLLOW_VT_OR_INFIX_in_lhs1105 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1109 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
+    public static final BitSet FOLLOW_lhs_in_lhs1113 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_AND_PREFIX_in_lhs1125 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1130 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
+    public static final BitSet FOLLOW_VT_AND_INFIX_in_lhs1146 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1150 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
+    public static final BitSet FOLLOW_lhs_in_lhs1154 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EXISTS_in_lhs1166 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1170 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_NOT_in_lhs1182 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1186 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EVAL_in_lhs1198 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_lhs1202 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_FORALL_in_lhs1214 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1219 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
+    public static final BitSet FOLLOW_FROM_in_lhs1233 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs1237 = new BitSet(new long[]{0x0000000020000000L,0x000000A000000100L});
+    public static final BitSet FOLLOW_from_elements_in_lhs1241 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs1252 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_from_elements1273 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_from_elements1277 = new BitSet(new long[]{0x0000000018000000L});
+    public static final BitSet FOLLOW_accumulate_parts_in_from_elements1287 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_COLLECT_in_from_elements1300 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_from_elements1304 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ENTRY_POINT_in_from_elements1316 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1320 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_from_source_clause_in_from_elements1331 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_parts1352 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_parts1363 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1386 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause1395 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1399 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ACTION_in_accumulate_init_clause1407 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1411 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1420 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
+    public static final BitSet FOLLOW_VK_RESULT_in_accumulate_init_clause1427 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1431 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1454 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1458 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1480 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_accumulate_id_clause1484 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1488 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FROM_SOURCE_in_from_source_clause1510 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_from_source_clause1514 = new BitSet(new long[]{0x0000000040100008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1518 = new BitSet(new long[]{0x0000000040000008L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source_clause1527 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1546 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_expression_chain1550 = new BitSet(new long[]{0x0000000040180008L});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1554 = new BitSet(new long[]{0x0000000040100008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_expression_chain1559 = new BitSet(new long[]{0x0000000040000008L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain1567 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_PATTERN_in_lhs_pattern1585 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_lhs_pattern1589 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_over_clause_in_lhs_pattern1594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OVER_in_over_clause1619 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_over_element_in_over_clause1624 = new BitSet(new long[]{0x0000000000200008L});
+    public static final BitSet FOLLOW_VT_BEHAVIOR_in_over_element1645 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_over_element1647 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_over_element1651 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_over_element1655 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FACT_in_fact_expression1678 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_pattern_type_in_fact_expression1682 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1687 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_VT_FACT_BINDING_in_fact_expression1701 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1705 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1709 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FACT_OR_in_fact_expression1721 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1725 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1729 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FIELD_in_fact_expression1740 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_field_element_in_fact_expression1744 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1748 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_BIND_FIELD_in_fact_expression1759 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1763 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1767 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EVAL_in_fact_expression1778 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression1782 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_EQUAL_in_fact_expression1795 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1799 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_NOT_EQUAL_in_fact_expression1811 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1815 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_GREATER_in_fact_expression1827 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1831 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_GREATER_EQUAL_in_fact_expression1843 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1847 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_LESS_in_fact_expression1859 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1863 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_LESS_EQUAL_in_fact_expression1875 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1879 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_CONTAINS_in_fact_expression1891 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1895 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1900 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EXCLUDES_in_fact_expression1912 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1916 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1921 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_MATCHES_in_fact_expression1933 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1937 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1942 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_SOUNDSLIKE_in_fact_expression1954 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1958 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1963 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_MEMBEROF_in_fact_expression1975 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1979 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1984 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_ID_in_fact_expression1996 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2000 = new BitSet(new long[]{0x0000001F00180040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2005 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2010 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_IN_in_fact_expression2021 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2025 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2031 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_expression2046 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2050 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2054 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_fact_expression2064 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2068 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2072 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2083 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_accessor_element_in_fact_expression2088 = new BitSet(new long[]{0x0000002000000008L});
+    public static final BitSet FOLLOW_STRING_in_fact_expression2103 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_fact_expression2113 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_fact_expression2123 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_fact_expression2133 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_fact_expression2143 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression2153 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_field_element2175 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_accessor_element_in_field_element2180 = new BitSet(new long[]{0x0000002000000008L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2204 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_accessor_element2208 = new BitSet(new long[]{0x0000000000080008L});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2212 = new BitSet(new long[]{0x0000000000080008L});
+    public static final BitSet FOLLOW_VT_PATTERN_TYPE_in_pattern_type2233 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_pattern_type2237 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern_type2241 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern_type2245 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
+    public static final BitSet FOLLOW_VT_DATA_TYPE_in_data_type2267 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_data_type2271 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_data_type2275 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_data_type2279 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -1494,8 +1494,8 @@
 	 */
 	private String getCleanId(DroolsTree id) {
 		String cleanedId = id.getText();
-		if (cleanedId.startsWith("\"") || cleanedId.startsWith("'")) {
-			cleanedId = cleanedId.substring(1, cleanedId.length() - 1);
+		if (cleanedId.startsWith("\"") || cleanedId.startsWith("'") ) {
+			cleanedId = cleanedId.substring(1, cleanedId.length() - 1).trim();
 		}
 		return cleanedId;
 	}

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -28,26 +28,28 @@
 import org.drools.rule.Dialectable;
 import org.drools.rule.Namespaceable;
 
-public class RuleDescr extends BaseDescr implements Dialectable, Namespaceable {
+public class RuleDescr extends BaseDescr
+    implements
+    Dialectable,
+    Namespaceable {
 
-    private static final long serialVersionUID = 400L;
-    private String            namespace;    
-    private String            name;
-    private String            dialect;
-    private String            documentation;
-    private Map<String, String> metaAttributes;
+    private static final long    serialVersionUID = 400L;
+    private String               namespace;
+    private String               name;
+    private String               dialect;
+    private String               documentation;
+    private Map<String, String>  metaAttributes;
 
-    private AndDescr          lhs;
-    private Object            consequence;
-    private int               consequenceLine;
-    private int               consequencePattern;
-    private int               offset;
-    private List              attributes       = Collections.EMPTY_LIST;
-    private String            salience;
+    private AndDescr             lhs;
+    private Object               consequence;
+    private int                  consequenceLine;
+    private int                  consequencePattern;
+    private int                  offset;
+    private List<AttributeDescr> attributes       = Collections.EMPTY_LIST;
+    private String               salience;
 
-    private String            className;
+    private String               className;
 
-
     public RuleDescr() {
     }
 
@@ -56,7 +58,6 @@
               "" );
     }
 
-
     public RuleDescr(final String ruleName,
                      final String documentation) {
         this.name = ruleName;
@@ -64,46 +65,46 @@
         this.metaAttributes = new HashMap<String, String>();
     }
 
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        super.readExternal(in);
+    public void readExternal(ObjectInput in) throws IOException,
+                                            ClassNotFoundException {
+        super.readExternal( in );
         namespace = (String) in.readObject();
-        name    = (String)in.readObject();
-        dialect    = (String)in.readObject();
-        documentation    = (String)in.readObject();
-        consequence    = in.readObject();
-        lhs    = (AndDescr)in.readObject();
-        consequenceLine    = in.readInt();
-        consequencePattern    = in.readInt();
-        offset    = in.readInt();
-        attributes    = (List)in.readObject();
-        salience    = (String)in.readObject();
-        className    = (String)in.readObject();
+        name = (String) in.readObject();
+        dialect = (String) in.readObject();
+        documentation = (String) in.readObject();
+        consequence = in.readObject();
+        lhs = (AndDescr) in.readObject();
+        consequenceLine = in.readInt();
+        consequencePattern = in.readInt();
+        offset = in.readInt();
+        attributes = (List<AttributeDescr>) in.readObject();
+        salience = (String) in.readObject();
+        className = (String) in.readObject();
     }
 
     public void writeExternal(ObjectOutput out) throws IOException {
-        super.writeExternal(out);
+        super.writeExternal( out );
         out.writeObject( namespace );
-        out.writeObject(name);
-        out.writeObject(dialect);
-        out.writeObject(documentation);
-        out.writeObject(consequence);
-        out.writeObject(lhs);
-        out.writeInt(consequenceLine);
-        out.writeInt(consequencePattern);
-        out.writeInt(offset);
-        out.writeObject(attributes);
-        out.writeObject(salience);
-        out.writeObject(className);
+        out.writeObject( name );
+        out.writeObject( dialect );
+        out.writeObject( documentation );
+        out.writeObject( consequence );
+        out.writeObject( lhs );
+        out.writeInt( consequenceLine );
+        out.writeInt( consequencePattern );
+        out.writeInt( offset );
+        out.writeObject( attributes );
+        out.writeObject( salience );
+        out.writeObject( className );
     }
-    
+
     public void setNamespace(String namespace) {
         this.namespace = namespace;
     }
-    
+
     public String getNamespace() {
         return this.namespace;
     }
-    
 
     public String getName() {
         return this.name;
@@ -116,7 +117,6 @@
     public void setDialect(String dialect) {
         this.dialect = dialect;
     }
-    
 
     public String getSalience() {
         return salience;
@@ -137,17 +137,19 @@
     public String getDocumentation() {
         return this.documentation;
     }
-    
+
     /**
      * Adds a new attribute
      * @param attr
      * @param value
      */
-    public void addMetaAttribute( String attr, String value ) {
-        if( this.metaAttributes == null ) {
+    public void addMetaAttribute(String attr,
+                                 String value) {
+        if ( this.metaAttributes == null ) {
             this.metaAttributes = new HashMap<String, String>();
         }
-        this.metaAttributes.put( attr, value );
+        this.metaAttributes.put( attr,
+                                 value );
     }
 
     /**
@@ -155,7 +157,7 @@
      * @param attr
      * @return
      */
-    public String getMetaAttribute( String attr ) {
+    public String getMetaAttribute(String attr) {
         return this.metaAttributes != null ? this.metaAttributes.get( attr ) : null;
     }
 
@@ -172,7 +174,7 @@
     }
 
     public void addAttribute(final AttributeDescr attribute) {
-        if( attribute != null ) {
+        if ( attribute != null ) {
             if ( this.attributes == Collections.EMPTY_LIST ) {
                 this.attributes = new ArrayList();
             }
@@ -186,8 +188,8 @@
         }
     }
 
-    public void setAttributes(final List attributes) {
-        this.attributes = new ArrayList( attributes );
+    public void setAttributes(final List<AttributeDescr> attributes) {
+        this.attributes = new ArrayList<AttributeDescr>( attributes );
     }
 
     public AndDescr getLhs() {
@@ -228,4 +230,14 @@
         return this.consequencePattern;
     }
 
+    public String getEnabled() {
+        String enabled = "true";
+        for( AttributeDescr attr : this.attributes ) {
+            if( "enabled".equals( attr.getName() ) ) {
+                enabled = attr.getValue();
+                break;
+            }
+        }
+        return enabled;
+    }
 }
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/EnabledBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/EnabledBuilder.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/EnabledBuilder.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -0,0 +1,5 @@
+package org.drools.rule.builder;
+
+public interface EnabledBuilder {
+    public void build(final RuleBuildContext context);    
+}

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -25,6 +25,7 @@
 import java.util.Map.Entry;
 
 import org.drools.RuntimeDroolsException;
+import org.drools.base.EnabledBoolean;
 import org.drools.compiler.Dialect;
 import org.drools.compiler.DialectCompiletimeRegistry;
 import org.drools.compiler.PackageBuilder;
@@ -197,10 +198,10 @@
                 rule.setDuration( Long.parseLong( attributeDescr.getValue() ) );
                 rule.setAgendaGroup( "" );
             } else if ( name.equals( "enabled" ) ) {
-                if ( attributeDescr.getValue() == null ) {
-                    rule.setEnabled( true );
-                } else {
-                    rule.setEnabled( Boolean.valueOf( attributeDescr.getValue() ).booleanValue() );
+                if ( attributeDescr.getValue() == null || "true".equalsIgnoreCase( attributeDescr.getValue() )  ) {
+                    rule.setEnabled( EnabledBoolean.ENABLED_TRUE );
+                } else if( "false".equalsIgnoreCase( attributeDescr.getValue() ) ) {
+                    rule.setEnabled( EnabledBoolean.ENABLED_FALSE );
                 }
             } else if ( name.equals( "date-effective" ) ) {
                 final Calendar cal = Calendar.getInstance();

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -17,6 +17,7 @@
  */
 
 import org.drools.RuntimeDroolsException;
+import org.drools.base.EnabledBoolean;
 import org.drools.base.SalienceInteger;
 import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
@@ -80,6 +81,17 @@
         } catch (Exception e) {
             // It wasn't an integer, so build as an expression
             context.getDialect().getSalienceBuilder().build( context );    
-        }              
+        }     
+        
+        String enabledText = context.getRuleDescr().getEnabled();
+        if( "true".equalsIgnoreCase( enabledText.trim() ) || "false".equalsIgnoreCase( enabledText.trim() ) ) {
+            if( Boolean.parseBoolean( enabledText ) ) {
+                context.getRule().setEnabled( EnabledBoolean.ENABLED_TRUE );
+            } else {
+                context.getRule().setEnabled( EnabledBoolean.ENABLED_FALSE );
+            }
+        } else {
+            context.getDialect().getEnabledBuilder().build( context );
+        }
     }
 }
\ No newline at end of file

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -12,7 +12,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.base.ClassFieldAccessorCache;
 import org.drools.base.TypeResolver;
 import org.drools.commons.jci.compilers.CompilationResult;
 import org.drools.commons.jci.compilers.JavaCompiler;
@@ -58,6 +57,7 @@
 import org.drools.rule.builder.ActionBuilder;
 import org.drools.rule.builder.CollectBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EnabledBuilder;
 import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.ForallBuilder;
 import org.drools.rule.builder.FromBuilder;
@@ -75,6 +75,7 @@
 import org.drools.rule.builder.RuleClassBuilder;
 import org.drools.rule.builder.RuleConditionBuilder;
 import org.drools.rule.builder.SalienceBuilder;
+import org.drools.rule.builder.dialect.mvel.MVELEnabledBuilder;
 import org.drools.rule.builder.dialect.mvel.MVELFromBuilder;
 import org.drools.rule.builder.dialect.mvel.MVELSalienceBuilder;
 import org.drools.util.StringUtils;
@@ -91,6 +92,7 @@
     private static final PatternBuilder              PATTERN_BUILDER               = new PatternBuilder();
     private static final QueryBuilder                QUERY_BUILDER                 = new QueryBuilder();
     private static final SalienceBuilder             SALIENCE_BUILDER              = new MVELSalienceBuilder();
+    private static final EnabledBuilder              ENABLED_BUILDER               = new MVELEnabledBuilder();
     private static final JavaAccumulateBuilder       ACCUMULATE_BUILDER            = new JavaAccumulateBuilder();
     private static final JavaEvalBuilder             EVAL_BUILDER                  = new JavaEvalBuilder();
     private static final JavaPredicateBuilder        PREDICATE_BUILDER             = new JavaPredicateBuilder();
@@ -313,6 +315,10 @@
         return SALIENCE_BUILDER;
     }
 
+    public EnabledBuilder getEnabledBuilder() {
+        return ENABLED_BUILDER;
+    }
+
     public AccumulateBuilder getAccumulateBuilder() {
         return ACCUMULATE_BUILDER;
     }

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -8,23 +8,17 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import org.drools.RuntimeDroolsException;
-import org.drools.base.ClassFieldAccessorCache;
 import org.drools.base.ModifyInterceptor;
 import org.drools.base.TypeResolver;
 import org.drools.base.mvel.MVELCompilationUnit;
 import org.drools.base.mvel.MVELDebugHandler;
-import org.drools.common.InternalRuleBase;
 import org.drools.commons.jci.readers.MemoryResourceReader;
 import org.drools.compiler.DescrBuildError;
 import org.drools.compiler.Dialect;
@@ -48,8 +42,6 @@
 import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.Declaration;
-import org.drools.rule.DialectRuntimeRegistry;
-import org.drools.rule.JavaDialectRuntimeData;
 import org.drools.rule.LineMappings;
 import org.drools.rule.MVELDialectRuntimeData;
 import org.drools.rule.Package;
@@ -57,6 +49,7 @@
 import org.drools.rule.builder.ActionBuilder;
 import org.drools.rule.builder.CollectBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EnabledBuilder;
 import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.ForallBuilder;
 import org.drools.rule.builder.FromBuilder;
@@ -82,7 +75,6 @@
 import org.mvel.compiler.AbstractParser;
 import org.mvel.compiler.CompiledExpression;
 import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.optimizers.OptimizerFactory;
 import org.mvel.util.CompilerTools;
 import org.mvel.util.ParseTools;
 
@@ -99,6 +91,7 @@
     protected static final QueryBuilder                    QUERY_BUILDER                  = new QueryBuilder();
     protected static final MVELAccumulateBuilder           ACCUMULATE_BUILDER             = new MVELAccumulateBuilder();
     protected static final SalienceBuilder                 SALIENCE_BUILDER               = new MVELSalienceBuilder();
+    protected static final EnabledBuilder                  ENABLED_BUILDER                = new MVELEnabledBuilder();
     protected static final MVELEvalBuilder                 EVAL_BUILDER                   = new MVELEvalBuilder();
     protected static final MVELPredicateBuilder            PREDICATE_BUILDER              = new MVELPredicateBuilder();
     protected static final MVELReturnValueBuilder          RETURN_VALUE_BUILDER           = new MVELReturnValueBuilder();
@@ -781,6 +774,10 @@
         return this.SALIENCE_BUILDER;
     }
 
+    public EnabledBuilder getEnabledBuilder() {
+        return this.ENABLED_BUILDER;
+    }
+
     public List getResults() {
         return results;
     }

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -0,0 +1,56 @@
+package org.drools.rule.builder.dialect.mvel;
+
+import java.util.Set;
+
+import org.drools.base.mvel.MVELCompilationUnit;
+import org.drools.base.mvel.MVELEnabledExpression;
+import org.drools.compiler.DescrBuildError;
+import org.drools.compiler.Dialect;
+import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectRuntimeData;
+import org.drools.rule.builder.EnabledBuilder;
+import org.drools.rule.builder.RuleBuildContext;
+
+public class MVELEnabledBuilder
+    implements
+    EnabledBuilder {
+
+    public void build(RuleBuildContext context) {
+        // pushing consequence LHS into the stack for variable resolution
+        context.getBuildStack().push( context.getRule().getLhs() );
+
+        try {
+            // This builder is re-usable in other dialects, so specify by name            
+            MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
+
+            Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
+                                                                         context.getRuleDescr(),
+                                                                         (String) context.getRuleDescr().getSalience(),
+                                                                         new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+
+            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations().size()] );
+            MVELCompilationUnit unit = dialect.getMVELCompilationUnit( (String) context.getRuleDescr().getSalience(),
+                                                                       analysis,
+                                                                       previousDeclarations,
+                                                                       null,
+                                                                       null,
+                                                                       context );
+
+            MVELEnabledExpression expr = new MVELEnabledExpression( unit,
+                                                                    dialect.getId() );
+            context.getRule().setEnabled( expr );
+
+            MVELDialectRuntimeData data = (MVELDialectRuntimeData) context.getPkg().getDialectRuntimeRegistry().getDialectData( dialect.getId() );
+            data.addCompileable( context.getRule(),
+                                 expr );
+
+            expr.compile( context.getPackageBuilder().getRootClassLoader() );
+        } catch ( final Exception e ) {
+            context.getErrors().add( new DescrBuildError( context.getParentDescr(),
+                                                          context.getRuleDescr(),
+                                                          null,
+                                                          "Unable to build expression for 'enabled' : " + e.getMessage() + " '" + context.getRuleDescr().getEnabled() + "'" ) );
+        }
+    }
+
+}

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2008-10-17 19:12:30 UTC (rev 23500)
@@ -751,8 +751,10 @@
 	;
 	
 enabled
-	:	enabled_key^ {	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	} BOOL
-	{	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
+	:	enabled_key^ {	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	} 
+	    ( BOOL {	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
+	    | paren_chunk 
+	    )
 	;	
 
 salience

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g	2008-10-17 19:12:30 UTC (rev 23500)
@@ -199,7 +199,7 @@
 	|	^(attrName=VK_AUTO_FOCUS value=BOOL?) 
 	|	^(attrName=VK_DATE_EFFECTIVE value=STRING) 
 	|	^(attrName=VK_DATE_EXPIRES value=STRING) 
-	|	^(attrName=VK_ENABLED value=BOOL) 
+	|	^(attrName=VK_ENABLED (value=BOOL|value=VT_PAREN_CHUNK)) 
 	|	^(attrName=VK_RULEFLOW_GROUP value=STRING) 
 	|	^(attrName=VK_LOCK_ON_ACTIVE value=BOOL?)
 	|	^(attrName=VK_DIALECT value=STRING))

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -27,6 +27,7 @@
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.ActionBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EnabledBuilder;
 import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.GroupElementBuilder;
@@ -436,6 +437,11 @@
             // TODO Auto-generated method stub
             
         }
+
+        public EnabledBuilder getEnabledBuilder() {
+            // TODO Auto-generated method stub
+            return null;
+        }
     }
 
     public static class MockEvalBuilder

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	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -246,6 +246,36 @@
 
 
     }
+    
+    public void yyytestEnabledExpression() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_enabledExpression.drl" ) ) );
+        final Package pkg = builder.getPackage();
+
+        RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        ruleBase = SerializationHelper.serializeObject( ruleBase );
+        StatefulSession session = ruleBase.newStatefulSession();
+        List results = new ArrayList();
+        session.setGlobal( "results",
+                           results );
+
+        session.insert( new Person("Michael") );
+
+        session = SerializationHelper.getSerialisedStatefulSession( session,
+                                                                    ruleBase );
+        results = (List) session.getGlobal( "results" );
+
+        session.fireAllRules();
+        assertEquals( 3,
+                      results.size() );
+        assertTrue( results.contains( "1" ) );
+        assertTrue( results.contains( "2" ) );
+        assertTrue( results.contains( "3" ) );
+
+
+    }
+
     public void testPrimitiveArray() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_primitiveArray.drl" ) ) );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -790,7 +790,7 @@
         assertEquals( 0, IteratorToList.convert( workingMemory.iterateObjects() ).size() );
     }
 
-    public void disabled_testLogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion() throws Exception {
+    public void FIXME_testLogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion() throws Exception {
         // TODO JBRULES-1804
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl" ) ) );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -1761,6 +1761,28 @@
 		assertEquals("true", at.getValue());
 	}
 
+    public void testEnabledExpression() throws Exception {
+        final RuleDescr rule = (RuleDescr) parseResource("rule", "rule",
+                "rule_enabled_expression.drl");
+        assertEquals("simple_rule", rule.getName());
+        assertEqualsIgnoreWhitespace("bar();", (String) rule.getConsequence());
+
+        final List attrs = rule.getAttributes();
+        assertEquals(3, attrs.size());
+
+        AttributeDescr at = (AttributeDescr) attrs.get(0);
+        assertEquals("enabled", at.getName());
+        assertEquals("( 1 + 1 == 2 )", at.getValue());
+
+        at = (AttributeDescr) attrs.get(1);
+        assertEquals("salience", at.getName());
+        assertEquals("( 1+2 )", at.getValue());
+        
+        at = (AttributeDescr) attrs.get(2);
+        assertEquals("lock-on-active", at.getName());
+        assertEquals("true", at.getValue());
+    }
+
 	public void testAttributes_alternateSyntax() throws Exception {
 		final RuleDescr rule = (RuleDescr) parseResource("rule", "rule",
 				"rule_attributes_alt.drl");

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -148,7 +148,7 @@
         RuleBuildContext.setAttributes( rule, null, attributes );
 
         assertTrue( rule.isNoLoop() );
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null) );
         assertEquals( "mygroup",
                       rule.getRuleFlowGroup() );
 

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl	2008-10-17 19:12:30 UTC (rev 23500)
@@ -0,0 +1,44 @@
+package org.drools;
+
+global java.util.List results;
+
+rule "Test enabled expression 1"
+    #arbitrary expression using a rule metadata
+    enabled ( "1234".equals( drools.getRule().getMetaAttribute("ruleID") ) )
+	@ruleID(1234)
+  when
+    Person(name == "Michael")
+  then
+    results.add( "1" );
+end
+
+rule "Test enabled expression 2"
+    # using bound variables 
+    enabled ( "Michael".equals( $name ) )
+	@ruleID(1234)
+  when
+    Person( $name : name )
+  then
+    results.add( "2" );
+end
+
+rule "Test enabled expression 3"
+    # using simple expressions 
+    enabled ( 1 + 1 == 2 )
+	@ruleID(1234)
+  when
+    Person( $name : name )
+  then
+    results.add( "3" );
+end
+
+rule "Test enabled expression 4"
+    # using a false expression 
+    enabled ( 1 + 1 == 5 )
+	@ruleID(1234)
+  when
+    Person( $name : name )
+  then
+    results.add( "4" );
+end
+

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_enabled_expression.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_enabled_expression.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_enabled_expression.drl	2008-10-17 19:12:30 UTC (rev 23500)
@@ -0,0 +1,10 @@
+
+rule simple_rule 
+		enabled ( 1 + 1 == 2 )
+		salience ( 1+2 )
+		lock-on-active true
+	when
+		Foo()
+	then
+		bar();
+end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -182,7 +182,7 @@
                             final InternalWorkingMemory workingMemory,
                             final boolean fireActivationCreated) {
         //check if the rule is effective
-        if ( !this.rule.isEffective( workingMemory.getTimeMachine() ) ) {
+        if ( !this.rule.isEffective( workingMemory.getTimeMachine(), tuple, workingMemory ) ) {
             return;
         }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -25,12 +25,17 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import org.drools.WorkingMemory;
+import org.drools.base.EnabledBoolean;
 import org.drools.base.SalienceInteger;
+import org.drools.common.InternalWorkingMemory;
 import org.drools.spi.AgendaGroup;
 import org.drools.spi.CompiledInvoker;
 import org.drools.spi.Consequence;
 import org.drools.spi.Duration;
+import org.drools.spi.Enabled;
 import org.drools.spi.Salience;
+import org.drools.spi.Tuple;
 import org.drools.spi.Wireable;
 
 /**
@@ -111,7 +116,7 @@
 
     private Calendar          dateExpires;
 
-    private boolean           enabled;
+    private Enabled           enabled;
 
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeObject(pkg);
@@ -142,7 +147,7 @@
         out.writeBoolean(semanticallyValid);
         out.writeObject(dateEffective);
         out.writeObject(dateExpires);
-        out.writeBoolean(enabled);
+        out.writeObject(enabled);
     }
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         pkg = (String)in.readObject();
@@ -168,7 +173,7 @@
         semanticallyValid = in.readBoolean();
         dateEffective   = (Calendar)in.readObject();
         dateExpires = (Calendar)in.readObject();
-        enabled = in.readBoolean();
+        enabled = (Enabled) in.readObject();
     }
     // ------------------------------------------------------------
     // Constructors
@@ -192,7 +197,7 @@
         this.agendaGroup = agendaGroup;
         this.lhsRoot = GroupElementFactory.newAndInstance();
         this.semanticallyValid = true;
-        this.enabled = true;
+        this.enabled = EnabledBoolean.ENABLED_TRUE;
         this.salience = SalienceInteger.DEFAULT_SALIENCE;
         this.metaAttributes = new HashMap<String,String>();
     }
@@ -351,8 +356,8 @@
      *
      * This uses the dateEffective, dateExpires and enabled flag to decide this.
      */
-    public boolean isEffective(TimeMachine tm) {
-        if ( !this.enabled ) {
+    public boolean isEffective(TimeMachine tm, Tuple tuple, WorkingMemory workingMemory) {
+        if ( !this.enabled.getValue( tuple, workingMemory ) ) {
             return false;
         }
         if ( this.dateEffective == null && this.dateExpires == null ) {
@@ -629,12 +634,12 @@
     /**
      * A rule is enabled by default. This can explicitly disable it in which case it will never activate.
      */
-    public void setEnabled(final boolean b) {
+    public void setEnabled(final Enabled b) {
         this.enabled = b;
     }
 
-    public boolean isEnabled() {
-        return this.enabled;
+    public boolean isEnabled( Tuple tuple, WorkingMemory workingMemory ) {
+        return this.enabled.getValue( tuple, workingMemory );
     }
 	public void setMetaAttributes(Map<String,String> metaAttributes) {
 		this.metaAttributes = metaAttributes;

Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -0,0 +1,10 @@
+package org.drools.spi;
+
+import java.io.Serializable;
+
+import org.drools.WorkingMemory;
+
+public interface Enabled extends Serializable {    
+    public boolean getValue(final Tuple tuple,
+                            final WorkingMemory workingMemory);
+}

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -2,6 +2,8 @@
 
 import java.util.Calendar;
 
+import org.drools.base.EnabledBoolean;
+
 import junit.framework.TestCase;
 
 /**
@@ -12,14 +14,14 @@
     public void testDateEffective() {
         final Rule rule = new Rule( "myrule" );
 
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar earlier = Calendar.getInstance();
         earlier.setTimeInMillis( 10 );
 
         rule.setDateEffective( earlier );
 
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar later = Calendar.getInstance();
         later.setTimeInMillis( later.getTimeInMillis() + 100000000 );
@@ -27,27 +29,27 @@
         assertTrue( later.after( Calendar.getInstance() ) );
 
         rule.setDateEffective( later );
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
     }
 
     public void testDateExpires() throws Exception {
         final Rule rule = new Rule( "myrule" );
 
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar earlier = Calendar.getInstance();
         earlier.setTimeInMillis( 10 );
 
         rule.setDateExpires( earlier );
 
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar later = Calendar.getInstance();
         later.setTimeInMillis( later.getTimeInMillis() + 100000000 );
 
         rule.setDateExpires( later );
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
     }
 
@@ -63,44 +65,44 @@
         rule.setDateEffective( past );
         rule.setDateExpires( future );
 
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
         rule.setDateExpires( past );
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
         rule.setDateExpires( future );
         rule.setDateEffective( future );
 
 
 
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
     }
 
     public void testRuleEnabled() {
         final Rule rule = new Rule( "myrule" );
-        rule.setEnabled( false );
-        assertFalse( rule.isEffective(new TimeMachine()) );
+        rule.setEnabled( EnabledBoolean.ENABLED_FALSE );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar past = Calendar.getInstance();
         past.setTimeInMillis( 10 );
 
         rule.setDateEffective( past );
-        assertFalse( rule.isEffective(new TimeMachine()) );
-        rule.setEnabled( true );
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
+        rule.setEnabled( EnabledBoolean.ENABLED_TRUE );
 
-        assertTrue( rule.isEffective(new TimeMachine()) );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
     }
 
     public void testTimeMachine() {
         final Rule rule = new Rule( "myrule" );
-        rule.setEnabled( true );
-        assertTrue(rule.isEffective(new TimeMachine()));
+        rule.setEnabled( EnabledBoolean.ENABLED_TRUE );
+        assertTrue( rule.isEffective(new TimeMachine(), null, null ) );
 
         final Calendar future = Calendar.getInstance();
         future.setTimeInMillis( future.getTimeInMillis() + 100000000 );
         rule.setDateEffective(future);
-        assertFalse(rule.isEffective(new TimeMachine()));
+        assertFalse( rule.isEffective(new TimeMachine(), null, null ) );
 
         assertTrue(rule.isEffective(new TimeMachine() {
         	public Calendar getNow() {
@@ -108,10 +110,7 @@
         		loveYouLongTime.setTimeInMillis(future.getTimeInMillis() + 1000000000000L);
         		return loveYouLongTime;
         	}
-        }));
-
-
-
+        }, null, null ));
     }
 
 }

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/TemporalDistanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/TemporalDistanceTest.java	2008-10-17 16:54:34 UTC (rev 23499)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/TemporalDistanceTest.java	2008-10-17 19:12:30 UTC (rev 23500)
@@ -28,6 +28,25 @@
         assertEqualsMatrix( expected, result );
     }
 
+    public void testTemporalDistance2() {
+        Interval[][] matrix = new Interval[][] {
+                { new Interval(0,0), new Interval(5,10), new Interval(65, MAX), new Interval(30,40), new Interval(50,55) },
+                { new Interval(-10,-5), new Interval(0,0), new Interval(60, MAX), new Interval(20,35), new Interval(40,50) },
+                { new Interval(MIN,-65), new Interval(MIN,-60), new Interval(0, 0), new Interval(MIN, -25), new Interval(MIN, -10) },
+                { new Interval(-40,-30), new Interval(-35,-20), new Interval(25, MAX), new Interval(0, 0), new Interval(15,20) },
+                { new Interval(-55,-50), new Interval(-50,-40), new Interval(10,MAX), new Interval(-20,-15), new Interval(0,0) }
+        };
+        Interval[][] expected = new Interval[][] {
+              { new Interval(0,0), new Interval(5,10), new Interval(65, MAX), new Interval(30,40), new Interval(50,55) },
+              { new Interval(-10,-5), new Interval(0,0), new Interval(60, MAX), new Interval(20,35), new Interval(40,50) },
+              { new Interval(MIN,-65), new Interval(MIN,-60), new Interval(0, 0), new Interval(MIN, -25), new Interval(MIN, -10) },
+              { new Interval(-40,-30), new Interval(-35,-20), new Interval(25, MAX), new Interval(0, 0), new Interval(15,20) },
+              { new Interval(-55,-50), new Interval(-50,-40), new Interval(10,MAX), new Interval(-20,-15), new Interval(0,0) }
+        };
+        Interval[][] result = TimeUtils.calculateTemporalDistance( matrix );
+        assertEqualsMatrix( expected, result );
+    }
+
     public void assertEqualsMatrix( Interval[][] expected, Interval[][] matrix ) {
         for( int i = 0; i < matrix.length; i++ ) {
             for( int j = 0; j < matrix[i].length; j++ ) {




More information about the jboss-svn-commits mailing list