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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Oct 20 18:43:24 EDT 2008


Author: mrhoden-famc
Date: 2008-10-20 18:43:22 -0400 (Mon, 20 Oct 2008)
New Revision: 23526

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/extend_rule_test.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Extends.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.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/DroolsSoftKeywords.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/PatternBuilder.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/JavaAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.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/integrationtests/MiscTest.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/mvel/InstrumentedDeclarationScopeResolver.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_with_Metadata.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java
Log:
JBRULES-1812 adding rule inheritance for core

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -12,6 +12,7 @@
      * file name is preferred (ie it could get out of sync with the name of the file it is in).
      */
     public String          name;
+    public String		   parentName;
     public String          modelVersion = "1.0";
 
     public RuleAttribute[] attributes   = new RuleAttribute[0];

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -50,7 +50,12 @@
 
 
         StringBuffer buf = new StringBuffer();
-        buf.append( "rule \"" + model.name + "\"\n" );
+        buf.append( "rule \"" + model.name + "\"" );
+        if(null != model.parentName && model.parentName.length() > 0){
+        	buf.append( "extends \"" + model.parentName + "\"\n" );
+        }else{
+        	 buf.append( "\n" );
+        }
         this.marshalMetadataList( buf, model );
         this.marshalAttributes( buf, model );
         

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-17 17:15:55
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-18 17:54:42
 
 	package org.drools.lang;
 
@@ -10,134 +10,135 @@
 import java.util.Map;
 import java.util.HashMap;
 public class DRLLexer extends Lexer {
-    public static final int COMMA=89;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int ACCUMULATE=102;
+    public static final int VT_DATA_TYPE=38;
+    public static final int DOT_STAR=86;
+    public static final int VK_FUNCTION=65;
+    public static final int VK_GLOBAL=66;
+    public static final int VK_AND=77;
+    public static final int EQUALS=94;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=127;
+    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_ACCUMULATE_ID_CLAUSE=28;
-    public static final int VK_DIALECT=54;
-    public static final int VK_FUNCTION=64;
-    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_FUNCTION_IMPORT=5;
+    public static final int VT_OR_INFIX=26;
+    public static final int DOUBLE_AMPER=99;
+    public static final int EOL=121;
+    public static final int GREATER=107;
+    public static final int VK_IMPORT=60;
+    public static final int NOT_EQUAL=111;
+    public static final int VK_ACTION=80;
+    public static final int VK_RULE=58;
+    public static final int VK_MEMBEROF=72;
+    public static final int LESS=109;
+    public static final int GRAVE_ACCENT=112;
+    public static final int VT_SLOT=15;
+    public static final int VK_OR=76;
     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 DOT=84;
-    public static final int VK_IMPORT=59;
-    public static final int VT_SLOT=15;
+    public static final int NULL=114;
+    public static final int BOOL=96;
+    public static final int VK_QUERY=63;
+    public static final int SEMICOLON=83;
+    public static final int INT=97;
+    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=73;
+    public static final int VK_RULEFLOW_GROUP=52;
+    public static final int VK_RESULT=82;
     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_LABEL=8;
+    public static final int WS=122;
+    public static final int VK_NO_LOOP=48;
+    public static final int LEFT_CURLY=118;
     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_PATTERN=31;
+    public static final int VK_IN=75;
+    public static final int LEFT_PAREN=89;
+    public static final int LESS_EQUAL=110;
+    public static final int VT_IMPORT_ID=41;
+    public static final int VT_RULE_ID=12;
+    public static final int MISC=120;
+    public static final int FROM=100;
+    public static final int END=87;
+    public static final int COLLECT=104;
+    public static final int INIT=103;
+    public static final int EscapeSequence=123;
+    public static final int VK_ACTIVATION_GROUP=50;
+    public static final int VK_ENABLED=56;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=128;
+    public static final int VK_PACKAGE=61;
+    public static final int OVER=101;
+    public static final int VK_EXTEND=59;
+    public static final int RIGHT_SQUARE=116;
+    public static final int RIGHT_CURLY=119;
+    public static final int VK_MATCHES=69;
+    public static final int VT_FACT_OR=33;
+    public static final int VT_FIELD=35;
+    public static final int FLOAT=113;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_EXISTS=78;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ID=84;
+    public static final int HexDigit=124;
+    public static final int VT_OR_PREFIX=24;
+    public static final int VK_EVAL=67;
+    public static final int DOUBLE_PIPE=98;
+    public static final int AT=92;
+    public static final int RIGHT_PAREN=91;
+    public static final int THEN=117;
+    public static final int VT_COMPILATION_UNIT=4;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int COMMA=90;
+    public static final int EQUAL=106;
+    public static final int VT_BEHAVIOR=21;
     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 VK_DIALECT=54;
+    public static final int DOT=85;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int VK_NOT=74;
+    public static final int VT_FROM_SOURCE=29;
+    public static final int VK_DECLARE=64;
     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 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 VT_PAREN_CHUNK=20;
+    public static final int VK_CONTAINS=68;
+    public static final int VT_TYPE_DECLARE_ID=11;
+    public static final int VK_REVERSE=81;
+    public static final int VK_LOCK_ON_ACTIVE=47;
+    public static final int VK_TEMPLATE=62;
     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 VK_ENABLED=56;
-    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 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_RULE_ATTRIBUTES=16;
+    public static final int VT_AND_INFIX=25;
+    public static final int Tokens=130;
+    public static final int VT_ACCESSOR_PATH=36;
+    public static final int MULTI_LINE_COMMENT=129;
+    public static final int VK_FORALL=79;
+    public static final int COLON=93;
+    public static final int VK_EXCLUDES=70;
+    public static final int VK_SOUNDSLIKE=71;
     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 VK_AGENDA_GROUP=51;
-    public static final int VT_FACT_OR=33;
-    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 INIT=102;
+    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 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_ATTRIBUTES=57;
+    public static final int WHEN=95;
+    public static final int UnicodeEscape=125;
+    public static final int VT_SQUARE_CHUNK=19;
     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_TEMPLATE_ID=10;
+    public static final int VT_PARAM_LIST=44;
+    public static final int ARROW=105;
     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 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_CONTAINS=67;
-    public static final int VK_LOCK_ON_ACTIVE=47;
-    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 VK_AGENDA_GROUP=51;
     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 OctalEscape=125;
-    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 VK_DECLARE=63;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
-    
+    public static final int LEFT_SQUARE=115;
+    public static final int GREATER_EQUAL=108;
+    public static final int OctalEscape=126;
+    public static final int STRING=88;
+
     	/** 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 +153,7 @@
     		emit(t);
     		return t;
     	}
-    
+
     	/** Overrided this method to not output mesages */
     	public void emitErrorMessage(String msg) {
     	}
@@ -168,10 +169,10 @@
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // 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:1693:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1693:17: ( ' ' | '\\t' | '\\f' | EOL )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1686:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // src/main/resources/org/drools/lang/DRL.g:1693:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -203,28 +204,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1686:19: ' '
+            	    // src/main/resources/org/drools/lang/DRL.g:1693:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1687:19: '\\t'
+            	    // src/main/resources/org/drools/lang/DRL.g:1694:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1688:19: '\\f'
+            	    // src/main/resources/org/drools/lang/DRL.g:1695:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1689:19: EOL
+            	    // src/main/resources/org/drools/lang/DRL.g:1696:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -257,10 +258,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // 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:1702:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1703: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:1703:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -279,13 +280,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1696:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1703:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1696:14: ( '\\r\\n' )=> '\\r\\n'
+                    // src/main/resources/org/drools/lang/DRL.g:1703:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -293,14 +294,14 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1697:25: '\\r'
+                    // src/main/resources/org/drools/lang/DRL.g:1704:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1698:25: '\\n'
+                    // src/main/resources/org/drools/lang/DRL.g:1705:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -322,10 +323,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // 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:1710:2: ( ( '-' )? ( '0' .. '9' )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1710:4: ( '-' )? ( '0' .. '9' )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1703:4: ( '-' )?
+            // src/main/resources/org/drools/lang/DRL.g:1710:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -334,7 +335,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1703:5: '-'
+                    // src/main/resources/org/drools/lang/DRL.g:1710:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -343,7 +344,7 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1703:10: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1710:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -357,7 +358,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1703:11: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1710:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -388,10 +389,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // 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:1714:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // src/main/resources/org/drools/lang/DRL.g:1714:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // src/main/resources/org/drools/lang/DRL.g:1707:4: ( '-' )?
+            // src/main/resources/org/drools/lang/DRL.g:1714:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -400,7 +401,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1707:5: '-'
+                    // src/main/resources/org/drools/lang/DRL.g:1714:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -409,7 +410,7 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1707:10: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1714:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -423,7 +424,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1707:11: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1714:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -441,7 +442,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // src/main/resources/org/drools/lang/DRL.g:1707:26: ( '0' .. '9' )+
+            // src/main/resources/org/drools/lang/DRL.g:1714:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -455,7 +456,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1707:27: '0' .. '9'
+            	    // src/main/resources/org/drools/lang/DRL.g:1714:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -486,7 +487,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // src/main/resources/org/drools/lang/DRL.g:1711:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1718:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -499,19 +500,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1710:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1717:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1711:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // src/main/resources/org/drools/lang/DRL.g:1718:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:1711:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // src/main/resources/org/drools/lang/DRL.g:1711:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // src/main/resources/org/drools/lang/DRL.g:1718:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // src/main/resources/org/drools/lang/DRL.g:1718:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1711:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:1718:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -527,14 +528,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1711:15: EscapeSequence
+                    	    // src/main/resources/org/drools/lang/DRL.g:1718:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1711:32: ~ ( '\\\\' | '\"' )
+                    	    // src/main/resources/org/drools/lang/DRL.g:1718: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 +565,13 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1712:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // src/main/resources/org/drools/lang/DRL.g:1719:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // src/main/resources/org/drools/lang/DRL.g:1712:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // src/main/resources/org/drools/lang/DRL.g:1712:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // src/main/resources/org/drools/lang/DRL.g:1719:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // src/main/resources/org/drools/lang/DRL.g:1719:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1712:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // src/main/resources/org/drools/lang/DRL.g:1719:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -586,14 +587,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1712:16: EscapeSequence
+                    	    // src/main/resources/org/drools/lang/DRL.g:1719:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:1712:33: ~ ( '\\\\' | '\\'' )
+                    	    // src/main/resources/org/drools/lang/DRL.g:1719: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 +635,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // 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' )
+            // src/main/resources/org/drools/lang/DRL.g:1723:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1723: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,12 +661,17 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // 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 )
+            // src/main/resources/org/drools/lang/DRL.g:1727: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 '&':
@@ -712,11 +718,6 @@
                     alt11=1;
                     }
                     break;
-                case 'u':
-                    {
-                    alt11=2;
-                    }
-                    break;
                 case '0':
                 case '1':
                 case '2':
@@ -732,7 +733,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        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);
+                        new NoViableAltException("1725: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 +742,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("1725: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: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' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+                    // src/main/resources/org/drools/lang/DRL.g:1727: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 +766,14 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1724:9: UnicodeEscape
+                    // src/main/resources/org/drools/lang/DRL.g:1731:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1725:9: OctalEscape
+                    // src/main/resources/org/drools/lang/DRL.g:1732:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -789,7 +790,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1730:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1737:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -800,9 +801,9 @@
                     int LA12_2 = input.LA(3);
 
                     if ( ((LA12_2>='0' && LA12_2<='7')) ) {
-                        int LA12_4 = input.LA(4);
+                        int LA12_5 = input.LA(4);
 
-                        if ( ((LA12_4>='0' && LA12_4<='7')) ) {
+                        if ( ((LA12_5>='0' && LA12_5<='7')) ) {
                             alt12=1;
                         }
                         else {
@@ -823,7 +824,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1728:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1735:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -831,31 +832,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1728:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1735: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:1730:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1737:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1730:14: ( '0' .. '3' )
-                    // src/main/resources/org/drools/lang/DRL.g:1730:15: '0' .. '3'
+                    // src/main/resources/org/drools/lang/DRL.g:1737:14: ( '0' .. '3' )
+                    // src/main/resources/org/drools/lang/DRL.g:1737:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1730:25: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1730:26: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1737:25: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1737:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1730:36: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1730:37: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1737:36: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1737:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -865,18 +866,18 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1731:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1738:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1731:14: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1731:15: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1738:14: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1738:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1731:25: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1731:26: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1738:25: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1738:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -886,11 +887,11 @@
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1732:9: '\\\\' ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1739:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // src/main/resources/org/drools/lang/DRL.g:1732:14: ( '0' .. '7' )
-                    // src/main/resources/org/drools/lang/DRL.g:1732:15: '0' .. '7'
+                    // src/main/resources/org/drools/lang/DRL.g:1739:14: ( '0' .. '7' )
+                    // src/main/resources/org/drools/lang/DRL.g:1739:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -910,8 +911,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1744:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // src/main/resources/org/drools/lang/DRL.g:1744:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -932,10 +933,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // 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:1748:2: ( ( 'true' | 'false' ) )
+            // src/main/resources/org/drools/lang/DRL.g:1748:4: ( 'true' | 'false' )
             {
-            // src/main/resources/org/drools/lang/DRL.g:1741:4: ( 'true' | 'false' )
+            // src/main/resources/org/drools/lang/DRL.g:1748:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -948,13 +949,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1741:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1748:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1741:5: 'true'
+                    // src/main/resources/org/drools/lang/DRL.g:1748:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -962,7 +963,7 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1741:12: 'false'
+                    // src/main/resources/org/drools/lang/DRL.g:1748:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -986,8 +987,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // src/main/resources/org/drools/lang/DRL.g:1745:2: ( 'accumulate' )
-            // src/main/resources/org/drools/lang/DRL.g:1745:4: 'accumulate'
+            // src/main/resources/org/drools/lang/DRL.g:1752:2: ( 'accumulate' )
+            // src/main/resources/org/drools/lang/DRL.g:1752:4: 'accumulate'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1005,8 +1006,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // src/main/resources/org/drools/lang/DRL.g:1749:2: ( 'collect' )
-            // src/main/resources/org/drools/lang/DRL.g:1749:4: 'collect'
+            // src/main/resources/org/drools/lang/DRL.g:1756:2: ( 'collect' )
+            // src/main/resources/org/drools/lang/DRL.g:1756:4: 'collect'
             {
             match("collect"); if (failed) return ;
 
@@ -1024,8 +1025,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // src/main/resources/org/drools/lang/DRL.g:1752:5: ( 'end' )
-            // src/main/resources/org/drools/lang/DRL.g:1752:7: 'end'
+            // src/main/resources/org/drools/lang/DRL.g:1759:5: ( 'end' )
+            // src/main/resources/org/drools/lang/DRL.g:1759:7: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -1043,8 +1044,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // src/main/resources/org/drools/lang/DRL.g:1756:2: ( 'from' )
-            // src/main/resources/org/drools/lang/DRL.g:1756:4: 'from'
+            // src/main/resources/org/drools/lang/DRL.g:1763:2: ( 'from' )
+            // src/main/resources/org/drools/lang/DRL.g:1763:4: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -1062,8 +1063,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // src/main/resources/org/drools/lang/DRL.g:1760:2: ( 'init' )
-            // src/main/resources/org/drools/lang/DRL.g:1760:4: 'init'
+            // src/main/resources/org/drools/lang/DRL.g:1767:2: ( 'init' )
+            // src/main/resources/org/drools/lang/DRL.g:1767:4: 'init'
             {
             match("init"); if (failed) return ;
 
@@ -1081,8 +1082,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // src/main/resources/org/drools/lang/DRL.g:1764:2: ( 'null' )
-            // src/main/resources/org/drools/lang/DRL.g:1764:4: 'null'
+            // src/main/resources/org/drools/lang/DRL.g:1771:2: ( 'null' )
+            // src/main/resources/org/drools/lang/DRL.g:1771:4: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1100,8 +1101,8 @@
     public final void mOVER() throws RecognitionException {
         try {
             int _type = OVER;
-            // src/main/resources/org/drools/lang/DRL.g:1768:2: ( 'over' )
-            // src/main/resources/org/drools/lang/DRL.g:1768:4: 'over'
+            // src/main/resources/org/drools/lang/DRL.g:1775:2: ( 'over' )
+            // src/main/resources/org/drools/lang/DRL.g:1775:4: 'over'
             {
             match("over"); if (failed) return ;
 
@@ -1119,8 +1120,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // src/main/resources/org/drools/lang/DRL.g:1772:2: ( 'then' )
-            // src/main/resources/org/drools/lang/DRL.g:1772:4: 'then'
+            // src/main/resources/org/drools/lang/DRL.g:1779:2: ( 'then' )
+            // src/main/resources/org/drools/lang/DRL.g:1779:4: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1138,8 +1139,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // src/main/resources/org/drools/lang/DRL.g:1776:2: ( 'when' )
-            // src/main/resources/org/drools/lang/DRL.g:1776:4: 'when'
+            // src/main/resources/org/drools/lang/DRL.g:1783:2: ( 'when' )
+            // src/main/resources/org/drools/lang/DRL.g:1783:4: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -1157,8 +1158,8 @@
     public final void mGRAVE_ACCENT() throws RecognitionException {
         try {
             int _type = GRAVE_ACCENT;
-            // src/main/resources/org/drools/lang/DRL.g:1780:2: ( '`' )
-            // src/main/resources/org/drools/lang/DRL.g:1780: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 ;
 
@@ -1175,8 +1176,8 @@
     public final void mAT() throws RecognitionException {
         try {
             int _type = AT;
-            // src/main/resources/org/drools/lang/DRL.g:1783:4: ( '@' )
-            // src/main/resources/org/drools/lang/DRL.g:1783:6: '@'
+            // src/main/resources/org/drools/lang/DRL.g:1790:4: ( '@' )
+            // src/main/resources/org/drools/lang/DRL.g:1790:6: '@'
             {
             match('@'); if (failed) return ;
 
@@ -1193,8 +1194,8 @@
     public final void mEQUALS() throws RecognitionException {
         try {
             int _type = EQUALS;
-            // src/main/resources/org/drools/lang/DRL.g:1787:2: ( '=' )
-            // src/main/resources/org/drools/lang/DRL.g:1787:4: '='
+            // src/main/resources/org/drools/lang/DRL.g:1794:2: ( '=' )
+            // src/main/resources/org/drools/lang/DRL.g:1794:4: '='
             {
             match('='); if (failed) return ;
 
@@ -1211,8 +1212,8 @@
     public final void mSEMICOLON() throws RecognitionException {
         try {
             int _type = SEMICOLON;
-            // src/main/resources/org/drools/lang/DRL.g:1791:2: ( ';' )
-            // src/main/resources/org/drools/lang/DRL.g:1791:4: ';'
+            // src/main/resources/org/drools/lang/DRL.g:1798:2: ( ';' )
+            // src/main/resources/org/drools/lang/DRL.g:1798:4: ';'
             {
             match(';'); if (failed) return ;
 
@@ -1229,8 +1230,8 @@
     public final void mDOT_STAR() throws RecognitionException {
         try {
             int _type = DOT_STAR;
-            // src/main/resources/org/drools/lang/DRL.g:1795:2: ( '.*' )
-            // src/main/resources/org/drools/lang/DRL.g:1795:4: '.*'
+            // src/main/resources/org/drools/lang/DRL.g:1802:2: ( '.*' )
+            // src/main/resources/org/drools/lang/DRL.g:1802:4: '.*'
             {
             match(".*"); if (failed) return ;
 
@@ -1248,8 +1249,8 @@
     public final void mCOLON() throws RecognitionException {
         try {
             int _type = COLON;
-            // src/main/resources/org/drools/lang/DRL.g:1799:2: ( ':' )
-            // src/main/resources/org/drools/lang/DRL.g:1799:4: ':'
+            // src/main/resources/org/drools/lang/DRL.g:1806:2: ( ':' )
+            // src/main/resources/org/drools/lang/DRL.g:1806:4: ':'
             {
             match(':'); if (failed) return ;
 
@@ -1266,8 +1267,8 @@
     public final void mEQUAL() throws RecognitionException {
         try {
             int _type = EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1803:2: ( '==' )
-            // src/main/resources/org/drools/lang/DRL.g:1803:4: '=='
+            // src/main/resources/org/drools/lang/DRL.g:1810:2: ( '==' )
+            // src/main/resources/org/drools/lang/DRL.g:1810:4: '=='
             {
             match("=="); if (failed) return ;
 
@@ -1285,8 +1286,8 @@
     public final void mNOT_EQUAL() throws RecognitionException {
         try {
             int _type = NOT_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1807:2: ( '!=' )
-            // src/main/resources/org/drools/lang/DRL.g:1807:4: '!='
+            // src/main/resources/org/drools/lang/DRL.g:1814:2: ( '!=' )
+            // src/main/resources/org/drools/lang/DRL.g:1814:4: '!='
             {
             match("!="); if (failed) return ;
 
@@ -1304,8 +1305,8 @@
     public final void mGREATER() throws RecognitionException {
         try {
             int _type = GREATER;
-            // src/main/resources/org/drools/lang/DRL.g:1811:2: ( '>' )
-            // src/main/resources/org/drools/lang/DRL.g:1811:4: '>'
+            // src/main/resources/org/drools/lang/DRL.g:1818:2: ( '>' )
+            // src/main/resources/org/drools/lang/DRL.g:1818:4: '>'
             {
             match('>'); if (failed) return ;
 
@@ -1322,8 +1323,8 @@
     public final void mGREATER_EQUAL() throws RecognitionException {
         try {
             int _type = GREATER_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1815:2: ( '>=' )
-            // src/main/resources/org/drools/lang/DRL.g:1815:4: '>='
+            // src/main/resources/org/drools/lang/DRL.g:1822:2: ( '>=' )
+            // src/main/resources/org/drools/lang/DRL.g:1822:4: '>='
             {
             match(">="); if (failed) return ;
 
@@ -1341,8 +1342,8 @@
     public final void mLESS() throws RecognitionException {
         try {
             int _type = LESS;
-            // src/main/resources/org/drools/lang/DRL.g:1819:2: ( '<' )
-            // src/main/resources/org/drools/lang/DRL.g:1819:4: '<'
+            // src/main/resources/org/drools/lang/DRL.g:1826:2: ( '<' )
+            // src/main/resources/org/drools/lang/DRL.g:1826:4: '<'
             {
             match('<'); if (failed) return ;
 
@@ -1359,8 +1360,8 @@
     public final void mLESS_EQUAL() throws RecognitionException {
         try {
             int _type = LESS_EQUAL;
-            // src/main/resources/org/drools/lang/DRL.g:1823:2: ( '<=' )
-            // src/main/resources/org/drools/lang/DRL.g:1823:4: '<='
+            // src/main/resources/org/drools/lang/DRL.g:1830:2: ( '<=' )
+            // src/main/resources/org/drools/lang/DRL.g:1830:4: '<='
             {
             match("<="); if (failed) return ;
 
@@ -1378,8 +1379,8 @@
     public final void mARROW() throws RecognitionException {
         try {
             int _type = ARROW;
-            // src/main/resources/org/drools/lang/DRL.g:1827:2: ( '->' )
-            // src/main/resources/org/drools/lang/DRL.g:1827:4: '->'
+            // src/main/resources/org/drools/lang/DRL.g:1834:2: ( '->' )
+            // src/main/resources/org/drools/lang/DRL.g:1834:4: '->'
             {
             match("->"); if (failed) return ;
 
@@ -1397,7 +1398,7 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // 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' )+ '%' )
+            // src/main/resources/org/drools/lang/DRL.g:1838: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 +1411,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("1837: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:1831:4: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+                    // src/main/resources/org/drools/lang/DRL.g:1838: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 +1430,7 @@
                         recover(mse);    throw mse;
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1831:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+                    // src/main/resources/org/drools/lang/DRL.g:1838:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
                     loop14:
                     do {
                         int alt14=2;
@@ -1468,7 +1469,7 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1832:4: '%' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+ '%'
+                    // src/main/resources/org/drools/lang/DRL.g:1839: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 +1483,7 @@
                         recover(mse);    throw mse;
                     }
 
-                    // src/main/resources/org/drools/lang/DRL.g:1832:54: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+
+                    // src/main/resources/org/drools/lang/DRL.g:1839:54: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+
                     int cnt15=0;
                     loop15:
                     do {
@@ -1543,8 +1544,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // src/main/resources/org/drools/lang/DRL.g:1837:9: ( '(' )
-            // src/main/resources/org/drools/lang/DRL.g:1837:11: '('
+            // src/main/resources/org/drools/lang/DRL.g:1844:9: ( '(' )
+            // src/main/resources/org/drools/lang/DRL.g:1844:11: '('
             {
             match('('); if (failed) return ;
 
@@ -1561,8 +1562,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // src/main/resources/org/drools/lang/DRL.g:1841:9: ( ')' )
-            // src/main/resources/org/drools/lang/DRL.g:1841:11: ')'
+            // src/main/resources/org/drools/lang/DRL.g:1848:9: ( ')' )
+            // src/main/resources/org/drools/lang/DRL.g:1848:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -1579,8 +1580,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // src/main/resources/org/drools/lang/DRL.g:1845:9: ( '[' )
-            // src/main/resources/org/drools/lang/DRL.g:1845:11: '['
+            // src/main/resources/org/drools/lang/DRL.g:1852:9: ( '[' )
+            // src/main/resources/org/drools/lang/DRL.g:1852:11: '['
             {
             match('['); if (failed) return ;
 
@@ -1597,8 +1598,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // src/main/resources/org/drools/lang/DRL.g:1849:9: ( ']' )
-            // src/main/resources/org/drools/lang/DRL.g:1849:11: ']'
+            // src/main/resources/org/drools/lang/DRL.g:1856:9: ( ']' )
+            // src/main/resources/org/drools/lang/DRL.g:1856:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -1615,8 +1616,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // src/main/resources/org/drools/lang/DRL.g:1853:9: ( '{' )
-            // src/main/resources/org/drools/lang/DRL.g:1853:11: '{'
+            // src/main/resources/org/drools/lang/DRL.g:1860:9: ( '{' )
+            // src/main/resources/org/drools/lang/DRL.g:1860:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -1633,8 +1634,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // src/main/resources/org/drools/lang/DRL.g:1857:9: ( '}' )
-            // src/main/resources/org/drools/lang/DRL.g:1857:11: '}'
+            // src/main/resources/org/drools/lang/DRL.g:1864:9: ( '}' )
+            // src/main/resources/org/drools/lang/DRL.g:1864:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -1651,8 +1652,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // src/main/resources/org/drools/lang/DRL.g:1860:7: ( ',' )
-            // src/main/resources/org/drools/lang/DRL.g:1860:9: ','
+            // src/main/resources/org/drools/lang/DRL.g:1867:7: ( ',' )
+            // src/main/resources/org/drools/lang/DRL.g:1867:9: ','
             {
             match(','); if (failed) return ;
 
@@ -1669,8 +1670,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // src/main/resources/org/drools/lang/DRL.g:1863:5: ( '.' )
-            // src/main/resources/org/drools/lang/DRL.g:1863:7: '.'
+            // src/main/resources/org/drools/lang/DRL.g:1870:5: ( '.' )
+            // src/main/resources/org/drools/lang/DRL.g:1870:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -1687,8 +1688,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // src/main/resources/org/drools/lang/DRL.g:1867:2: ( '&&' )
-            // src/main/resources/org/drools/lang/DRL.g:1867:4: '&&'
+            // src/main/resources/org/drools/lang/DRL.g:1874:2: ( '&&' )
+            // src/main/resources/org/drools/lang/DRL.g:1874:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -1706,8 +1707,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // src/main/resources/org/drools/lang/DRL.g:1871:2: ( '||' )
-            // src/main/resources/org/drools/lang/DRL.g:1871:4: '||'
+            // src/main/resources/org/drools/lang/DRL.g:1878:2: ( '||' )
+            // src/main/resources/org/drools/lang/DRL.g:1878:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -1725,11 +1726,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:1875:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // src/main/resources/org/drools/lang/DRL.g:1875:4: '#' ( options {greedy=false; } : . )* EOL
+            // src/main/resources/org/drools/lang/DRL.g:1882:2: ( '#' ( options {greedy=false; } : . )* EOL )
+            // src/main/resources/org/drools/lang/DRL.g:1882:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // src/main/resources/org/drools/lang/DRL.g:1875:8: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1882:8: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -1748,7 +1749,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1875:35: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1882:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1778,12 +1779,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:1881:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // src/main/resources/org/drools/lang/DRL.g:1881:4: '//' ( options {greedy=false; } : . )* EOL
+            // src/main/resources/org/drools/lang/DRL.g:1888:2: ( '//' ( options {greedy=false; } : . )* EOL )
+            // src/main/resources/org/drools/lang/DRL.g:1888:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // src/main/resources/org/drools/lang/DRL.g:1881:9: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1888:9: ( options {greedy=false; } : . )*
             loop18:
             do {
                 int alt18=2;
@@ -1802,7 +1803,7 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1881:36: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1888:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1832,12 +1833,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // 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; } : . )* '*/'
+            // src/main/resources/org/drools/lang/DRL.g:1893:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // src/main/resources/org/drools/lang/DRL.g:1893:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // src/main/resources/org/drools/lang/DRL.g:1886:9: ( options {greedy=false; } : . )*
+            // src/main/resources/org/drools/lang/DRL.g:1893:9: ( options {greedy=false; } : . )*
             loop19:
             do {
                 int alt19=2;
@@ -1862,7 +1863,7 @@
 
                 switch (alt19) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1886:35: .
+            	    // src/main/resources/org/drools/lang/DRL.g:1893:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1893,7 +1894,7 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // src/main/resources/org/drools/lang/DRL.g:1890:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // src/main/resources/org/drools/lang/DRL.g:1897: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 +2224,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:1696:14: ( '\\r\\n' )
-        // src/main/resources/org/drools/lang/DRL.g:1696:16: '\\r\\n'
+        // src/main/resources/org/drools/lang/DRL.g:1703:14: ( '\\r\\n' )
+        // src/main/resources/org/drools/lang/DRL.g:1703:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2267,29 +2268,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\50\1\51\21\uffff\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"+
         "\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 +2315,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 +2327,7 @@
             "\1\76",
             "\1\77",
             "",
-            "\1\101\4\uffff\1\100",
+            "\1\100\4\uffff\1\101",
             "",
             "",
             "",
@@ -2362,34 +2363,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 +2401,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 +2446,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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-17 17:15:54
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DRL.g 2008-10-18 17:54:42
 
 	package org.drools.lang;
 	
@@ -18,138 +18,139 @@
 
 public class DRLParser extends Parser {
     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"
+        "<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_EXTEND", "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 COMMA=89;
+    public static final int ACCUMULATE=102;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int VT_DATA_TYPE=38;
+    public static final int DOT_STAR=86;
+    public static final int VK_FUNCTION=65;
+    public static final int VK_GLOBAL=66;
+    public static final int VK_AND=77;
+    public static final int EQUALS=94;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=127;
+    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_ACCUMULATE_ID_CLAUSE=28;
-    public static final int VK_DIALECT=54;
-    public static final int VK_FUNCTION=64;
-    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_FUNCTION_IMPORT=5;
+    public static final int VT_OR_INFIX=26;
+    public static final int EOL=121;
+    public static final int GREATER=107;
+    public static final int DOUBLE_AMPER=99;
+    public static final int VK_IMPORT=60;
+    public static final int NOT_EQUAL=111;
+    public static final int VK_ACTION=80;
+    public static final int VK_RULE=58;
+    public static final int LESS=109;
+    public static final int VK_MEMBEROF=72;
+    public static final int GRAVE_ACCENT=112;
+    public static final int VT_SLOT=15;
+    public static final int VK_OR=76;
     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 DOT=84;
-    public static final int VK_IMPORT=59;
-    public static final int VT_SLOT=15;
+    public static final int NULL=114;
+    public static final int BOOL=96;
+    public static final int VK_QUERY=63;
+    public static final int INT=97;
+    public static final int SEMICOLON=83;
+    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=73;
     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_RESULT=82;
+    public static final int VT_LABEL=8;
+    public static final int WS=122;
+    public static final int VK_NO_LOOP=48;
+    public static final int LEFT_CURLY=118;
     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_PATTERN=31;
+    public static final int VK_IN=75;
+    public static final int LEFT_PAREN=89;
+    public static final int LESS_EQUAL=110;
+    public static final int VT_IMPORT_ID=41;
+    public static final int VT_RULE_ID=12;
+    public static final int MISC=120;
+    public static final int FROM=100;
+    public static final int END=87;
+    public static final int COLLECT=104;
+    public static final int INIT=103;
+    public static final int EscapeSequence=123;
+    public static final int VK_ACTIVATION_GROUP=50;
+    public static final int VK_ENABLED=56;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=128;
+    public static final int VK_PACKAGE=61;
+    public static final int OVER=101;
+    public static final int VK_EXTEND=59;
+    public static final int RIGHT_SQUARE=116;
+    public static final int RIGHT_CURLY=119;
+    public static final int VK_MATCHES=69;
+    public static final int VT_FACT_OR=33;
+    public static final int VT_FIELD=35;
+    public static final int FLOAT=113;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_EXISTS=78;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ID=84;
+    public static final int HexDigit=124;
+    public static final int VT_OR_PREFIX=24;
+    public static final int VK_EVAL=67;
+    public static final int DOUBLE_PIPE=98;
+    public static final int AT=92;
+    public static final int RIGHT_PAREN=91;
+    public static final int THEN=117;
+    public static final int VT_COMPILATION_UNIT=4;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int COMMA=90;
+    public static final int EQUAL=106;
+    public static final int VT_BEHAVIOR=21;
     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 VK_DIALECT=54;
+    public static final int DOT=85;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int VK_NOT=74;
+    public static final int VT_FROM_SOURCE=29;
     public static final int VT_ENTRYPOINT_ID=13;
-    public static final int WS=121;
-    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_DECLARE=64;
+    public static final int VT_PAREN_CHUNK=20;
+    public static final int VK_CONTAINS=68;
+    public static final int VT_TYPE_DECLARE_ID=11;
+    public static final int VK_REVERSE=81;
+    public static final int VK_LOCK_ON_ACTIVE=47;
+    public static final int VK_TEMPLATE=62;
+    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_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 VK_ENABLED=56;
-    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 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_ACCESSOR_PATH=36;
+    public static final int MULTI_LINE_COMMENT=129;
+    public static final int VK_FORALL=79;
+    public static final int COLON=93;
+    public static final int VK_EXCLUDES=70;
     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 VK_AGENDA_GROUP=51;
-    public static final int VT_FACT_OR=33;
-    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 INIT=102;
+    public static final int VK_SOUNDSLIKE=71;
+    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 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_ATTRIBUTES=57;
+    public static final int WHEN=95;
+    public static final int UnicodeEscape=125;
+    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 EscapeSequence=122;
-    public static final int VK_EXISTS=77;
-    public static final int INT=96;
+    public static final int VT_PARAM_LIST=44;
+    public static final int ARROW=105;
     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_PARAM_LIST=44;
-    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 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 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 static final int VK_AGENDA_GROUP=51;
+    public static final int LEFT_SQUARE=115;
+    public static final int OctalEscape=126;
+    public static final int GREATER_EQUAL=108;
+    public static final int STRING=88;
 
         public DRLParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[141+1];
+            ruleMemo = new HashMap[142+1];
          }
         
     protected TreeAdaptor adaptor = new CommonTreeAdaptor();
@@ -164,7 +165,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 +173,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 +196,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 +208,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 +227,7 @@
     			emit(false, activeContext);
     		}
     	}
-    
+
     	private DroolsToken getLastTokenOnList(LinkedList list){
     		DroolsToken lastToken = null;
     		for (Object object : list) {
@@ -236,7 +237,7 @@
     		}
     		return lastToken;
     	}
-    
+
     	private int getLastIntegerValue(LinkedList list) {
     		int lastIntergerValue = -1;
     		for (Object object : list) {
@@ -246,7 +247,7 @@
     		}
     		return lastIntergerValue;
     	}
-    
+
     	private boolean validateLT(int LTNumber, String text) {
     		if (null == input)
     			return false;
@@ -279,11 +280,11 @@
     		}
     		return false;
     	}
-    
+
     	private boolean validateRestr() {
     		int lookahead = 2;
     		int countParen = 1;
-    
+
     		while (true) {
     			if (input.LA(lookahead) == COMMA) {
     				break;
@@ -312,7 +313,7 @@
     			input.seek(activeIndex);
     		}
     		lookaheadTest = false;
-    
+
     		return returnValue;
     	}
     	
@@ -352,7 +353,7 @@
     	public boolean hasErrors() {
     		return !errors.isEmpty();
     	}
-    
+
     	/**
     	 * Method that adds a paraphrase type into paraphrases stack.
     	 * 
@@ -364,7 +365,7 @@
     		activeMap.put(type, "");
     		paraphrases.push(activeMap);
     	}
-    
+
     	/**
     	 * Method that sets paraphrase value for a type into paraphrases stack.
     	 * 
@@ -376,7 +377,7 @@
     	private void setParaphrasesValue(DroolsParaphraseTypes type, String value) {
     		paraphrases.peek().put(type, value);
     	}
-    
+
     	/**
     	 * Helper method that creates a string from a token list.
     	 * 
@@ -433,7 +434,7 @@
     };
 
     // $ANTLR start compilation_unit
-    // src/main/resources/org/drools/lang/DRL.g:395:1: compilation_unit : ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:396:1: compilation_unit : ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) ;
     public final compilation_unit_return compilation_unit() throws RecognitionException {
         compilation_unit_return retval = new compilation_unit_return();
         retval.start = input.LT(1);
@@ -448,20 +449,20 @@
 
         Object EOF3_tree=null;
         RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
+        RewriteRuleSubtreeStream stream_statement=new RewriteRuleSubtreeStream(adaptor,"rule statement");
         RewriteRuleSubtreeStream stream_package_statement=new RewriteRuleSubtreeStream(adaptor,"rule package_statement");
-        RewriteRuleSubtreeStream stream_statement=new RewriteRuleSubtreeStream(adaptor,"rule 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
+            // src/main/resources/org/drools/lang/DRL.g:397:2: ( ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:397:4: ( package_statement )? ( statement )* EOF
             {
-            // src/main/resources/org/drools/lang/DRL.g:396:4: ( package_statement )?
+            // src/main/resources/org/drools/lang/DRL.g:397:4: ( package_statement )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            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)))))) {
+            if ( (LA1_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.RULE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierK!
 ey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.D
ECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(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, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((valid!
 ateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((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.DURATION))))) {
                 int LA1_1 = input.LA(2);
 
-                if ( (LA1_1==ID) && ((((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.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)))||(validateIdentif!
 ierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((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)))||(validateIdentifierKey(DroolsSoftKeywords.!
 GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdent
ifierKey(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)))||((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)))))) {
+                if ( (LA1_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.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.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywo!
 rds.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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeyw!
 ords.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.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)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((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)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((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)))||((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)))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
                     int LA1_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.PACKAGE))) ) {
@@ -471,9 +472,9 @@
             }
             switch (alt1) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:396:4: package_statement
+                    // src/main/resources/org/drools/lang/DRL.g:397:4: package_statement
                     {
-                    pushFollow(FOLLOW_package_statement_in_compilation_unit388);
+                    pushFollow(FOLLOW_package_statement_in_compilation_unit392);
                     package_statement1=package_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -484,22 +485,22 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:397:3: ( statement )*
+            // src/main/resources/org/drools/lang/DRL.g:398:3: ( statement )*
             loop2:
             do {
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                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))))) {
+                if ( (LA2_0==ID) && (((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)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(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.FUNCTION!
 ))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
                     alt2=1;
                 }
 
 
                 switch (alt2) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:397:3: statement
+            	    // src/main/resources/org/drools/lang/DRL.g:398:3: statement
             	    {
-            	    pushFollow(FOLLOW_statement_in_compilation_unit393);
+            	    pushFollow(FOLLOW_statement_in_compilation_unit397);
             	    statement2=statement();
             	    _fsp--;
             	    if (failed) return retval;
@@ -514,12 +515,12 @@
             } while (true);
 
             EOF3=(Token)input.LT(1);
-            match(input,EOF,FOLLOW_EOF_in_compilation_unit398); if (failed) return retval;
+            match(input,EOF,FOLLOW_EOF_in_compilation_unit402); if (failed) return retval;
             if ( backtracking==0 ) stream_EOF.add(EOF3);
 
 
             // AST REWRITE
-            // elements: package_statement, statement
+            // elements: statement, package_statement
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -529,20 +530,20 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 399:3: -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
+            // 400:3: -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:399:6: ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
+                // src/main/resources/org/drools/lang/DRL.g:400:6: ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_COMPILATION_UNIT, "VT_COMPILATION_UNIT"), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:399:28: ( package_statement )?
+                // src/main/resources/org/drools/lang/DRL.g:400:28: ( package_statement )?
                 if ( stream_package_statement.hasNext() ) {
                     adaptor.addChild(root_1, stream_package_statement.next());
 
                 }
                 stream_package_statement.reset();
-                // src/main/resources/org/drools/lang/DRL.g:399:47: ( statement )*
+                // src/main/resources/org/drools/lang/DRL.g:400:47: ( statement )*
                 while ( stream_statement.hasNext() ) {
                     adaptor.addChild(root_1, stream_statement.next());
 
@@ -566,16 +567,16 @@
             }
         }
         catch ( RecognitionException e ) {
-            
+
             		reportError( e );
             	
         }
         catch ( RewriteEmptyStreamException e ) {
-            
+
             	
         }
         finally {
-            
+
             	if (isEditorInterfaceEnabled && retval.tree == null) {
             		retval.tree = root_0;
             		root_0 = (Object) adaptor.nil();
@@ -615,7 +616,7 @@
     };
 
     // $ANTLR start package_statement
-    // src/main/resources/org/drools/lang/DRL.g:436:1: package_statement : package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) ;
+    // src/main/resources/org/drools/lang/DRL.g:437:1: package_statement : package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) ;
     public final package_statement_return package_statement() throws RecognitionException {
         package_statement_return retval = new package_statement_return();
         retval.start = input.LT(1);
@@ -634,23 +635,23 @@
         RewriteRuleSubtreeStream stream_package_id=new RewriteRuleSubtreeStream(adaptor,"rule package_id");
          pushParaphrases(DroolsParaphraseTypes.PACKAGE); 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:439:2: ( package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) )
-            // src/main/resources/org/drools/lang/DRL.g:440:2: package_key package_id ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:440:2: ( package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) )
+            // src/main/resources/org/drools/lang/DRL.g:441:2: package_key package_id ( SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.PACKAGE);	
             }
-            pushFollow(FOLLOW_package_key_in_package_statement458);
+            pushFollow(FOLLOW_package_key_in_package_statement462);
             package_key4=package_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_package_key.add(package_key4.getTree());
-            pushFollow(FOLLOW_package_id_in_package_statement462);
+            pushFollow(FOLLOW_package_id_in_package_statement466);
             package_id5=package_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_package_id.add(package_id5.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:442:14: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:443:14: ( SEMICOLON )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -659,10 +660,10 @@
             }
             switch (alt3) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:442:14: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:443:14: SEMICOLON
                     {
                     SEMICOLON6=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_package_statement464); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_package_statement468); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON6);
 
 
@@ -686,9 +687,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 444:3: -> ^( package_key package_id )
+            // 445:3: -> ^( package_key package_id )
             {
-                // src/main/resources/org/drools/lang/DRL.g:444:6: ^( package_key package_id )
+                // src/main/resources/org/drools/lang/DRL.g:445:6: ^( package_key package_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_package_key.nextNode(), root_1);
@@ -730,7 +731,7 @@
     };
 
     // $ANTLR start package_id
-    // src/main/resources/org/drools/lang/DRL.g:447:1: package_id : id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) ;
+    // src/main/resources/org/drools/lang/DRL.g:448:1: package_id : id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) ;
     public final package_id_return package_id() throws RecognitionException {
         package_id_return retval = new package_id_return();
         retval.start = input.LT(1);
@@ -745,17 +746,17 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:448:2: (id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) )
-            // src/main/resources/org/drools/lang/DRL.g:448:4: id+= ID (id+= DOT id+= ID )*
+            // src/main/resources/org/drools/lang/DRL.g:449:2: (id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) )
+            // src/main/resources/org/drools/lang/DRL.g:449:4: id+= ID (id+= DOT id+= ID )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_package_id491); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_package_id495); 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:448:11: (id+= DOT id+= ID )*
+            // src/main/resources/org/drools/lang/DRL.g:449:11: (id+= DOT id+= ID )*
             loop4:
             do {
                 int alt4=2;
@@ -768,17 +769,17 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:448:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:449:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_package_id497); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_package_id501); 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_package_id501); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_package_id505); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -809,9 +810,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 451:3: -> ^( VT_PACKAGE_ID ( ID )+ )
+            // 452:3: -> ^( VT_PACKAGE_ID ( ID )+ )
             {
-                // src/main/resources/org/drools/lang/DRL.g:451:6: ^( VT_PACKAGE_ID ( ID )+ )
+                // src/main/resources/org/drools/lang/DRL.g:452:6: ^( VT_PACKAGE_ID ( ID )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PACKAGE_ID, "VT_PACKAGE_ID"), root_1);
@@ -857,7 +858,7 @@
     };
 
     // $ANTLR start statement
-    // src/main/resources/org/drools/lang/DRL.g:454:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );
+    // src/main/resources/org/drools/lang/DRL.g:455:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );
     public final statement_return statement() throws RecognitionException {
         statement_return retval = new statement_return();
         retval.start = input.LT(1);
@@ -885,17 +886,17 @@
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:457:3: ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query )
+            // src/main/resources/org/drools/lang/DRL.g:458:3: ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query )
             int alt5=9;
             int LA5_0 = input.LA(1);
 
-            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)))))) {
+            if ( (LA5_0==ID) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(val!
 idateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoft!
 Keywords.ENABLED))||((validateLT(1, "import") && validateLT(2, "functi
on") )&&(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)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIde!
 ntifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
                 int LA5_1 = input.LA(2);
 
-                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))))) {
+                if ( (LA5_1==MISC) && (((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))))) {
                     alt5=1;
                 }
-                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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((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)))||((val
idateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((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.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.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)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))))) {
+                else if ( (LA5_1==ID) && ((((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.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoft!
 Keywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((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.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, DroolsSof!
 tKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLA
TE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((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.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)))||(validateIdentifierKey(Droo!
 lsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((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(DroolsSoft!
 Keywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL)
)||((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)))))) {
                     int LA5_3 = input.LA(3);
 
                     if ( (((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))) ) {
@@ -925,12 +926,12 @@
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("454:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 3, input);
+                            new NoViableAltException("455:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 3, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA5_1==STRING) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||(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)))||((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)))))) {
+                else if ( (LA5_1==STRING) && ((((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(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(Drool!
 sSoftKeywords.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)))||((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))) ) {
@@ -948,7 +949,7 @@
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("454:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 4, input);
+                            new NoViableAltException("455:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 4, input);
 
                         throw nvae;
                     }
@@ -965,7 +966,7 @@
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("454:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 1, input);
+                        new NoViableAltException("455:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 1, input);
 
                     throw nvae;
                 }
@@ -973,20 +974,20 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("454:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 0, input);
+                    new NoViableAltException("455:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 0, input);
 
                 throw nvae;
             }
             switch (alt5) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:458:2: rule_attribute
+                    // src/main/resources/org/drools/lang/DRL.g:459:2: rule_attribute
                     {
                     root_0 = (Object)adaptor.nil();
 
                     if ( backtracking==0 ) {
                       	beginSentence(DroolsSentenceType.RULE_ATTRIBUTE);	
                     }
-                    pushFollow(FOLLOW_rule_attribute_in_statement545);
+                    pushFollow(FOLLOW_rule_attribute_in_statement549);
                     rule_attribute7=rule_attribute();
                     _fsp--;
                     if (failed) return retval;
@@ -995,7 +996,7 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:460:3: {...}? => function_import_statement
+                    // src/main/resources/org/drools/lang/DRL.g:461:3: {...}? => function_import_statement
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -1003,7 +1004,7 @@
                         if (backtracking>0) {failed=true; return retval;}
                         throw new FailedPredicateException(input, "statement", "(validateLT(1, \"import\") && validateLT(2, \"function\") )");
                     }
-                    pushFollow(FOLLOW_function_import_statement_in_statement552);
+                    pushFollow(FOLLOW_function_import_statement_in_statement556);
                     function_import_statement8=function_import_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -1012,11 +1013,11 @@
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:461:4: import_statement
+                    // src/main/resources/org/drools/lang/DRL.g:462:4: import_statement
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_import_statement_in_statement558);
+                    pushFollow(FOLLOW_import_statement_in_statement562);
                     import_statement9=import_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -1025,11 +1026,11 @@
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:462:4: global
+                    // src/main/resources/org/drools/lang/DRL.g:463:4: global
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_global_in_statement564);
+                    pushFollow(FOLLOW_global_in_statement568);
                     global10=global();
                     _fsp--;
                     if (failed) return retval;
@@ -1038,11 +1039,11 @@
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:463:4: function
+                    // src/main/resources/org/drools/lang/DRL.g:464:4: function
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_function_in_statement570);
+                    pushFollow(FOLLOW_function_in_statement574);
                     function11=function();
                     _fsp--;
                     if (failed) return retval;
@@ -1051,7 +1052,7 @@
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:464:4: {...}? => template
+                    // src/main/resources/org/drools/lang/DRL.g:465:4: {...}? => template
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -1059,7 +1060,7 @@
                         if (backtracking>0) {failed=true; return retval;}
                         throw new FailedPredicateException(input, "statement", "(validateLT(1, DroolsSoftKeywords.TEMPLATE))");
                     }
-                    pushFollow(FOLLOW_template_in_statement578);
+                    pushFollow(FOLLOW_template_in_statement582);
                     template12=template();
                     _fsp--;
                     if (failed) return retval;
@@ -1068,7 +1069,7 @@
                     }
                     break;
                 case 7 :
-                    // src/main/resources/org/drools/lang/DRL.g:465:4: {...}? => type_declaration
+                    // src/main/resources/org/drools/lang/DRL.g:466:4: {...}? => type_declaration
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -1076,7 +1077,7 @@
                         if (backtracking>0) {failed=true; return retval;}
                         throw new FailedPredicateException(input, "statement", "(validateLT(1, DroolsSoftKeywords.DECLARE))");
                     }
-                    pushFollow(FOLLOW_type_declaration_in_statement586);
+                    pushFollow(FOLLOW_type_declaration_in_statement590);
                     type_declaration13=type_declaration();
                     _fsp--;
                     if (failed) return retval;
@@ -1085,11 +1086,11 @@
                     }
                     break;
                 case 8 :
-                    // src/main/resources/org/drools/lang/DRL.g:466:4: rule
+                    // src/main/resources/org/drools/lang/DRL.g:467:4: rule
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_rule_in_statement591);
+                    pushFollow(FOLLOW_rule_in_statement595);
                     rule14=rule();
                     _fsp--;
                     if (failed) return retval;
@@ -1098,11 +1099,11 @@
                     }
                     break;
                 case 9 :
-                    // src/main/resources/org/drools/lang/DRL.g:467:4: query
+                    // src/main/resources/org/drools/lang/DRL.g:468:4: query
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_query_in_statement596);
+                    pushFollow(FOLLOW_query_in_statement600);
                     query15=query();
                     _fsp--;
                     if (failed) return retval;
@@ -1135,7 +1136,7 @@
     };
 
     // $ANTLR start import_statement
-    // src/main/resources/org/drools/lang/DRL.g:470:1: import_statement : import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) ;
+    // src/main/resources/org/drools/lang/DRL.g:471:1: import_statement : import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) ;
     public final import_statement_return import_statement() throws RecognitionException {
         import_statement_return retval = new import_statement_return();
         retval.start = input.LT(1);
@@ -1154,23 +1155,23 @@
         RewriteRuleSubtreeStream stream_import_name=new RewriteRuleSubtreeStream(adaptor,"rule import_name");
          pushParaphrases(DroolsParaphraseTypes.IMPORT); 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:473:2: ( import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) )
-            // src/main/resources/org/drools/lang/DRL.g:474:2: import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:474:2: ( import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) )
+            // src/main/resources/org/drools/lang/DRL.g:475:2: import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.IMPORT_STATEMENT);	
             }
-            pushFollow(FOLLOW_import_key_in_import_statement623);
+            pushFollow(FOLLOW_import_key_in_import_statement627);
             import_key16=import_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_key.add(import_key16.getTree());
-            pushFollow(FOLLOW_import_name_in_import_statement625);
+            pushFollow(FOLLOW_import_name_in_import_statement629);
             import_name17=import_name(DroolsParaphraseTypes.IMPORT);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_name.add(import_name17.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:475:56: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:476:56: ( SEMICOLON )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1179,10 +1180,10 @@
             }
             switch (alt6) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:475:56: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:476:56: SEMICOLON
                     {
                     SEMICOLON18=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_import_statement628); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_import_statement632); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON18);
 
 
@@ -1196,7 +1197,7 @@
             }
 
             // AST REWRITE
-            // elements: import_name, import_key
+            // elements: import_key, import_name
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1206,9 +1207,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 477:3: -> ^( import_key import_name )
+            // 478:3: -> ^( import_key import_name )
             {
-                // src/main/resources/org/drools/lang/DRL.g:477:6: ^( import_key import_name )
+                // src/main/resources/org/drools/lang/DRL.g:478:6: ^( import_key import_name )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_import_key.nextNode(), root_1);
@@ -1250,7 +1251,7 @@
     };
 
     // $ANTLR start function_import_statement
-    // src/main/resources/org/drools/lang/DRL.g:480:1: function_import_statement : imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) ;
+    // src/main/resources/org/drools/lang/DRL.g:481:1: function_import_statement : imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) ;
     public final function_import_statement_return function_import_statement() throws RecognitionException {
         function_import_statement_return retval = new function_import_statement_return();
         retval.start = input.LT(1);
@@ -1267,33 +1268,33 @@
 
         Object SEMICOLON21_tree=null;
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
+        RewriteRuleSubtreeStream stream_function_key=new RewriteRuleSubtreeStream(adaptor,"rule function_key");
         RewriteRuleSubtreeStream stream_import_key=new RewriteRuleSubtreeStream(adaptor,"rule import_key");
-        RewriteRuleSubtreeStream stream_function_key=new RewriteRuleSubtreeStream(adaptor,"rule function_key");
         RewriteRuleSubtreeStream stream_import_name=new RewriteRuleSubtreeStream(adaptor,"rule import_name");
          pushParaphrases(DroolsParaphraseTypes.FUNCTION_IMPORT); 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:483:2: (imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) )
-            // src/main/resources/org/drools/lang/DRL.g:484:2: imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:484:2: (imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) )
+            // src/main/resources/org/drools/lang/DRL.g:485:2: imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.FUNCTION_IMPORT_STATEMENT);	
             }
-            pushFollow(FOLLOW_import_key_in_function_import_statement671);
+            pushFollow(FOLLOW_import_key_in_function_import_statement675);
             imp=import_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_key.add(imp.getTree());
-            pushFollow(FOLLOW_function_key_in_function_import_statement673);
+            pushFollow(FOLLOW_function_key_in_function_import_statement677);
             function_key19=function_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_function_key.add(function_key19.getTree());
-            pushFollow(FOLLOW_import_name_in_function_import_statement675);
+            pushFollow(FOLLOW_import_name_in_function_import_statement679);
             import_name20=import_name(DroolsParaphraseTypes.FUNCTION_IMPORT);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_name.add(import_name20.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:485:82: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:486:82: ( SEMICOLON )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1302,10 +1303,10 @@
             }
             switch (alt7) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:485:82: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:486:82: SEMICOLON
                     {
                     SEMICOLON21=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_function_import_statement678); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_function_import_statement682); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON21);
 
 
@@ -1319,7 +1320,7 @@
             }
 
             // AST REWRITE
-            // elements: import_name, function_key
+            // elements: function_key, import_name
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1329,9 +1330,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 487:3: -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
+            // 488:3: -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
             {
-                // src/main/resources/org/drools/lang/DRL.g:487:6: ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
+                // src/main/resources/org/drools/lang/DRL.g:488:6: ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_FUNCTION_IMPORT, ((Token)imp.start)), root_1);
@@ -1374,7 +1375,7 @@
     };
 
     // $ANTLR start import_name
-    // src/main/resources/org/drools/lang/DRL.g:490:1: import_name[DroolsParaphraseTypes importType] : id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:491:1: import_name[DroolsParaphraseTypes importType] : id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) ;
     public final import_name_return import_name(DroolsParaphraseTypes importType) throws RecognitionException {
         import_name_return retval = new import_name_return();
         retval.start = input.LT(1);
@@ -1385,22 +1386,22 @@
         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 )? ) )
-            // src/main/resources/org/drools/lang/DRL.g:491:4: id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )?
+            // src/main/resources/org/drools/lang/DRL.g:492:2: (id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) )
+            // src/main/resources/org/drools/lang/DRL.g:492:4: id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )?
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_import_name712); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_import_name716); 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:491:11: (id+= DOT id+= ID )*
+            // src/main/resources/org/drools/lang/DRL.g:492:11: (id+= DOT id+= ID )*
             loop8:
             do {
                 int alt8=2;
@@ -1413,17 +1414,17 @@
 
                 switch (alt8) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:491:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:492:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_import_name718); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_import_name722); 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_import_name722); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_import_name726); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -1438,7 +1439,7 @@
                 }
             } while (true);
 
-            // src/main/resources/org/drools/lang/DRL.g:491:33: (id+= DOT_STAR )?
+            // src/main/resources/org/drools/lang/DRL.g:492:33: (id+= DOT_STAR )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1447,10 +1448,10 @@
             }
             switch (alt9) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:491:33: id+= DOT_STAR
+                    // src/main/resources/org/drools/lang/DRL.g:492:33: id+= DOT_STAR
                     {
                     id=(Token)input.LT(1);
-                    match(input,DOT_STAR,FOLLOW_DOT_STAR_in_import_name729); if (failed) return retval;
+                    match(input,DOT_STAR,FOLLOW_DOT_STAR_in_import_name733); if (failed) return retval;
                     if ( backtracking==0 ) stream_DOT_STAR.add(id);
 
                     if (list_id==null) list_id=new ArrayList();
@@ -1478,9 +1479,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 494:3: -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
+            // 495:3: -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
             {
-                // src/main/resources/org/drools/lang/DRL.g:494:6: ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
+                // src/main/resources/org/drools/lang/DRL.g:495:6: ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_IMPORT_ID, "VT_IMPORT_ID"), root_1);
@@ -1493,7 +1494,7 @@
 
                 }
                 stream_ID.reset();
-                // src/main/resources/org/drools/lang/DRL.g:494:25: ( DOT_STAR )?
+                // src/main/resources/org/drools/lang/DRL.g:495:25: ( DOT_STAR )?
                 if ( stream_DOT_STAR.hasNext() ) {
                     adaptor.addChild(root_1, stream_DOT_STAR.next());
 
@@ -1532,7 +1533,7 @@
     };
 
     // $ANTLR start global
-    // src/main/resources/org/drools/lang/DRL.g:497:1: global : global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) ;
+    // src/main/resources/org/drools/lang/DRL.g:498:1: global : global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) ;
     public final global_return global() throws RecognitionException {
         global_return retval = new global_return();
         retval.start = input.LT(1);
@@ -1549,33 +1550,33 @@
 
         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 ) )
-            // src/main/resources/org/drools/lang/DRL.g:501:2: global_key data_type global_id ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:501:2: ( global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) )
+            // src/main/resources/org/drools/lang/DRL.g:502:2: global_key data_type global_id ( SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.GLOBAL);	
             }
-            pushFollow(FOLLOW_global_key_in_global774);
+            pushFollow(FOLLOW_global_key_in_global778);
             global_key22=global_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_global_key.add(global_key22.getTree());
-            pushFollow(FOLLOW_data_type_in_global776);
+            pushFollow(FOLLOW_data_type_in_global780);
             data_type23=data_type();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_data_type.add(data_type23.getTree());
-            pushFollow(FOLLOW_global_id_in_global778);
+            pushFollow(FOLLOW_global_id_in_global782);
             global_id24=global_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_global_id.add(global_id24.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:502:34: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:503:34: ( SEMICOLON )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1584,10 +1585,10 @@
             }
             switch (alt10) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:502:34: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:503:34: SEMICOLON
                     {
                     SEMICOLON25=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_global780); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_global784); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON25);
 
 
@@ -1601,7 +1602,7 @@
             }
 
             // AST REWRITE
-            // elements: data_type, global_key, global_id
+            // elements: global_id, global_key, data_type
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1611,9 +1612,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 504:3: -> ^( global_key data_type global_id )
+            // 505:3: -> ^( global_key data_type global_id )
             {
-                // src/main/resources/org/drools/lang/DRL.g:504:6: ^( global_key data_type global_id )
+                // src/main/resources/org/drools/lang/DRL.g:505:6: ^( global_key data_type global_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_global_key.nextNode(), root_1);
@@ -1656,7 +1657,7 @@
     };
 
     // $ANTLR start global_id
-    // src/main/resources/org/drools/lang/DRL.g:507:1: global_id : id= ID -> VT_GLOBAL_ID[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:508:1: global_id : id= ID -> VT_GLOBAL_ID[$id] ;
     public final global_id_return global_id() throws RecognitionException {
         global_id_return retval = new global_id_return();
         retval.start = input.LT(1);
@@ -1669,11 +1670,11 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:508:2: (id= ID -> VT_GLOBAL_ID[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:508:4: id= ID
+            // src/main/resources/org/drools/lang/DRL.g:509:2: (id= ID -> VT_GLOBAL_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:509:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_global_id809); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_global_id813); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -1692,7 +1693,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 511:3: -> VT_GLOBAL_ID[$id]
+            // 512:3: -> VT_GLOBAL_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_GLOBAL_ID, id));
 
@@ -1725,7 +1726,7 @@
     };
 
     // $ANTLR start function
-    // src/main/resources/org/drools/lang/DRL.g:514:1: function : function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:515:1: function : function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) ;
     public final function_return function() throws RecognitionException {
         function_return retval = new function_return();
         retval.start = input.LT(1);
@@ -1743,25 +1744,25 @@
         curly_chunk_return curly_chunk30 = null;
 
 
+        RewriteRuleSubtreeStream stream_function_key=new RewriteRuleSubtreeStream(adaptor,"rule function_key");
+        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_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");
          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 ) )
-            // src/main/resources/org/drools/lang/DRL.g:518:2: function_key ( data_type )? function_id parameters curly_chunk
+            // src/main/resources/org/drools/lang/DRL.g:518:2: ( function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:519:2: function_key ( data_type )? function_id parameters curly_chunk
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.FUNCTION);	
             }
-            pushFollow(FOLLOW_function_key_in_function846);
+            pushFollow(FOLLOW_function_key_in_function850);
             function_key26=function_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_function_key.add(function_key26.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:519:16: ( data_type )?
+            // src/main/resources/org/drools/lang/DRL.g:520:16: ( data_type )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1774,9 +1775,9 @@
             }
             switch (alt11) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:519:16: data_type
+                    // src/main/resources/org/drools/lang/DRL.g:520:16: data_type
                     {
-                    pushFollow(FOLLOW_data_type_in_function848);
+                    pushFollow(FOLLOW_data_type_in_function852);
                     data_type27=data_type();
                     _fsp--;
                     if (failed) return retval;
@@ -1787,24 +1788,24 @@
 
             }
 
-            pushFollow(FOLLOW_function_id_in_function851);
+            pushFollow(FOLLOW_function_id_in_function855);
             function_id28=function_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_function_id.add(function_id28.getTree());
-            pushFollow(FOLLOW_parameters_in_function853);
+            pushFollow(FOLLOW_parameters_in_function857);
             parameters29=parameters();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_parameters.add(parameters29.getTree());
-            pushFollow(FOLLOW_curly_chunk_in_function855);
+            pushFollow(FOLLOW_curly_chunk_in_function859);
             curly_chunk30=curly_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_curly_chunk.add(curly_chunk30.getTree());
 
             // AST REWRITE
-            // elements: function_id, parameters, data_type, function_key, curly_chunk
+            // elements: parameters, curly_chunk, data_type, function_key, function_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1814,14 +1815,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 520:3: -> ^( function_key ( data_type )? function_id parameters curly_chunk )
+            // 521:3: -> ^( function_key ( data_type )? function_id parameters curly_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:520:6: ^( function_key ( data_type )? function_id parameters curly_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:521:6: ^( function_key ( data_type )? function_id parameters curly_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_function_key.nextNode(), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:520:21: ( data_type )?
+                // src/main/resources/org/drools/lang/DRL.g:521:21: ( data_type )?
                 if ( stream_data_type.hasNext() ) {
                     adaptor.addChild(root_1, stream_data_type.next());
 
@@ -1866,7 +1867,7 @@
     };
 
     // $ANTLR start function_id
-    // src/main/resources/org/drools/lang/DRL.g:523:1: function_id : id= ID -> VT_FUNCTION_ID[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:524:1: function_id : id= ID -> VT_FUNCTION_ID[$id] ;
     public final function_id_return function_id() throws RecognitionException {
         function_id_return retval = new function_id_return();
         retval.start = input.LT(1);
@@ -1879,11 +1880,11 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:524:2: (id= ID -> VT_FUNCTION_ID[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:524:4: id= ID
+            // src/main/resources/org/drools/lang/DRL.g:525:2: (id= ID -> VT_FUNCTION_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:525:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_function_id885); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function_id889); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -1902,7 +1903,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 527:3: -> VT_FUNCTION_ID[$id]
+            // 528:3: -> VT_FUNCTION_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_FUNCTION_ID, id));
 
@@ -1935,7 +1936,7 @@
     };
 
     // $ANTLR start query
-    // src/main/resources/org/drools/lang/DRL.g:530:1: query : query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) ;
+    // src/main/resources/org/drools/lang/DRL.g:531:1: query : query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) ;
     public final query_return query() throws RecognitionException {
         query_return retval = new query_return();
         retval.start = input.LT(1);
@@ -1955,26 +1956,26 @@
 
         Object END35_tree=null;
         Object SEMICOLON36_tree=null;
+        RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
-        RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
-        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 {
-            // src/main/resources/org/drools/lang/DRL.g:533:2: ( query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) )
-            // src/main/resources/org/drools/lang/DRL.g:534:2: query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:534:2: ( query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) )
+            // src/main/resources/org/drools/lang/DRL.g:535:2: query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.QUERY);	
             }
-            pushFollow(FOLLOW_query_key_in_query922);
+            pushFollow(FOLLOW_query_key_in_query926);
             query_key31=query_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_query_key.add(query_key31.getTree());
-            pushFollow(FOLLOW_query_id_in_query924);
+            pushFollow(FOLLOW_query_id_in_query928);
             query_id32=query_id();
             _fsp--;
             if (failed) return retval;
@@ -1982,14 +1983,14 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:537:3: ( parameters )?
+            // src/main/resources/org/drools/lang/DRL.g:538:3: ( parameters )?
             int alt12=2;
             alt12 = dfa12.predict(input);
             switch (alt12) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:537:3: parameters
+                    // src/main/resources/org/drools/lang/DRL.g:538:3: parameters
                     {
-                    pushFollow(FOLLOW_parameters_in_query932);
+                    pushFollow(FOLLOW_parameters_in_query936);
                     parameters33=parameters();
                     _fsp--;
                     if (failed) return retval;
@@ -2003,16 +2004,16 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
-            pushFollow(FOLLOW_normal_lhs_block_in_query941);
+            pushFollow(FOLLOW_normal_lhs_block_in_query945);
             normal_lhs_block34=normal_lhs_block();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block34.getTree());
             END35=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_query946); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_query950); if (failed) return retval;
             if ( backtracking==0 ) stream_END.add(END35);
 
-            // src/main/resources/org/drools/lang/DRL.g:540:7: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:541:7: ( SEMICOLON )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -2021,10 +2022,10 @@
             }
             switch (alt13) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:540:7: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:541:7: SEMICOLON
                     {
                     SEMICOLON36=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_query948); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_query952); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON36);
 
 
@@ -2039,7 +2040,7 @@
             }
 
             // AST REWRITE
-            // elements: END, normal_lhs_block, query_id, query_key, parameters
+            // elements: parameters, query_id, query_key, normal_lhs_block, END
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2049,15 +2050,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 543:3: -> ^( query_key query_id ( parameters )? normal_lhs_block END )
+            // 544:3: -> ^( query_key query_id ( parameters )? normal_lhs_block END )
             {
-                // src/main/resources/org/drools/lang/DRL.g:543:6: ^( query_key query_id ( parameters )? normal_lhs_block END )
+                // src/main/resources/org/drools/lang/DRL.g:544:6: ^( query_key query_id ( parameters )? normal_lhs_block END )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_query_key.nextNode(), root_1);
 
                 adaptor.addChild(root_1, stream_query_id.next());
-                // src/main/resources/org/drools/lang/DRL.g:543:27: ( parameters )?
+                // src/main/resources/org/drools/lang/DRL.g:544:27: ( parameters )?
                 if ( stream_parameters.hasNext() ) {
                     adaptor.addChild(root_1, stream_parameters.next());
 
@@ -2101,7 +2102,7 @@
     };
 
     // $ANTLR start query_id
-    // src/main/resources/org/drools/lang/DRL.g:546:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );
+    // src/main/resources/org/drools/lang/DRL.g:547:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );
     public final query_id_return query_id() throws RecognitionException {
         query_id_return retval = new query_id_return();
         retval.start = input.LT(1);
@@ -2111,11 +2112,11 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:547:2: (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:548:2: (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2128,16 +2129,16 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("546:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );", 14, 0, input);
+                    new NoViableAltException("547:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );", 14, 0, input);
 
                 throw nvae;
             }
             switch (alt14) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:547:5: id= ID
+                    // src/main/resources/org/drools/lang/DRL.g:548:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_query_id983); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_query_id987); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
@@ -2156,7 +2157,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 549:65: -> VT_QUERY_ID[$id]
+                    // 550:65: -> VT_QUERY_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_QUERY_ID, id));
 
@@ -2167,10 +2168,10 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:550:5: id= STRING
+                    // src/main/resources/org/drools/lang/DRL.g:551:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_query_id999); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_query_id1003); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
@@ -2189,7 +2190,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 552:65: -> VT_QUERY_ID[$id]
+                    // 553:65: -> VT_QUERY_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_QUERY_ID, id));
 
@@ -2224,7 +2225,7 @@
     };
 
     // $ANTLR start parameters
-    // src/main/resources/org/drools/lang/DRL.g:555:1: parameters : LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:556:1: parameters : LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) ;
     public final parameters_return parameters() throws RecognitionException {
         parameters_return retval = new parameters_return();
         retval.start = input.LT(1);
@@ -2242,22 +2243,22 @@
         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 ) )
-            // src/main/resources/org/drools/lang/DRL.g:556:4: LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN
+            // src/main/resources/org/drools/lang/DRL.g:557:2: ( LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:557:4: LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN
             {
             LEFT_PAREN37=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parameters1018); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parameters1022); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN37);
 
             if ( backtracking==0 ) {
               	emit(LEFT_PAREN37, DroolsEditorType.SYMBOL);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:557:4: ( param_definition ( COMMA param_definition )* )?
+            // src/main/resources/org/drools/lang/DRL.g:558:4: ( param_definition ( COMMA param_definition )* )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2266,14 +2267,14 @@
             }
             switch (alt16) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:557:6: param_definition ( COMMA param_definition )*
+                    // src/main/resources/org/drools/lang/DRL.g:558:6: param_definition ( COMMA param_definition )*
                     {
-                    pushFollow(FOLLOW_param_definition_in_parameters1027);
+                    pushFollow(FOLLOW_param_definition_in_parameters1031);
                     param_definition38=param_definition();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_param_definition.add(param_definition38.getTree());
-                    // src/main/resources/org/drools/lang/DRL.g:557:23: ( COMMA param_definition )*
+                    // src/main/resources/org/drools/lang/DRL.g:558:23: ( COMMA param_definition )*
                     loop15:
                     do {
                         int alt15=2;
@@ -2286,16 +2287,16 @@
 
                         switch (alt15) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:557:24: COMMA param_definition
+                    	    // src/main/resources/org/drools/lang/DRL.g:558:24: COMMA param_definition
                     	    {
                     	    COMMA39=(Token)input.LT(1);
-                    	    match(input,COMMA,FOLLOW_COMMA_in_parameters1030); if (failed) return retval;
+                    	    match(input,COMMA,FOLLOW_COMMA_in_parameters1034); if (failed) return retval;
                     	    if ( backtracking==0 ) stream_COMMA.add(COMMA39);
 
                     	    if ( backtracking==0 ) {
                     	      	emit(COMMA39, DroolsEditorType.SYMBOL);	
                     	    }
-                    	    pushFollow(FOLLOW_param_definition_in_parameters1034);
+                    	    pushFollow(FOLLOW_param_definition_in_parameters1038);
                     	    param_definition40=param_definition();
                     	    _fsp--;
                     	    if (failed) return retval;
@@ -2316,7 +2317,7 @@
             }
 
             RIGHT_PAREN41=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parameters1043); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parameters1047); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN41);
 
             if ( backtracking==0 ) {
@@ -2334,14 +2335,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 559:3: -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
+            // 560:3: -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:559:6: ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:560:6: ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PARAM_LIST, "VT_PARAM_LIST"), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:559:22: ( param_definition )*
+                // src/main/resources/org/drools/lang/DRL.g:560:22: ( param_definition )*
                 while ( stream_param_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_param_definition.next());
 
@@ -2381,7 +2382,7 @@
     };
 
     // $ANTLR start param_definition
-    // src/main/resources/org/drools/lang/DRL.g:562:1: param_definition : ( data_type )? argument ;
+    // src/main/resources/org/drools/lang/DRL.g:563:1: param_definition : ( data_type )? argument ;
     public final param_definition_return param_definition() throws RecognitionException {
         param_definition_return retval = new param_definition_return();
         retval.start = input.LT(1);
@@ -2395,19 +2396,19 @@
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:563:2: ( ( data_type )? argument )
-            // src/main/resources/org/drools/lang/DRL.g:563:4: ( data_type )? argument
+            // src/main/resources/org/drools/lang/DRL.g:564:2: ( ( data_type )? argument )
+            // src/main/resources/org/drools/lang/DRL.g:564:4: ( data_type )? argument
             {
             root_0 = (Object)adaptor.nil();
 
-            // src/main/resources/org/drools/lang/DRL.g:563:4: ( data_type )?
+            // src/main/resources/org/drools/lang/DRL.g:564:4: ( data_type )?
             int alt17=2;
             alt17 = dfa17.predict(input);
             switch (alt17) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:563:4: data_type
+                    // src/main/resources/org/drools/lang/DRL.g:564:4: data_type
                     {
-                    pushFollow(FOLLOW_data_type_in_param_definition1069);
+                    pushFollow(FOLLOW_data_type_in_param_definition1073);
                     data_type42=data_type();
                     _fsp--;
                     if (failed) return retval;
@@ -2418,7 +2419,7 @@
 
             }
 
-            pushFollow(FOLLOW_argument_in_param_definition1072);
+            pushFollow(FOLLOW_argument_in_param_definition1076);
             argument43=argument();
             _fsp--;
             if (failed) return retval;
@@ -2449,7 +2450,7 @@
     };
 
     // $ANTLR start argument
-    // src/main/resources/org/drools/lang/DRL.g:566:1: argument : ID ( dimension_definition )* ;
+    // src/main/resources/org/drools/lang/DRL.g:567:1: argument : ID ( dimension_definition )* ;
     public final argument_return argument() throws RecognitionException {
         argument_return retval = new argument_return();
         retval.start = input.LT(1);
@@ -2463,13 +2464,13 @@
         Object ID44_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:567:2: ( ID ( dimension_definition )* )
-            // src/main/resources/org/drools/lang/DRL.g:567:4: ID ( dimension_definition )*
+            // src/main/resources/org/drools/lang/DRL.g:568:2: ( ID ( dimension_definition )* )
+            // src/main/resources/org/drools/lang/DRL.g:568:4: ID ( dimension_definition )*
             {
             root_0 = (Object)adaptor.nil();
 
             ID44=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_argument1083); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_argument1087); if (failed) return retval;
             if ( backtracking==0 ) {
             ID44_tree = (Object)adaptor.create(ID44);
             adaptor.addChild(root_0, ID44_tree);
@@ -2477,7 +2478,7 @@
             if ( backtracking==0 ) {
               	emit(ID44, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:568:3: ( dimension_definition )*
+            // src/main/resources/org/drools/lang/DRL.g:569:3: ( dimension_definition )*
             loop18:
             do {
                 int alt18=2;
@@ -2490,9 +2491,9 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:568:3: dimension_definition
+            	    // src/main/resources/org/drools/lang/DRL.g:569:3: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_argument1089);
+            	    pushFollow(FOLLOW_dimension_definition_in_argument1093);
             	    dimension_definition45=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2532,7 +2533,7 @@
     };
 
     // $ANTLR start type_declaration
-    // src/main/resources/org/drools/lang/DRL.g:571:1: type_declaration : declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) ;
+    // src/main/resources/org/drools/lang/DRL.g:572:1: type_declaration : declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) ;
     public final type_declaration_return type_declaration() throws RecognitionException {
         type_declaration_return retval = new type_declaration_return();
         retval.start = input.LT(1);
@@ -2552,28 +2553,28 @@
         Object END50_tree=null;
         RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
         RewriteRuleSubtreeStream stream_decl_field=new RewriteRuleSubtreeStream(adaptor,"rule decl_field");
+        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");
-        RewriteRuleSubtreeStream stream_decl_metadata=new RewriteRuleSubtreeStream(adaptor,"rule decl_metadata");
-        RewriteRuleSubtreeStream stream_type_declare_id=new RewriteRuleSubtreeStream(adaptor,"rule type_declare_id");
          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 ) )
-            // src/main/resources/org/drools/lang/DRL.g:575:2: declare_key type_declare_id ( decl_metadata )* ( decl_field )* END
+            // src/main/resources/org/drools/lang/DRL.g:575:2: ( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) )
+            // src/main/resources/org/drools/lang/DRL.g:576:2: declare_key type_declare_id ( decl_metadata )* ( decl_field )* END
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.TYPE_DECLARATION);	
             }
-            pushFollow(FOLLOW_declare_key_in_type_declaration1117);
+            pushFollow(FOLLOW_declare_key_in_type_declaration1121);
             declare_key46=declare_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_declare_key.add(declare_key46.getTree());
-            pushFollow(FOLLOW_type_declare_id_in_type_declaration1120);
+            pushFollow(FOLLOW_type_declare_id_in_type_declaration1124);
             type_declare_id47=type_declare_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_type_declare_id.add(type_declare_id47.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:577:3: ( decl_metadata )*
+            // src/main/resources/org/drools/lang/DRL.g:578:3: ( decl_metadata )*
             loop19:
             do {
                 int alt19=2;
@@ -2586,9 +2587,9 @@
 
                 switch (alt19) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:577:3: decl_metadata
+            	    // src/main/resources/org/drools/lang/DRL.g:578:3: decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration1124);
+            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration1128);
             	    decl_metadata48=decl_metadata();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2602,7 +2603,7 @@
                 }
             } while (true);
 
-            // src/main/resources/org/drools/lang/DRL.g:578:3: ( decl_field )*
+            // src/main/resources/org/drools/lang/DRL.g:579:3: ( decl_field )*
             loop20:
             do {
                 int alt20=2;
@@ -2615,9 +2616,9 @@
 
                 switch (alt20) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:578:3: decl_field
+            	    // src/main/resources/org/drools/lang/DRL.g:579:3: decl_field
             	    {
-            	    pushFollow(FOLLOW_decl_field_in_type_declaration1129);
+            	    pushFollow(FOLLOW_decl_field_in_type_declaration1133);
             	    decl_field49=decl_field();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2632,7 +2633,7 @@
             } while (true);
 
             END50=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_type_declaration1134); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_type_declaration1138); if (failed) return retval;
             if ( backtracking==0 ) stream_END.add(END50);
 
             if ( backtracking==0 ) {
@@ -2640,7 +2641,7 @@
             }
 
             // AST REWRITE
-            // elements: decl_field, decl_metadata, END, declare_key, type_declare_id
+            // elements: declare_key, decl_field, type_declare_id, decl_metadata, END
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2650,21 +2651,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 581:3: -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
+            // 582:3: -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
             {
-                // src/main/resources/org/drools/lang/DRL.g:581:6: ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
+                // src/main/resources/org/drools/lang/DRL.g:582:6: ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_declare_key.nextNode(), root_1);
 
                 adaptor.addChild(root_1, stream_type_declare_id.next());
-                // src/main/resources/org/drools/lang/DRL.g:581:36: ( decl_metadata )*
+                // src/main/resources/org/drools/lang/DRL.g:582:36: ( decl_metadata )*
                 while ( stream_decl_metadata.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_metadata.next());
 
                 }
                 stream_decl_metadata.reset();
-                // src/main/resources/org/drools/lang/DRL.g:581:51: ( decl_field )*
+                // src/main/resources/org/drools/lang/DRL.g:582:51: ( decl_field )*
                 while ( stream_decl_field.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_field.next());
 
@@ -2707,7 +2708,7 @@
     };
 
     // $ANTLR start type_declare_id
-    // src/main/resources/org/drools/lang/DRL.g:584:1: type_declare_id : id= ID -> VT_TYPE_DECLARE_ID[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:585:1: type_declare_id : id= ID -> VT_TYPE_DECLARE_ID[$id] ;
     public final type_declare_id_return type_declare_id() throws RecognitionException {
         type_declare_id_return retval = new type_declare_id_return();
         retval.start = input.LT(1);
@@ -2720,11 +2721,11 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:585:2: (id= ID -> VT_TYPE_DECLARE_ID[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:585:5: id= ID
+            // src/main/resources/org/drools/lang/DRL.g:586:2: (id= ID -> VT_TYPE_DECLARE_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:586:5: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_type_declare_id1169); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_type_declare_id1173); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -2743,7 +2744,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 587:72: -> VT_TYPE_DECLARE_ID[$id]
+            // 588:72: -> VT_TYPE_DECLARE_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_TYPE_DECLARE_ID, id));
 
@@ -2776,7 +2777,7 @@
     };
 
     // $ANTLR start decl_metadata
-    // src/main/resources/org/drools/lang/DRL.g:590:1: decl_metadata : AT ID paren_chunk -> ^( AT ID paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:591:1: decl_metadata : AT ID paren_chunk -> ^( AT ID paren_chunk ) ;
     public final decl_metadata_return decl_metadata() throws RecognitionException {
         decl_metadata_return retval = new decl_metadata_return();
         retval.start = input.LT(1);
@@ -2794,31 +2795,31 @@
         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:591:2: ( AT ID paren_chunk -> ^( AT ID paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:591:4: AT ID paren_chunk
+            // src/main/resources/org/drools/lang/DRL.g:592:2: ( AT ID paren_chunk -> ^( AT ID paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:592:4: AT ID paren_chunk
             {
             AT51=(Token)input.LT(1);
-            match(input,AT,FOLLOW_AT_in_decl_metadata1188); if (failed) return retval;
+            match(input,AT,FOLLOW_AT_in_decl_metadata1192); if (failed) return retval;
             if ( backtracking==0 ) stream_AT.add(AT51);
 
             if ( backtracking==0 ) {
               	emit(AT51, DroolsEditorType.SYMBOL);	
             }
             ID52=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_decl_metadata1196); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_decl_metadata1200); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID52);
 
             if ( backtracking==0 ) {
               	emit(ID52, DroolsEditorType.IDENTIFIER);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_decl_metadata1203);
+            pushFollow(FOLLOW_paren_chunk_in_decl_metadata1207);
             paren_chunk53=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk53.getTree());
 
             // AST REWRITE
-            // elements: paren_chunk, AT, ID
+            // elements: paren_chunk, ID, AT
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2828,9 +2829,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 596:3: -> ^( AT ID paren_chunk )
+            // 597:3: -> ^( AT ID paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:596:6: ^( AT ID paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:597:6: ^( AT ID paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_AT.next(), root_1);
@@ -2870,7 +2871,7 @@
     };
 
     // $ANTLR start decl_field
-    // src/main/resources/org/drools/lang/DRL.g:599:1: decl_field : 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:1: decl_field : ID ( decl_field_initialization )? COLON data_type ( decl_metadata )* -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* ) ;
     public final decl_field_return decl_field() throws RecognitionException {
         decl_field_return retval = new decl_field_return();
         retval.start = input.LT(1);
@@ -2890,21 +2891,21 @@
         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 )*
+            // src/main/resources/org/drools/lang/DRL.g:601: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:601:4: ID ( decl_field_initialization )? COLON data_type ( decl_metadata )*
             {
             ID54=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_decl_field1226); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_decl_field1230); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID54);
 
             if ( backtracking==0 ) {
               	emit(ID54, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:601:3: ( decl_field_initialization )?
+            // src/main/resources/org/drools/lang/DRL.g:602:3: ( decl_field_initialization )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2913,9 +2914,9 @@
             }
             switch (alt21) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:601:3: decl_field_initialization
+                    // src/main/resources/org/drools/lang/DRL.g:602:3: decl_field_initialization
                     {
-                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field1232);
+                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field1236);
                     decl_field_initialization55=decl_field_initialization();
                     _fsp--;
                     if (failed) return retval;
@@ -2927,18 +2928,18 @@
             }
 
             COLON56=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_decl_field1238); if (failed) return retval;
+            match(input,COLON,FOLLOW_COLON_in_decl_field1242); if (failed) return retval;
             if ( backtracking==0 ) stream_COLON.add(COLON56);
 
             if ( backtracking==0 ) {
               	emit(COLON56, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_data_type_in_decl_field1244);
+            pushFollow(FOLLOW_data_type_in_decl_field1248);
             data_type57=data_type();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_data_type.add(data_type57.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:604:3: ( decl_metadata )*
+            // src/main/resources/org/drools/lang/DRL.g:605:3: ( decl_metadata )*
             loop22:
             do {
                 int alt22=2;
@@ -2951,9 +2952,9 @@
 
                 switch (alt22) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:604:3: decl_metadata
+            	    // src/main/resources/org/drools/lang/DRL.g:605:3: decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_decl_field1248);
+            	    pushFollow(FOLLOW_decl_metadata_in_decl_field1252);
             	    decl_metadata58=decl_metadata();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2969,7 +2970,7 @@
 
 
             // AST REWRITE
-            // elements: ID, data_type, decl_metadata, decl_field_initialization
+            // elements: data_type, decl_field_initialization, ID, decl_metadata
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2979,21 +2980,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 605:3: -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
+            // 606:3: -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:605:6: ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
+                // src/main/resources/org/drools/lang/DRL.g:606:6: ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_ID.next(), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:605:11: ( decl_field_initialization )?
+                // src/main/resources/org/drools/lang/DRL.g:606:11: ( decl_field_initialization )?
                 if ( stream_decl_field_initialization.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_field_initialization.next());
 
                 }
                 stream_decl_field_initialization.reset();
                 adaptor.addChild(root_1, stream_data_type.next());
-                // src/main/resources/org/drools/lang/DRL.g:605:48: ( decl_metadata )*
+                // src/main/resources/org/drools/lang/DRL.g:606:48: ( decl_metadata )*
                 while ( stream_decl_metadata.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_metadata.next());
 
@@ -3032,7 +3033,7 @@
     };
 
     // $ANTLR start decl_field_initialization
-    // src/main/resources/org/drools/lang/DRL.g:608:1: decl_field_initialization : EQUALS paren_chunk -> ^( EQUALS paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:609:1: decl_field_initialization : EQUALS paren_chunk -> ^( EQUALS paren_chunk ) ;
     public final decl_field_initialization_return decl_field_initialization() throws RecognitionException {
         decl_field_initialization_return retval = new decl_field_initialization_return();
         retval.start = input.LT(1);
@@ -3047,17 +3048,17 @@
         RewriteRuleTokenStream stream_EQUALS=new RewriteRuleTokenStream(adaptor,"token EQUALS");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:609:2: ( EQUALS paren_chunk -> ^( EQUALS paren_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:609:4: EQUALS paren_chunk
+            // src/main/resources/org/drools/lang/DRL.g:610:2: ( EQUALS paren_chunk -> ^( EQUALS paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:610:4: EQUALS paren_chunk
             {
             EQUALS59=(Token)input.LT(1);
-            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization1276); if (failed) return retval;
+            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization1280); if (failed) return retval;
             if ( backtracking==0 ) stream_EQUALS.add(EQUALS59);
 
             if ( backtracking==0 ) {
               	emit(EQUALS59, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_decl_field_initialization1282);
+            pushFollow(FOLLOW_paren_chunk_in_decl_field_initialization1286);
             paren_chunk60=paren_chunk();
             _fsp--;
             if (failed) return retval;
@@ -3074,9 +3075,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 611:2: -> ^( EQUALS paren_chunk )
+            // 612:2: -> ^( EQUALS paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:611:5: ^( EQUALS paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:612:5: ^( EQUALS paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_EQUALS.next(), root_1);
@@ -3115,7 +3116,7 @@
     };
 
     // $ANTLR start template
-    // src/main/resources/org/drools/lang/DRL.g:614:1: template : template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) ;
+    // src/main/resources/org/drools/lang/DRL.g:615:1: template : template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) ;
     public final template_return template() throws RecognitionException {
         template_return retval = new template_return();
         retval.start = input.LT(1);
@@ -3135,30 +3136,30 @@
         Object semi1_tree=null;
         Object semi2_tree=null;
         Object END64_tree=null;
+        RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
-        RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
+        RewriteRuleSubtreeStream stream_template_slot=new RewriteRuleSubtreeStream(adaptor,"rule template_slot");
         RewriteRuleSubtreeStream stream_template_id=new RewriteRuleSubtreeStream(adaptor,"rule template_id");
-        RewriteRuleSubtreeStream stream_template_slot=new RewriteRuleSubtreeStream(adaptor,"rule template_slot");
         RewriteRuleSubtreeStream stream_template_key=new RewriteRuleSubtreeStream(adaptor,"rule template_key");
          pushParaphrases(DroolsParaphraseTypes.TEMPLATE); 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:617:2: ( template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) )
-            // src/main/resources/org/drools/lang/DRL.g:618:2: template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:618:2: ( template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) )
+            // src/main/resources/org/drools/lang/DRL.g:619:2: template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )?
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.TEMPLATE);	
             }
-            pushFollow(FOLLOW_template_key_in_template1319);
+            pushFollow(FOLLOW_template_key_in_template1323);
             template_key61=template_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_template_key.add(template_key61.getTree());
-            pushFollow(FOLLOW_template_id_in_template1321);
+            pushFollow(FOLLOW_template_id_in_template1325);
             template_id62=template_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_template_id.add(template_id62.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:620:8: (semi1= SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:621:8: (semi1= SEMICOLON )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -3167,10 +3168,10 @@
             }
             switch (alt23) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:620:8: semi1= SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:621:8: semi1= SEMICOLON
                     {
                     semi1=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1328); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1332); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(semi1);
 
 
@@ -3182,7 +3183,7 @@
             if ( backtracking==0 ) {
               	emit(semi1, DroolsEditorType.SYMBOL);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:622:3: ( template_slot )+
+            // src/main/resources/org/drools/lang/DRL.g:623:3: ( template_slot )+
             int cnt24=0;
             loop24:
             do {
@@ -3196,9 +3197,9 @@
 
                 switch (alt24) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:622:3: template_slot
+            	    // src/main/resources/org/drools/lang/DRL.g:623:3: template_slot
             	    {
-            	    pushFollow(FOLLOW_template_slot_in_template1336);
+            	    pushFollow(FOLLOW_template_slot_in_template1340);
             	    template_slot63=template_slot();
             	    _fsp--;
             	    if (failed) return retval;
@@ -3218,10 +3219,10 @@
             } while (true);
 
             END64=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template1341); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_template1345); if (failed) return retval;
             if ( backtracking==0 ) stream_END.add(END64);
 
-            // src/main/resources/org/drools/lang/DRL.g:623:12: (semi2= SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:624:12: (semi2= SEMICOLON )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3230,10 +3231,10 @@
             }
             switch (alt25) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:623:12: semi2= SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:624:12: semi2= SEMICOLON
                     {
                     semi2=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1345); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1349); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(semi2);
 
 
@@ -3248,7 +3249,7 @@
             }
 
             // AST REWRITE
-            // elements: template_key, template_id, template_slot, END
+            // elements: template_id, template_key, template_slot, END
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3258,9 +3259,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 626:3: -> ^( template_key template_id ( template_slot )+ END )
+            // 627:3: -> ^( template_key template_id ( template_slot )+ END )
             {
-                // src/main/resources/org/drools/lang/DRL.g:626:6: ^( template_key template_id ( template_slot )+ END )
+                // src/main/resources/org/drools/lang/DRL.g:627:6: ^( template_key template_id ( template_slot )+ END )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_template_key.nextNode(), root_1);
@@ -3311,7 +3312,7 @@
     };
 
     // $ANTLR start template_id
-    // src/main/resources/org/drools/lang/DRL.g:629:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );
+    // src/main/resources/org/drools/lang/DRL.g:630:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );
     public final template_id_return template_id() throws RecognitionException {
         template_id_return retval = new template_id_return();
         retval.start = input.LT(1);
@@ -3321,11 +3322,11 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:630:2: (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:631:2: (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3338,16 +3339,16 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("629:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );", 26, 0, input);
+                    new NoViableAltException("630:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );", 26, 0, input);
 
                 throw nvae;
             }
             switch (alt26) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:630:5: id= ID
+                    // src/main/resources/org/drools/lang/DRL.g:631:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_template_id1378); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_template_id1382); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
@@ -3366,7 +3367,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 632:68: -> VT_TEMPLATE_ID[$id]
+                    // 633:68: -> VT_TEMPLATE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_TEMPLATE_ID, id));
 
@@ -3377,10 +3378,10 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:633:5: id= STRING
+                    // src/main/resources/org/drools/lang/DRL.g:634:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_template_id1394); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_template_id1398); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
@@ -3399,7 +3400,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 635:68: -> VT_TEMPLATE_ID[$id]
+                    // 636:68: -> VT_TEMPLATE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_TEMPLATE_ID, id));
 
@@ -3434,7 +3435,7 @@
     };
 
     // $ANTLR start template_slot
-    // src/main/resources/org/drools/lang/DRL.g:638:1: template_slot : data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) ;
+    // src/main/resources/org/drools/lang/DRL.g:639:1: template_slot : data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) ;
     public final template_slot_return template_slot() throws RecognitionException {
         template_slot_return retval = new template_slot_return();
         retval.start = input.LT(1);
@@ -3452,20 +3453,20 @@
         RewriteRuleSubtreeStream stream_slot_id=new RewriteRuleSubtreeStream(adaptor,"rule slot_id");
         RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:639:2: ( data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) )
-            // src/main/resources/org/drools/lang/DRL.g:639:5: data_type slot_id ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:640:2: ( data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) )
+            // src/main/resources/org/drools/lang/DRL.g:640:5: data_type slot_id ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_data_type_in_template_slot1414);
+            pushFollow(FOLLOW_data_type_in_template_slot1418);
             data_type65=data_type();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_data_type.add(data_type65.getTree());
-            pushFollow(FOLLOW_slot_id_in_template_slot1416);
+            pushFollow(FOLLOW_slot_id_in_template_slot1420);
             slot_id66=slot_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_slot_id.add(slot_id66.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:639:23: ( SEMICOLON )?
+            // src/main/resources/org/drools/lang/DRL.g:640:23: ( SEMICOLON )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3474,10 +3475,10 @@
             }
             switch (alt27) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:639:23: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:640:23: SEMICOLON
                     {
                     SEMICOLON67=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template_slot1418); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template_slot1422); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON67);
 
 
@@ -3491,7 +3492,7 @@
             }
 
             // AST REWRITE
-            // elements: data_type, slot_id
+            // elements: slot_id, data_type
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3501,9 +3502,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 641:3: -> ^( VT_SLOT data_type slot_id )
+            // 642:3: -> ^( VT_SLOT data_type slot_id )
             {
-                // src/main/resources/org/drools/lang/DRL.g:641:6: ^( VT_SLOT data_type slot_id )
+                // src/main/resources/org/drools/lang/DRL.g:642:6: ^( VT_SLOT data_type slot_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_SLOT, "VT_SLOT"), root_1);
@@ -3543,7 +3544,7 @@
     };
 
     // $ANTLR start slot_id
-    // src/main/resources/org/drools/lang/DRL.g:644:1: slot_id : id= ID -> VT_SLOT_ID[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:645:1: slot_id : id= ID -> VT_SLOT_ID[$id] ;
     public final slot_id_return slot_id() throws RecognitionException {
         slot_id_return retval = new slot_id_return();
         retval.start = input.LT(1);
@@ -3556,11 +3557,11 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:645:2: (id= ID -> VT_SLOT_ID[$id] )
-            // src/main/resources/org/drools/lang/DRL.g:645:4: id= ID
+            // src/main/resources/org/drools/lang/DRL.g:646:2: (id= ID -> VT_SLOT_ID[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:646:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_slot_id1447); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_slot_id1451); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -3578,7 +3579,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 647:3: -> VT_SLOT_ID[$id]
+            // 648:3: -> VT_SLOT_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_SLOT_ID, id));
 
@@ -3611,7 +3612,7 @@
     };
 
     // $ANTLR start rule
-    // src/main/resources/org/drools/lang/DRL.g:650:1: rule : rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:651:1: rule : rule_key rule_id ( extend_key rule_id )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( ^( extend_key rule_id ) )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk ) ;
     public final rule_return rule() throws RecognitionException {
         rule_return retval = new rule_return();
         retval.start = input.LT(1);
@@ -3622,35 +3623,40 @@
 
         rule_id_return rule_id69 = null;
 
-        decl_metadata_return decl_metadata70 = null;
+        extend_key_return extend_key70 = null;
 
-        rule_attributes_return rule_attributes71 = null;
+        rule_id_return rule_id71 = null;
 
-        when_part_return when_part72 = null;
+        decl_metadata_return decl_metadata72 = null;
 
-        rhs_chunk_return rhs_chunk73 = null;
+        rule_attributes_return rule_attributes73 = null;
 
+        when_part_return when_part74 = null;
 
-        RewriteRuleSubtreeStream stream_rule_key=new RewriteRuleSubtreeStream(adaptor,"rule rule_key");
+        rhs_chunk_return rhs_chunk75 = null;
+
+
         RewriteRuleSubtreeStream stream_rule_id=new RewriteRuleSubtreeStream(adaptor,"rule rule_id");
-        RewriteRuleSubtreeStream stream_when_part=new RewriteRuleSubtreeStream(adaptor,"rule when_part");
+        RewriteRuleSubtreeStream stream_rhs_chunk=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk");
         RewriteRuleSubtreeStream stream_rule_attributes=new RewriteRuleSubtreeStream(adaptor,"rule rule_attributes");
-        RewriteRuleSubtreeStream stream_rhs_chunk=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk");
+        RewriteRuleSubtreeStream stream_rule_key=new RewriteRuleSubtreeStream(adaptor,"rule rule_key");
+        RewriteRuleSubtreeStream stream_extend_key=new RewriteRuleSubtreeStream(adaptor,"rule extend_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 ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk ) )
-            // src/main/resources/org/drools/lang/DRL.g:654:2: rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk
+            // src/main/resources/org/drools/lang/DRL.g:654:2: ( rule_key rule_id ( extend_key rule_id )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( ^( extend_key rule_id ) )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:655:2: rule_key rule_id ( extend_key rule_id )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk
             {
             if ( backtracking==0 ) {
               	beginSentence(DroolsSentenceType.RULE);	
             }
-            pushFollow(FOLLOW_rule_key_in_rule1484);
+            pushFollow(FOLLOW_rule_key_in_rule1488);
             rule_key68=rule_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_rule_key.add(rule_key68.getTree());
-            pushFollow(FOLLOW_rule_id_in_rule1486);
+            pushFollow(FOLLOW_rule_id_in_rule1490);
             rule_id69=rule_id();
             _fsp--;
             if (failed) return retval;
@@ -3658,87 +3664,125 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:657:3: ( decl_metadata )*
-            loop28:
-            do {
-                int alt28=2;
-                int LA28_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:658:3: ( extend_key rule_id )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-                if ( (LA28_0==AT) ) {
+            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.EXTEND))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+                int LA28_1 = input.LA(2);
+
+                if ( (LA28_1==STRING) && (((validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.EXTEND))))) {
+                    int LA28_5 = input.LA(3);
+
+                    if ( ((validateIdentifierKey(DroolsSoftKeywords.EXTEND))) ) {
+                        alt28=1;
+                    }
+                }
+                else if ( (LA28_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.EXTEND)))) {
                     alt28=1;
                 }
+            }
+            switch (alt28) {
+                case 1 :
+                    // src/main/resources/org/drools/lang/DRL.g:658:4: extend_key rule_id
+                    {
+                    pushFollow(FOLLOW_extend_key_in_rule1499);
+                    extend_key70=extend_key();
+                    _fsp--;
+                    if (failed) return retval;
+                    if ( backtracking==0 ) stream_extend_key.add(extend_key70.getTree());
+                    pushFollow(FOLLOW_rule_id_in_rule1501);
+                    rule_id71=rule_id();
+                    _fsp--;
+                    if (failed) return retval;
+                    if ( backtracking==0 ) stream_rule_id.add(rule_id71.getTree());
 
+                    }
+                    break;
 
-                switch (alt28) {
+            }
+
+            // src/main/resources/org/drools/lang/DRL.g:658:25: ( decl_metadata )*
+            loop29:
+            do {
+                int alt29=2;
+                int LA29_0 = input.LA(1);
+
+                if ( (LA29_0==AT) ) {
+                    alt29=1;
+                }
+
+
+                switch (alt29) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:657:3: decl_metadata
+            	    // src/main/resources/org/drools/lang/DRL.g:658:25: decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_rule1494);
-            	    decl_metadata70=decl_metadata();
+            	    pushFollow(FOLLOW_decl_metadata_in_rule1505);
+            	    decl_metadata72=decl_metadata();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_decl_metadata.add(decl_metadata70.getTree());
+            	    if ( backtracking==0 ) stream_decl_metadata.add(decl_metadata72.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop28;
+            	    break loop29;
                 }
             } while (true);
 
-            // src/main/resources/org/drools/lang/DRL.g:657:18: ( rule_attributes )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:658:40: ( rule_attributes )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA29_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.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
-                alt29=1;
+            if ( (LA30_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.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(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))))) {
+                alt30=1;
             }
-            switch (alt29) {
+            switch (alt30) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:657:18: rule_attributes
+                    // src/main/resources/org/drools/lang/DRL.g:658:40: rule_attributes
                     {
-                    pushFollow(FOLLOW_rule_attributes_in_rule1497);
-                    rule_attributes71=rule_attributes();
+                    pushFollow(FOLLOW_rule_attributes_in_rule1508);
+                    rule_attributes73=rule_attributes();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_rule_attributes.add(rule_attributes71.getTree());
+                    if ( backtracking==0 ) stream_rule_attributes.add(rule_attributes73.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:657:35: ( when_part )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:658:57: ( when_part )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA30_0==WHEN) ) {
-                alt30=1;
+            if ( (LA31_0==WHEN) ) {
+                alt31=1;
             }
-            switch (alt30) {
+            switch (alt31) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:657:35: when_part
+                    // src/main/resources/org/drools/lang/DRL.g:658:57: when_part
                     {
-                    pushFollow(FOLLOW_when_part_in_rule1500);
-                    when_part72=when_part();
+                    pushFollow(FOLLOW_when_part_in_rule1511);
+                    when_part74=when_part();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_when_part.add(when_part72.getTree());
+                    if ( backtracking==0 ) stream_when_part.add(when_part74.getTree());
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule1503);
-            rhs_chunk73=rhs_chunk();
+            pushFollow(FOLLOW_rhs_chunk_in_rule1514);
+            rhs_chunk75=rhs_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rhs_chunk.add(rhs_chunk73.getTree());
+            if ( backtracking==0 ) stream_rhs_chunk.add(rhs_chunk75.getTree());
 
             // AST REWRITE
-            // elements: decl_metadata, rhs_chunk, rule_attributes, rule_id, rule_key, when_part
+            // elements: decl_metadata, rule_attributes, rhs_chunk, when_part, rule_id, rule_id, extend_key, rule_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3748,27 +3792,42 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 658:3: -> ^( rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk )
+            // 659:3: -> ^( rule_key rule_id ( ^( extend_key rule_id ) )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:658:6: ^( rule_key rule_id ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:659:6: ^( rule_key rule_id ( ^( extend_key rule_id ) )? ( decl_metadata )* ( rule_attributes )? ( when_part )? rhs_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_rule_key.nextNode(), root_1);
 
                 adaptor.addChild(root_1, stream_rule_id.next());
-                // src/main/resources/org/drools/lang/DRL.g:658:25: ( decl_metadata )*
+                // src/main/resources/org/drools/lang/DRL.g:659:25: ( ^( extend_key rule_id ) )?
+                if ( stream_rule_id.hasNext()||stream_extend_key.hasNext() ) {
+                    // src/main/resources/org/drools/lang/DRL.g:659:25: ^( extend_key rule_id )
+                    {
+                    Object root_2 = (Object)adaptor.nil();
+                    root_2 = (Object)adaptor.becomeRoot(stream_extend_key.nextNode(), root_2);
+
+                    adaptor.addChild(root_2, stream_rule_id.next());
+
+                    adaptor.addChild(root_1, root_2);
+                    }
+
+                }
+                stream_rule_id.reset();
+                stream_extend_key.reset();
+                // src/main/resources/org/drools/lang/DRL.g:659:48: ( decl_metadata )*
                 while ( stream_decl_metadata.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_metadata.next());
 
                 }
                 stream_decl_metadata.reset();
-                // src/main/resources/org/drools/lang/DRL.g:658:40: ( rule_attributes )?
+                // src/main/resources/org/drools/lang/DRL.g:659:63: ( rule_attributes )?
                 if ( stream_rule_attributes.hasNext() ) {
                     adaptor.addChild(root_1, stream_rule_attributes.next());
 
                 }
                 stream_rule_attributes.reset();
-                // src/main/resources/org/drools/lang/DRL.g:658:57: ( when_part )?
+                // src/main/resources/org/drools/lang/DRL.g:659:80: ( when_part )?
                 if ( stream_when_part.hasNext() ) {
                     adaptor.addChild(root_1, stream_when_part.next());
 
@@ -3811,48 +3870,48 @@
     };
 
     // $ANTLR start when_part
-    // src/main/resources/org/drools/lang/DRL.g:661:1: when_part : WHEN ( COLON )? normal_lhs_block -> WHEN normal_lhs_block ;
+    // src/main/resources/org/drools/lang/DRL.g:662:1: when_part : WHEN ( COLON )? normal_lhs_block -> WHEN normal_lhs_block ;
     public final when_part_return when_part() throws RecognitionException {
         when_part_return retval = new when_part_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token WHEN74=null;
-        Token COLON75=null;
-        normal_lhs_block_return normal_lhs_block76 = null;
+        Token WHEN76=null;
+        Token COLON77=null;
+        normal_lhs_block_return normal_lhs_block78 = null;
 
 
-        Object WHEN74_tree=null;
-        Object COLON75_tree=null;
+        Object WHEN76_tree=null;
+        Object COLON77_tree=null;
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_WHEN=new RewriteRuleTokenStream(adaptor,"token WHEN");
         RewriteRuleSubtreeStream stream_normal_lhs_block=new RewriteRuleSubtreeStream(adaptor,"rule normal_lhs_block");
         try {
-            // src/main/resources/org/drools/lang/DRL.g:662:2: ( WHEN ( COLON )? normal_lhs_block -> WHEN normal_lhs_block )
-            // src/main/resources/org/drools/lang/DRL.g:662:5: WHEN ( COLON )? normal_lhs_block
+            // src/main/resources/org/drools/lang/DRL.g:663:2: ( WHEN ( COLON )? normal_lhs_block -> WHEN normal_lhs_block )
+            // src/main/resources/org/drools/lang/DRL.g:663:5: WHEN ( COLON )? normal_lhs_block
             {
-            WHEN74=(Token)input.LT(1);
-            match(input,WHEN,FOLLOW_WHEN_in_when_part1536); if (failed) return retval;
-            if ( backtracking==0 ) stream_WHEN.add(WHEN74);
+            WHEN76=(Token)input.LT(1);
+            match(input,WHEN,FOLLOW_WHEN_in_when_part1554); if (failed) return retval;
+            if ( backtracking==0 ) stream_WHEN.add(WHEN76);
 
             if ( backtracking==0 ) {
-              	emit(WHEN74, DroolsEditorType.KEYWORD);	
+              	emit(WHEN76, DroolsEditorType.KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:663:3: ( COLON )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:664:3: ( COLON )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA31_0==COLON) ) {
-                alt31=1;
+            if ( (LA32_0==COLON) ) {
+                alt32=1;
             }
-            switch (alt31) {
+            switch (alt32) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:663:3: COLON
+                    // src/main/resources/org/drools/lang/DRL.g:664:3: COLON
                     {
-                    COLON75=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_when_part1542); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COLON.add(COLON75);
+                    COLON77=(Token)input.LT(1);
+                    match(input,COLON,FOLLOW_COLON_in_when_part1560); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COLON.add(COLON77);
 
 
                     }
@@ -3861,19 +3920,19 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(COLON75, DroolsEditorType.SYMBOL);	
+              	emit(COLON77, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
-            pushFollow(FOLLOW_normal_lhs_block_in_when_part1552);
-            normal_lhs_block76=normal_lhs_block();
+            pushFollow(FOLLOW_normal_lhs_block_in_when_part1570);
+            normal_lhs_block78=normal_lhs_block();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block76.getTree());
+            if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block78.getTree());
 
             // AST REWRITE
-            // elements: WHEN, normal_lhs_block
+            // elements: normal_lhs_block, WHEN
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3883,7 +3942,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 666:2: -> WHEN normal_lhs_block
+            // 667:2: -> WHEN normal_lhs_block
             {
                 adaptor.addChild(root_0, stream_WHEN.next());
                 adaptor.addChild(root_0, stream_normal_lhs_block.next());
@@ -3917,7 +3976,7 @@
     };
 
     // $ANTLR start rule_id
-    // src/main/resources/org/drools/lang/DRL.g:669:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );
+    // src/main/resources/org/drools/lang/DRL.g:670:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );
     public final rule_id_return rule_id() throws RecognitionException {
         rule_id_return retval = new rule_id_return();
         retval.start = input.LT(1);
@@ -3927,33 +3986,33 @@
         Token id=null;
 
         Object id_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:670:2: (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] )
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:671:2: (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] )
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA32_0==ID) ) {
-                alt32=1;
+            if ( (LA33_0==ID) ) {
+                alt33=1;
             }
-            else if ( (LA32_0==STRING) ) {
-                alt32=2;
+            else if ( (LA33_0==STRING) ) {
+                alt33=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("669:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );", 32, 0, input);
+                    new NoViableAltException("670:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );", 33, 0, input);
 
                 throw nvae;
             }
-            switch (alt32) {
+            switch (alt33) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:670:5: id= ID
+                    // src/main/resources/org/drools/lang/DRL.g:671:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_rule_id1573); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_rule_id1591); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
@@ -3972,7 +4031,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 672:64: -> VT_RULE_ID[$id]
+                    // 673:64: -> VT_RULE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_RULE_ID, id));
 
@@ -3983,10 +4042,10 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:673:5: id= STRING
+                    // src/main/resources/org/drools/lang/DRL.g:674:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_id1589); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_rule_id1607); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
@@ -4005,7 +4064,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 675:64: -> VT_RULE_ID[$id]
+                    // 676:64: -> VT_RULE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_RULE_ID, id));
 
@@ -4040,58 +4099,58 @@
     };
 
     // $ANTLR start rule_attributes
-    // src/main/resources/org/drools/lang/DRL.g:678:1: rule_attributes : ( 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:1: rule_attributes : ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )* -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ ) ;
     public final rule_attributes_return rule_attributes() throws RecognitionException {
         rule_attributes_return retval = new rule_attributes_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token COLON78=null;
-        Token COMMA80=null;
+        Token COLON80=null;
+        Token COMMA82=null;
         rule_attribute_return attr = null;
 
-        attributes_key_return attributes_key77 = null;
+        attributes_key_return attributes_key79 = null;
 
-        rule_attribute_return rule_attribute79 = null;
+        rule_attribute_return rule_attribute81 = null;
 
 
-        Object COLON78_tree=null;
-        Object COMMA80_tree=null;
+        Object COLON80_tree=null;
+        Object COMMA82_tree=null;
+        RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
-        RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
+        RewriteRuleSubtreeStream stream_rule_attribute=new RewriteRuleSubtreeStream(adaptor,"rule rule_attribute");
         RewriteRuleSubtreeStream stream_attributes_key=new RewriteRuleSubtreeStream(adaptor,"rule attributes_key");
-        RewriteRuleSubtreeStream stream_rule_attribute=new RewriteRuleSubtreeStream(adaptor,"rule rule_attribute");
         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 )*
+            // src/main/resources/org/drools/lang/DRL.g:680: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:680:4: ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )*
             {
-            // src/main/resources/org/drools/lang/DRL.g:679:4: ( attributes_key COLON )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:680:4: ( attributes_key COLON )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            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 ( (LA34_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))))) {
+                int LA34_1 = input.LA(2);
 
-                if ( (LA33_1==COLON) && ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES)))) {
-                    alt33=1;
+                if ( (LA34_1==COLON) && ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES)))) {
+                    alt34=1;
                 }
             }
-            switch (alt33) {
+            switch (alt34) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:679:6: attributes_key COLON
+                    // src/main/resources/org/drools/lang/DRL.g:680:6: attributes_key COLON
                     {
-                    pushFollow(FOLLOW_attributes_key_in_rule_attributes1610);
-                    attributes_key77=attributes_key();
+                    pushFollow(FOLLOW_attributes_key_in_rule_attributes1628);
+                    attributes_key79=attributes_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_attributes_key.add(attributes_key77.getTree());
-                    COLON78=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_rule_attributes1612); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COLON.add(COLON78);
+                    if ( backtracking==0 ) stream_attributes_key.add(attributes_key79.getTree());
+                    COLON80=(Token)input.LT(1);
+                    match(input,COLON,FOLLOW_COLON_in_rule_attributes1630); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COLON.add(COLON80);
 
                     if ( backtracking==0 ) {
-                      	emit(COLON78, DroolsEditorType.SYMBOL);	
+                      	emit(COLON80, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -4099,43 +4158,43 @@
 
             }
 
-            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1622);
-            rule_attribute79=rule_attribute();
+            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1640);
+            rule_attribute81=rule_attribute();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rule_attribute.add(rule_attribute79.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:680:18: ( ( COMMA )? attr= rule_attribute )*
-            loop35:
+            if ( backtracking==0 ) stream_rule_attribute.add(rule_attribute81.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:681:18: ( ( COMMA )? attr= rule_attribute )*
+            loop36:
             do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
+                int alt36=2;
+                int LA36_0 = input.LA(1);
 
-                if ( (LA35_0==COMMA) ) {
-                    alt35=1;
+                if ( (LA36_0==COMMA) ) {
+                    alt36=1;
                 }
-                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;
+                else if ( (LA36_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.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(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))))) {
+                    alt36=1;
                 }
 
 
-                switch (alt35) {
+                switch (alt36) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:680:20: ( COMMA )? attr= rule_attribute
+            	    // src/main/resources/org/drools/lang/DRL.g:681:20: ( COMMA )? attr= rule_attribute
             	    {
-            	    // src/main/resources/org/drools/lang/DRL.g:680:20: ( COMMA )?
-            	    int alt34=2;
-            	    int LA34_0 = input.LA(1);
+            	    // src/main/resources/org/drools/lang/DRL.g:681:20: ( COMMA )?
+            	    int alt35=2;
+            	    int LA35_0 = input.LA(1);
 
-            	    if ( (LA34_0==COMMA) ) {
-            	        alt34=1;
+            	    if ( (LA35_0==COMMA) ) {
+            	        alt35=1;
             	    }
-            	    switch (alt34) {
+            	    switch (alt35) {
             	        case 1 :
-            	            // src/main/resources/org/drools/lang/DRL.g:680:20: COMMA
+            	            // src/main/resources/org/drools/lang/DRL.g:681:20: COMMA
             	            {
-            	            COMMA80=(Token)input.LT(1);
-            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1626); if (failed) return retval;
-            	            if ( backtracking==0 ) stream_COMMA.add(COMMA80);
+            	            COMMA82=(Token)input.LT(1);
+            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1644); if (failed) return retval;
+            	            if ( backtracking==0 ) stream_COMMA.add(COMMA82);
 
 
             	            }
@@ -4144,9 +4203,9 @@
             	    }
 
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA80, DroolsEditorType.SYMBOL);	
+            	      	emit(COMMA82, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1633);
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1651);
             	    attr=rule_attribute();
             	    _fsp--;
             	    if (failed) return retval;
@@ -4156,7 +4215,7 @@
             	    break;
 
             	default :
-            	    break loop35;
+            	    break loop36;
                 }
             } while (true);
 
@@ -4172,14 +4231,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 681:3: -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
+            // 682:3: -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
             {
-                // src/main/resources/org/drools/lang/DRL.g:681:6: ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
+                // src/main/resources/org/drools/lang/DRL.g:682:6: ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_RULE_ATTRIBUTES, "VT_RULE_ATTRIBUTES"), root_1);
 
-                // src/main/resources/org/drools/lang/DRL.g:681:27: ( attributes_key )?
+                // src/main/resources/org/drools/lang/DRL.g:682:27: ( attributes_key )?
                 if ( stream_attributes_key.hasNext() ) {
                     adaptor.addChild(root_1, stream_attributes_key.next());
 
@@ -4226,198 +4285,198 @@
     };
 
     // $ANTLR start rule_attribute
-    // src/main/resources/org/drools/lang/DRL.g: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 );
+    // src/main/resources/org/drools/lang/DRL.g:685: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 final rule_attribute_return rule_attribute() throws RecognitionException {
         rule_attribute_return retval = new rule_attribute_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        salience_return salience81 = null;
+        salience_return salience83 = null;
 
-        no_loop_return no_loop82 = null;
+        no_loop_return no_loop84 = null;
 
-        agenda_group_return agenda_group83 = null;
+        agenda_group_return agenda_group85 = null;
 
-        duration_return duration84 = null;
+        duration_return duration86 = null;
 
-        activation_group_return activation_group85 = null;
+        activation_group_return activation_group87 = null;
 
-        auto_focus_return auto_focus86 = null;
+        auto_focus_return auto_focus88 = null;
 
-        date_effective_return date_effective87 = null;
+        date_effective_return date_effective89 = null;
 
-        date_expires_return date_expires88 = null;
+        date_expires_return date_expires90 = null;
 
-        enabled_return enabled89 = null;
+        enabled_return enabled91 = null;
 
-        ruleflow_group_return ruleflow_group90 = null;
+        ruleflow_group_return ruleflow_group92 = null;
 
-        lock_on_active_return lock_on_active91 = null;
+        lock_on_active_return lock_on_active93 = null;
 
-        dialect_return dialect92 = null;
+        dialect_return dialect94 = null;
 
 
 
          boolean isFailed = true; pushParaphrases(DroolsParaphraseTypes.RULE_ATTRIBUTE); 
         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;
-            alt36 = dfa36.predict(input);
-            switch (alt36) {
+            // src/main/resources/org/drools/lang/DRL.g:688:2: ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect )
+            int alt37=12;
+            alt37 = dfa37.predict(input);
+            switch (alt37) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:687:4: salience
+                    // src/main/resources/org/drools/lang/DRL.g:688:4: salience
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_salience_in_rule_attribute1672);
-                    salience81=salience();
+                    pushFollow(FOLLOW_salience_in_rule_attribute1690);
+                    salience83=salience();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, salience81.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, salience83.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:688:4: no_loop
+                    // src/main/resources/org/drools/lang/DRL.g:689:4: no_loop
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute1678);
-                    no_loop82=no_loop();
+                    pushFollow(FOLLOW_no_loop_in_rule_attribute1696);
+                    no_loop84=no_loop();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, no_loop82.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, no_loop84.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:689:4: agenda_group
+                    // src/main/resources/org/drools/lang/DRL.g:690:4: agenda_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1683);
-                    agenda_group83=agenda_group();
+                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1701);
+                    agenda_group85=agenda_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, agenda_group83.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, agenda_group85.getTree());
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:690:4: duration
+                    // src/main/resources/org/drools/lang/DRL.g:691:4: duration
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_duration_in_rule_attribute1690);
-                    duration84=duration();
+                    pushFollow(FOLLOW_duration_in_rule_attribute1708);
+                    duration86=duration();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, duration84.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, duration86.getTree());
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:691:4: activation_group
+                    // src/main/resources/org/drools/lang/DRL.g:692:4: activation_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute1697);
-                    activation_group85=activation_group();
+                    pushFollow(FOLLOW_activation_group_in_rule_attribute1715);
+                    activation_group87=activation_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, activation_group85.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, activation_group87.getTree());
 
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:692:4: auto_focus
+                    // src/main/resources/org/drools/lang/DRL.g:693:4: auto_focus
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1703);
-                    auto_focus86=auto_focus();
+                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1721);
+                    auto_focus88=auto_focus();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, auto_focus86.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, auto_focus88.getTree());
 
                     }
                     break;
                 case 7 :
-                    // src/main/resources/org/drools/lang/DRL.g:693:4: date_effective
+                    // src/main/resources/org/drools/lang/DRL.g:694:4: date_effective
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1709);
-                    date_effective87=date_effective();
+                    pushFollow(FOLLOW_date_effective_in_rule_attribute1727);
+                    date_effective89=date_effective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, date_effective87.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, date_effective89.getTree());
 
                     }
                     break;
                 case 8 :
-                    // src/main/resources/org/drools/lang/DRL.g:694:4: date_expires
+                    // src/main/resources/org/drools/lang/DRL.g:695:4: date_expires
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1715);
-                    date_expires88=date_expires();
+                    pushFollow(FOLLOW_date_expires_in_rule_attribute1733);
+                    date_expires90=date_expires();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, date_expires88.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, date_expires90.getTree());
 
                     }
                     break;
                 case 9 :
-                    // src/main/resources/org/drools/lang/DRL.g:695:4: enabled
+                    // src/main/resources/org/drools/lang/DRL.g:696:4: enabled
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1721);
-                    enabled89=enabled();
+                    pushFollow(FOLLOW_enabled_in_rule_attribute1739);
+                    enabled91=enabled();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, enabled89.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, enabled91.getTree());
 
                     }
                     break;
                 case 10 :
-                    // src/main/resources/org/drools/lang/DRL.g:696:4: ruleflow_group
+                    // src/main/resources/org/drools/lang/DRL.g:697:4: ruleflow_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1727);
-                    ruleflow_group90=ruleflow_group();
+                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1745);
+                    ruleflow_group92=ruleflow_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, ruleflow_group90.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, ruleflow_group92.getTree());
 
                     }
                     break;
                 case 11 :
-                    // src/main/resources/org/drools/lang/DRL.g:697:4: lock_on_active
+                    // src/main/resources/org/drools/lang/DRL.g:698:4: lock_on_active
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1733);
-                    lock_on_active91=lock_on_active();
+                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1751);
+                    lock_on_active93=lock_on_active();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lock_on_active91.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lock_on_active93.getTree());
 
                     }
                     break;
                 case 12 :
-                    // src/main/resources/org/drools/lang/DRL.g:698:4: dialect
+                    // src/main/resources/org/drools/lang/DRL.g:699:4: dialect
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_dialect_in_rule_attribute1738);
-                    dialect92=dialect();
+                    pushFollow(FOLLOW_dialect_in_rule_attribute1756);
+                    dialect94=dialect();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, dialect92.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, dialect94.getTree());
 
                     }
                     break;
@@ -4438,7 +4497,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 && 
@@ -4491,41 +4550,41 @@
     };
 
     // $ANTLR start date_effective
-    // src/main/resources/org/drools/lang/DRL.g:743:1: date_effective : date_effective_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:744:1: date_effective : date_effective_key STRING ;
     public final date_effective_return date_effective() throws RecognitionException {
         date_effective_return retval = new date_effective_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING94=null;
-        date_effective_key_return date_effective_key93 = null;
+        Token STRING96=null;
+        date_effective_key_return date_effective_key95 = null;
 
 
-        Object STRING94_tree=null;
+        Object STRING96_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:744:2: ( date_effective_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:744:4: date_effective_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:745:2: ( date_effective_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:745:4: date_effective_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_date_effective_key_in_date_effective1754);
-            date_effective_key93=date_effective_key();
+            pushFollow(FOLLOW_date_effective_key_in_date_effective1772);
+            date_effective_key95=date_effective_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_effective_key93.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_effective_key95.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING94=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1759); if (failed) return retval;
+            STRING96=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_date_effective1777); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING94_tree = (Object)adaptor.create(STRING94);
-            adaptor.addChild(root_0, STRING94_tree);
+            STRING96_tree = (Object)adaptor.create(STRING96);
+            adaptor.addChild(root_0, STRING96_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING94, DroolsEditorType.STRING_CONST );	
+              	emit(STRING96, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -4553,41 +4612,41 @@
     };
 
     // $ANTLR start date_expires
-    // src/main/resources/org/drools/lang/DRL.g:748:1: date_expires : date_expires_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:749:1: date_expires : date_expires_key STRING ;
     public final date_expires_return date_expires() throws RecognitionException {
         date_expires_return retval = new date_expires_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token STRING96=null;
-        date_expires_key_return date_expires_key95 = null;
+        Token STRING98=null;
+        date_expires_key_return date_expires_key97 = null;
 
 
-        Object STRING96_tree=null;
+        Object STRING98_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:749:2: ( date_expires_key STRING )
-            // src/main/resources/org/drools/lang/DRL.g:749:4: date_expires_key STRING
+            // src/main/resources/org/drools/lang/DRL.g:750:2: ( date_expires_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:750:4: date_expires_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_date_expires_key_in_date_expires1773);
-            date_expires_key95=date_expires_key();
+            pushFollow(FOLLOW_date_expires_key_in_date_expires1791);
+            date_expires_key97=date_expires_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_expires_key95.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_expires_key97.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING96=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1778); if (failed) return retval;
+            STRING98=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_date_expires1796); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING96_tree = (Object)adaptor.create(STRING96);
-            adaptor.addChild(root_0, STRING96_tree);
+            STRING98_tree = (Object)adaptor.create(STRING98);
+            adaptor.addChild(root_0, STRING98_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING96, DroolsEditorType.STRING_CONST );	
+              	emit(STRING98, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -4615,76 +4674,76 @@
     };
 
     // $ANTLR start enabled
-    // src/main/resources/org/drools/lang/DRL.g:753:1: enabled : enabled_key ( BOOL | paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:754: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);
 
         Object root_0 = null;
 
-        Token BOOL98=null;
-        enabled_key_return enabled_key97 = null;
+        Token BOOL100=null;
+        enabled_key_return enabled_key99 = null;
 
-        paren_chunk_return paren_chunk99 = null;
+        paren_chunk_return paren_chunk101 = null;
 
 
-        Object BOOL98_tree=null;
+        Object BOOL100_tree=null;
 
         try {
-            // 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 )
+            // src/main/resources/org/drools/lang/DRL.g:755:2: ( enabled_key ( BOOL | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:755:4: enabled_key ( BOOL | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_enabled_key_in_enabled1793);
-            enabled_key97=enabled_key();
+            pushFollow(FOLLOW_enabled_key_in_enabled1811);
+            enabled_key99=enabled_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(enabled_key97.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(enabled_key99.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:755:6: ( BOOL | paren_chunk )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:756:6: ( BOOL | paren_chunk )
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA37_0==BOOL) ) {
-                alt37=1;
+            if ( (LA38_0==BOOL) ) {
+                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("755:6: ( BOOL | paren_chunk )", 37, 0, input);
+                    new NoViableAltException("756:6: ( BOOL | paren_chunk )", 38, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt38) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:755:8: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:756:8: BOOL
                     {
-                    BOOL98=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_enabled1806); if (failed) return retval;
+                    BOOL100=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_enabled1824); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL98_tree = (Object)adaptor.create(BOOL98);
-                    adaptor.addChild(root_0, BOOL98_tree);
+                    BOOL100_tree = (Object)adaptor.create(BOOL100);
+                    adaptor.addChild(root_0, BOOL100_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(BOOL98, DroolsEditorType.BOOLEAN_CONST );	
+                      	emit(BOOL100, DroolsEditorType.BOOLEAN_CONST );	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:756:8: paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:757:8: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_enabled1817);
-                    paren_chunk99=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_enabled1835);
+                    paren_chunk101=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk99.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk101.getTree());
 
                     }
                     break;
@@ -4717,76 +4776,76 @@
     };
 
     // $ANTLR start salience
-    // src/main/resources/org/drools/lang/DRL.g:760:1: salience : salience_key ( INT | paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:761: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 INT101=null;
-        salience_key_return salience_key100 = null;
+        Token INT103=null;
+        salience_key_return salience_key102 = null;
 
-        paren_chunk_return paren_chunk102 = null;
+        paren_chunk_return paren_chunk104 = null;
 
 
-        Object INT101_tree=null;
+        Object INT103_tree=null;
 
         try {
-            // 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 )
+            // src/main/resources/org/drools/lang/DRL.g:762:2: ( salience_key ( INT | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:762:4: salience_key ( INT | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_salience_key_in_salience1837);
-            salience_key100=salience_key();
+            pushFollow(FOLLOW_salience_key_in_salience1855);
+            salience_key102=salience_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key100.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key102.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:762:3: ( INT | paren_chunk )
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:763:3: ( INT | paren_chunk )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA38_0==INT) ) {
-                alt38=1;
+            if ( (LA39_0==INT) ) {
+                alt39=1;
             }
-            else if ( (LA38_0==LEFT_PAREN) ) {
-                alt38=2;
+            else if ( (LA39_0==LEFT_PAREN) ) {
+                alt39=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("762:3: ( INT | paren_chunk )", 38, 0, input);
+                    new NoViableAltException("763:3: ( INT | paren_chunk )", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt38) {
+            switch (alt39) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:762:5: INT
+                    // src/main/resources/org/drools/lang/DRL.g:763:5: INT
                     {
-                    INT101=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1846); if (failed) return retval;
+                    INT103=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_salience1864); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    INT101_tree = (Object)adaptor.create(INT101);
-                    adaptor.addChild(root_0, INT101_tree);
+                    INT103_tree = (Object)adaptor.create(INT103);
+                    adaptor.addChild(root_0, INT103_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(INT101, DroolsEditorType.NUMERIC_CONST );	
+                      	emit(INT103, DroolsEditorType.NUMERIC_CONST );	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:763:5: paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:764:5: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1855);
-                    paren_chunk102=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_salience1873);
+                    paren_chunk104=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk102.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk104.getTree());
 
                     }
                     break;
@@ -4819,49 +4878,49 @@
     };
 
     // $ANTLR start no_loop
-    // src/main/resources/org/drools/lang/DRL.g:767:1: no_loop : no_loop_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:768: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 BOOL104=null;
-        no_loop_key_return no_loop_key103 = null;
+        Token BOOL106=null;
+        no_loop_key_return no_loop_key105 = null;
 
 
-        Object BOOL104_tree=null;
+        Object BOOL106_tree=null;
 
         try {
-            // 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 )?
+            // src/main/resources/org/drools/lang/DRL.g:769:2: ( no_loop_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:769:4: no_loop_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_no_loop_key_in_no_loop1870);
-            no_loop_key103=no_loop_key();
+            pushFollow(FOLLOW_no_loop_key_in_no_loop1888);
+            no_loop_key105=no_loop_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key103.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key105.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:768:66: ( BOOL )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:769:66: ( 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:768:66: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:769:66: BOOL
                     {
-                    BOOL104=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1875); if (failed) return retval;
+                    BOOL106=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1893); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL104_tree = (Object)adaptor.create(BOOL104);
-                    adaptor.addChild(root_0, BOOL104_tree);
+                    BOOL106_tree = (Object)adaptor.create(BOOL106);
+                    adaptor.addChild(root_0, BOOL106_tree);
                     }
 
                     }
@@ -4870,7 +4929,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL104, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL106, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -4898,49 +4957,49 @@
     };
 
     // $ANTLR start auto_focus
-    // src/main/resources/org/drools/lang/DRL.g:772:1: auto_focus : auto_focus_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:773: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 BOOL106=null;
-        auto_focus_key_return auto_focus_key105 = null;
+        Token BOOL108=null;
+        auto_focus_key_return auto_focus_key107 = null;
 
 
-        Object BOOL106_tree=null;
+        Object BOOL108_tree=null;
 
         try {
-            // 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 )?
+            // src/main/resources/org/drools/lang/DRL.g:774:2: ( auto_focus_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:774:4: auto_focus_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1890);
-            auto_focus_key105=auto_focus_key();
+            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1908);
+            auto_focus_key107=auto_focus_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key105.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key107.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:773:69: ( BOOL )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:774:69: ( 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:773:69: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:774:69: BOOL
                     {
-                    BOOL106=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1895); if (failed) return retval;
+                    BOOL108=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1913); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL106_tree = (Object)adaptor.create(BOOL106);
-                    adaptor.addChild(root_0, BOOL106_tree);
+                    BOOL108_tree = (Object)adaptor.create(BOOL108);
+                    adaptor.addChild(root_0, BOOL108_tree);
                     }
 
                     }
@@ -4949,7 +5008,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL106, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL108, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -4977,41 +5036,41 @@
     };
 
     // $ANTLR start activation_group
-    // src/main/resources/org/drools/lang/DRL.g:777:1: activation_group : activation_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:778: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 STRING108=null;
-        activation_group_key_return activation_group_key107 = null;
+        Token STRING110=null;
+        activation_group_key_return activation_group_key109 = null;
 
 
-        Object STRING108_tree=null;
+        Object STRING110_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:779:2: ( activation_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:779:4: activation_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_activation_group_key_in_activation_group1912);
-            activation_group_key107=activation_group_key();
+            pushFollow(FOLLOW_activation_group_key_in_activation_group1930);
+            activation_group_key109=activation_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key107.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key109.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING108=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1917); if (failed) return retval;
+            STRING110=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_activation_group1935); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING108_tree = (Object)adaptor.create(STRING108);
-            adaptor.addChild(root_0, STRING108_tree);
+            STRING110_tree = (Object)adaptor.create(STRING110);
+            adaptor.addChild(root_0, STRING110_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING108, DroolsEditorType.STRING_CONST );	
+              	emit(STRING110, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5039,41 +5098,41 @@
     };
 
     // $ANTLR start ruleflow_group
-    // src/main/resources/org/drools/lang/DRL.g:782:1: ruleflow_group : ruleflow_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:783: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 STRING110=null;
-        ruleflow_group_key_return ruleflow_group_key109 = null;
+        Token STRING112=null;
+        ruleflow_group_key_return ruleflow_group_key111 = null;
 
 
-        Object STRING110_tree=null;
+        Object STRING112_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:784:2: ( ruleflow_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:784:4: ruleflow_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1931);
-            ruleflow_group_key109=ruleflow_group_key();
+            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1949);
+            ruleflow_group_key111=ruleflow_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key109.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key111.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING110=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1936); if (failed) return retval;
+            STRING112=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1954); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING110_tree = (Object)adaptor.create(STRING110);
-            adaptor.addChild(root_0, STRING110_tree);
+            STRING112_tree = (Object)adaptor.create(STRING112);
+            adaptor.addChild(root_0, STRING112_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING110, DroolsEditorType.STRING_CONST );	
+              	emit(STRING112, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5101,41 +5160,41 @@
     };
 
     // $ANTLR start agenda_group
-    // src/main/resources/org/drools/lang/DRL.g:787:1: agenda_group : agenda_group_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:788: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 STRING112=null;
-        agenda_group_key_return agenda_group_key111 = null;
+        Token STRING114=null;
+        agenda_group_key_return agenda_group_key113 = null;
 
 
-        Object STRING112_tree=null;
+        Object STRING114_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:789:2: ( agenda_group_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:789:4: agenda_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1950);
-            agenda_group_key111=agenda_group_key();
+            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1968);
+            agenda_group_key113=agenda_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key111.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key113.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING112=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1955); if (failed) return retval;
+            STRING114=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1973); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING112_tree = (Object)adaptor.create(STRING112);
-            adaptor.addChild(root_0, STRING112_tree);
+            STRING114_tree = (Object)adaptor.create(STRING114);
+            adaptor.addChild(root_0, STRING114_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING112, DroolsEditorType.STRING_CONST );	
+              	emit(STRING114, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5163,41 +5222,41 @@
     };
 
     // $ANTLR start duration
-    // src/main/resources/org/drools/lang/DRL.g:792:1: duration : duration_key INT ;
+    // src/main/resources/org/drools/lang/DRL.g:793: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 INT114=null;
-        duration_key_return duration_key113 = null;
+        Token INT116=null;
+        duration_key_return duration_key115 = null;
 
 
-        Object INT114_tree=null;
+        Object INT116_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:794:2: ( duration_key INT )
+            // src/main/resources/org/drools/lang/DRL.g:794:4: duration_key INT
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_duration_key_in_duration1969);
-            duration_key113=duration_key();
+            pushFollow(FOLLOW_duration_key_in_duration1987);
+            duration_key115=duration_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key113.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key115.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            INT114=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1974); if (failed) return retval;
+            INT116=(Token)input.LT(1);
+            match(input,INT,FOLLOW_INT_in_duration1992); if (failed) return retval;
             if ( backtracking==0 ) {
-            INT114_tree = (Object)adaptor.create(INT114);
-            adaptor.addChild(root_0, INT114_tree);
+            INT116_tree = (Object)adaptor.create(INT116);
+            adaptor.addChild(root_0, INT116_tree);
             }
             if ( backtracking==0 ) {
-              	emit(INT114, DroolsEditorType.NUMERIC_CONST );	
+              	emit(INT116, DroolsEditorType.NUMERIC_CONST );	
             }
 
             }
@@ -5225,41 +5284,41 @@
     };
 
     // $ANTLR start dialect
-    // src/main/resources/org/drools/lang/DRL.g:797:1: dialect : dialect_key STRING ;
+    // src/main/resources/org/drools/lang/DRL.g:798: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 STRING116=null;
-        dialect_key_return dialect_key115 = null;
+        Token STRING118=null;
+        dialect_key_return dialect_key117 = null;
 
 
-        Object STRING116_tree=null;
+        Object STRING118_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:799:2: ( dialect_key STRING )
+            // src/main/resources/org/drools/lang/DRL.g:799:4: dialect_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_dialect_key_in_dialect1990);
-            dialect_key115=dialect_key();
+            pushFollow(FOLLOW_dialect_key_in_dialect2008);
+            dialect_key117=dialect_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key115.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key117.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            STRING116=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1995); if (failed) return retval;
+            STRING118=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_dialect2013); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING116_tree = (Object)adaptor.create(STRING116);
-            adaptor.addChild(root_0, STRING116_tree);
+            STRING118_tree = (Object)adaptor.create(STRING118);
+            adaptor.addChild(root_0, STRING118_tree);
             }
             if ( backtracking==0 ) {
-              	emit(STRING116, DroolsEditorType.STRING_CONST );	
+              	emit(STRING118, DroolsEditorType.STRING_CONST );	
             }
 
             }
@@ -5287,49 +5346,49 @@
     };
 
     // $ANTLR start lock_on_active
-    // src/main/resources/org/drools/lang/DRL.g:802:1: lock_on_active : lock_on_active_key ( BOOL )? ;
+    // src/main/resources/org/drools/lang/DRL.g:803: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 BOOL118=null;
-        lock_on_active_key_return lock_on_active_key117 = null;
+        Token BOOL120=null;
+        lock_on_active_key_return lock_on_active_key119 = null;
 
 
-        Object BOOL118_tree=null;
+        Object BOOL120_tree=null;
 
         try {
-            // 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 )?
+            // src/main/resources/org/drools/lang/DRL.g:804:2: ( lock_on_active_key ( BOOL )? )
+            // src/main/resources/org/drools/lang/DRL.g:804:4: lock_on_active_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active2013);
-            lock_on_active_key117=lock_on_active_key();
+            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active2031);
+            lock_on_active_key119=lock_on_active_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key117.getTree(), root_0);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key119.getTree(), root_0);
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_RULE_HEADER_KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:803:73: ( BOOL )?
-            int alt41=2;
-            int LA41_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:804:73: ( BOOL )?
+            int alt42=2;
+            int LA42_0 = input.LA(1);
 
-            if ( (LA41_0==BOOL) ) {
-                alt41=1;
+            if ( (LA42_0==BOOL) ) {
+                alt42=1;
             }
-            switch (alt41) {
+            switch (alt42) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:803:73: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:804:73: BOOL
                     {
-                    BOOL118=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active2018); if (failed) return retval;
+                    BOOL120=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active2036); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL118_tree = (Object)adaptor.create(BOOL118);
-                    adaptor.addChild(root_0, BOOL118_tree);
+                    BOOL120_tree = (Object)adaptor.create(BOOL120);
+                    adaptor.addChild(root_0, BOOL120_tree);
                     }
 
                     }
@@ -5338,7 +5397,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(BOOL118, DroolsEditorType.BOOLEAN_CONST );	
+              	emit(BOOL120, DroolsEditorType.BOOLEAN_CONST );	
             }
 
             }
@@ -5366,47 +5425,47 @@
     };
 
     // $ANTLR start normal_lhs_block
-    // src/main/resources/org/drools/lang/DRL.g:807:1: normal_lhs_block : ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:808: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 lhs119 = null;
+        lhs_return lhs121 = null;
 
 
         RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs");
         try {
-            // 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:809:2: ( ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:809:4: ( lhs )*
             {
-            // src/main/resources/org/drools/lang/DRL.g:808:4: ( lhs )*
-            loop42:
+            // src/main/resources/org/drools/lang/DRL.g:809:4: ( lhs )*
+            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:808:4: lhs
+            	    // src/main/resources/org/drools/lang/DRL.g:809:4: lhs
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block2033);
-            	    lhs119=lhs();
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block2051);
+            	    lhs121=lhs();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs.add(lhs119.getTree());
+            	    if ( backtracking==0 ) stream_lhs.add(lhs121.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop42;
+            	    break loop43;
                 }
             } while (true);
 
@@ -5422,14 +5481,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 809:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
+            // 810:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:809:5: ^( VT_AND_IMPLICIT ( lhs )* )
+                // src/main/resources/org/drools/lang/DRL.g:810: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:809:23: ( lhs )*
+                // src/main/resources/org/drools/lang/DRL.g:810:23: ( lhs )*
                 while ( stream_lhs.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs.next());
 
@@ -5468,28 +5527,28 @@
     };
 
     // $ANTLR start lhs
-    // src/main/resources/org/drools/lang/DRL.g:812:1: lhs : lhs_or ;
+    // src/main/resources/org/drools/lang/DRL.g:813: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_or120 = null;
+        lhs_or_return lhs_or122 = null;
 
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:812:5: ( lhs_or )
-            // src/main/resources/org/drools/lang/DRL.g:812:7: lhs_or
+            // src/main/resources/org/drools/lang/DRL.g:813:5: ( lhs_or )
+            // src/main/resources/org/drools/lang/DRL.g:813:7: lhs_or
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lhs_or_in_lhs2054);
-            lhs_or120=lhs_or();
+            pushFollow(FOLLOW_lhs_or_in_lhs2072);
+            lhs_or122=lhs_or();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or120.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or122.getTree());
 
             }
 
@@ -5516,7 +5575,7 @@
     };
 
     // $ANTLR start lhs_or
-    // 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 ) )* );
+    // src/main/resources/org/drools/lang/DRL.g:816: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);
@@ -5524,64 +5583,61 @@
         Object root_0 = null;
 
         Token pipe=null;
-        Token LEFT_PAREN121=null;
-        Token RIGHT_PAREN123=null;
+        Token LEFT_PAREN123=null;
+        Token RIGHT_PAREN125=null;
         or_key_return or = null;
 
         or_key_return value = null;
 
-        lhs_and_return lhs_and122 = null;
-
         lhs_and_return lhs_and124 = null;
 
-        lhs_and_return lhs_and125 = null;
+        lhs_and_return lhs_and126 = null;
 
+        lhs_and_return lhs_and127 = null;
 
+
         Object pipe_tree=null;
-        Object LEFT_PAREN121_tree=null;
-        Object RIGHT_PAREN123_tree=null;
+        Object LEFT_PAREN123_tree=null;
+        Object RIGHT_PAREN125_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: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);
+            // src/main/resources/org/drools/lang/DRL.g:819: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 alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( (LA46_0==LEFT_PAREN) ) {
-                int LA46_1 = input.LA(2);
+            if ( (LA47_0==LEFT_PAREN) ) {
+                int LA47_1 = input.LA(2);
 
-                if ( (LA46_1==LEFT_PAREN) ) {
-                    alt46=2;
-                }
-                else if ( (LA46_1==ID) ) {
+                if ( (LA47_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt46=2;
+                        alt47=2;
                         }
                         break;
                     case LEFT_PAREN:
                         {
-                        int LA46_4 = input.LA(4);
+                        int LA47_4 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt46=1;
+                            alt47=1;
                         }
                         else if ( (true) ) {
-                            alt46=2;
+                            alt47=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                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);
+                                new NoViableAltException("816: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 ) )* );", 47, 4, input);
 
                             throw nvae;
                         }
@@ -5589,18 +5645,18 @@
                         break;
                     case ID:
                         {
-                        int LA46_5 = input.LA(4);
+                        int LA47_5 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt46=1;
+                            alt47=1;
                         }
                         else if ( (true) ) {
-                            alt46=2;
+                            alt47=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                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);
+                                new NoViableAltException("816: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 ) )* );", 47, 5, input);
 
                             throw nvae;
                         }
@@ -5609,42 +5665,45 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            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);
+                            new NoViableAltException("816: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 ) )* );", 47, 3, input);
 
                         throw nvae;
                     }
 
                 }
+                else if ( (LA47_1==LEFT_PAREN) ) {
+                    alt47=2;
+                }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        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);
+                        new NoViableAltException("816: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 ) )* );", 47, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA46_0==ID) ) {
-                alt46=2;
+            else if ( (LA47_0==ID) ) {
+                alt47=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("816: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 ) )* );", 47, 0, input);
 
                 throw nvae;
             }
-            switch (alt46) {
+            switch (alt47) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:818:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:819:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
                     {
-                    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);
+                    LEFT_PAREN123=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2096); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN123);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN121, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN123, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_key_in_lhs_or2088);
+                    pushFollow(FOLLOW_or_key_in_lhs_or2106);
                     or=or_key();
                     _fsp--;
                     if (failed) return retval;
@@ -5652,51 +5711,51 @@
                     if ( backtracking==0 ) {
                       	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:822:4: ( lhs_and )+
-                    int cnt43=0;
-                    loop43:
+                    // src/main/resources/org/drools/lang/DRL.g:823:4: ( lhs_and )+
+                    int cnt44=0;
+                    loop44:
                     do {
-                        int alt43=2;
-                        int LA43_0 = input.LA(1);
+                        int alt44=2;
+                        int LA44_0 = input.LA(1);
 
-                        if ( (LA43_0==ID||LA43_0==LEFT_PAREN) ) {
-                            alt43=1;
+                        if ( (LA44_0==ID||LA44_0==LEFT_PAREN) ) {
+                            alt44=1;
                         }
 
 
-                        switch (alt43) {
+                        switch (alt44) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:822:4: lhs_and
+                    	    // src/main/resources/org/drools/lang/DRL.g:823:4: lhs_and
                     	    {
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2096);
-                    	    lhs_and122=lhs_and();
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2114);
+                    	    lhs_and124=lhs_and();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and122.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and124.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt43 >= 1 ) break loop43;
+                    	    if ( cnt44 >= 1 ) break loop44;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(43, input);
+                                    new EarlyExitException(44, input);
                                 throw eee;
                         }
-                        cnt43++;
+                        cnt44++;
                     } while (true);
 
-                    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);
+                    RIGHT_PAREN125=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2120); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN125);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN123, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN125, DroolsEditorType.SYMBOL);	
                     }
 
                     // AST REWRITE
-                    // elements: RIGHT_PAREN, lhs_and
+                    // elements: lhs_and, RIGHT_PAREN
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -5706,9 +5765,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 824:3: -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
+                    // 825:3: -> ^( 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 )
+                        // src/main/resources/org/drools/lang/DRL.g:825: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);
@@ -5733,16 +5792,16 @@
                     }
                     break;
                 case 2 :
-                    // 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:826: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 )
-                    // src/main/resources/org/drools/lang/DRL.g:825:5: lhs_and
+                    // src/main/resources/org/drools/lang/DRL.g:826:4: ( lhs_and -> lhs_and )
+                    // src/main/resources/org/drools/lang/DRL.g:826:5: lhs_and
                     {
-                    pushFollow(FOLLOW_lhs_and_in_lhs_or2125);
-                    lhs_and124=lhs_and();
+                    pushFollow(FOLLOW_lhs_and_in_lhs_or2143);
+                    lhs_and126=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_and126.getTree());
 
                     // AST REWRITE
                     // elements: lhs_and
@@ -5755,7 +5814,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 825:13: -> lhs_and
+                    // 826:13: -> lhs_and
                     {
                         adaptor.addChild(root_0, stream_lhs_and.next());
 
@@ -5765,58 +5824,58 @@
 
                     }
 
-                    // 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:
+                    // src/main/resources/org/drools/lang/DRL.g:827:3: ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
+                    loop46:
                     do {
-                        int alt45=2;
-                        int LA45_0 = input.LA(1);
+                        int alt46=2;
+                        int LA46_0 = input.LA(1);
 
-                        if ( (LA45_0==ID) ) {
-                            int LA45_2 = input.LA(2);
+                        if ( (LA46_0==ID) ) {
+                            int LA46_2 = input.LA(2);
 
                             if ( ((synpred2()&&(validateIdentifierKey(DroolsSoftKeywords.OR)))) ) {
-                                alt45=1;
+                                alt46=1;
                             }
 
 
                         }
-                        else if ( (LA45_0==DOUBLE_PIPE) ) {
-                            int LA45_3 = input.LA(2);
+                        else if ( (LA46_0==DOUBLE_PIPE) ) {
+                            int LA46_3 = input.LA(2);
 
                             if ( (synpred2()) ) {
-                                alt45=1;
+                                alt46=1;
                             }
 
 
                         }
 
 
-                        switch (alt45) {
+                        switch (alt46) {
                     	case 1 :
-                    	    // 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:827:5: ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and
                     	    {
-                    	    // 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);
+                    	    // src/main/resources/org/drools/lang/DRL.g:827:28: (value= or_key | pipe= DOUBLE_PIPE )
+                    	    int alt45=2;
+                    	    int LA45_0 = input.LA(1);
 
-                    	    if ( (LA44_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    	        alt44=1;
+                    	    if ( (LA45_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    	        alt45=1;
                     	    }
-                    	    else if ( (LA44_0==DOUBLE_PIPE) ) {
-                    	        alt44=2;
+                    	    else if ( (LA45_0==DOUBLE_PIPE) ) {
+                    	        alt45=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("826:28: (value= or_key | pipe= DOUBLE_PIPE )", 44, 0, input);
+                    	            new NoViableAltException("827:28: (value= or_key | pipe= DOUBLE_PIPE )", 45, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt44) {
+                    	    switch (alt45) {
                     	        case 1 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:826:29: value= or_key
+                    	            // src/main/resources/org/drools/lang/DRL.g:827:29: value= or_key
                     	            {
-                    	            pushFollow(FOLLOW_or_key_in_lhs_or2147);
+                    	            pushFollow(FOLLOW_or_key_in_lhs_or2165);
                     	            value=or_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -5828,10 +5887,10 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:826:69: pipe= DOUBLE_PIPE
+                    	            // src/main/resources/org/drools/lang/DRL.g:827:69: pipe= DOUBLE_PIPE
                     	            {
                     	            pipe=(Token)input.LT(1);
-                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or2154); if (failed) return retval;
+                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or2172); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
                     	            if ( backtracking==0 ) {
@@ -5846,14 +5905,14 @@
                     	    if ( backtracking==0 ) {
                     	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     	    }
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2165);
-                    	    lhs_and125=lhs_and();
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2183);
+                    	    lhs_and127=lhs_and();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and125.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and127.getTree());
 
                     	    // AST REWRITE
-                    	    // elements: lhs_and, lhs_or
+                    	    // elements: lhs_or, lhs_and
                     	    // token labels: 
                     	    // rule labels: retval
                     	    // token list labels: 
@@ -5863,9 +5922,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 829:3: -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
+                    	    // 830:3: -> ^( 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 )
+                    	        // src/main/resources/org/drools/lang/DRL.g:830: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);
@@ -5884,7 +5943,7 @@
                     	    break;
 
                     	default :
-                    	    break loop45;
+                    	    break loop46;
                         }
                     } while (true);
 
@@ -5916,7 +5975,7 @@
     };
 
     // $ANTLR start lhs_and
-    // 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 ) )* );
+    // src/main/resources/org/drools/lang/DRL.g:833: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);
@@ -5924,67 +5983,83 @@
         Object root_0 = null;
 
         Token amper=null;
-        Token LEFT_PAREN126=null;
-        Token RIGHT_PAREN128=null;
+        Token LEFT_PAREN128=null;
+        Token RIGHT_PAREN130=null;
         and_key_return and = null;
 
         and_key_return value = null;
 
-        lhs_unary_return lhs_unary127 = null;
-
         lhs_unary_return lhs_unary129 = null;
 
-        lhs_unary_return lhs_unary130 = null;
+        lhs_unary_return lhs_unary131 = null;
 
+        lhs_unary_return lhs_unary132 = null;
 
+
         Object amper_tree=null;
-        Object LEFT_PAREN126_tree=null;
-        Object RIGHT_PAREN128_tree=null;
-        RewriteRuleTokenStream stream_DOUBLE_AMPER=new RewriteRuleTokenStream(adaptor,"token DOUBLE_AMPER");
+        Object LEFT_PAREN128_tree=null;
+        Object RIGHT_PAREN130_tree=null;
         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_lhs_unary=new RewriteRuleSubtreeStream(adaptor,"rule lhs_unary");
         RewriteRuleSubtreeStream stream_and_key=new RewriteRuleSubtreeStream(adaptor,"rule and_key");
-        RewriteRuleSubtreeStream stream_lhs_unary=new RewriteRuleSubtreeStream(adaptor,"rule lhs_unary");
-        
+
         	Token andToken = null;
 
         try {
-            // 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);
+            // src/main/resources/org/drools/lang/DRL.g:836: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 alt51=2;
+            int LA51_0 = input.LA(1);
 
-            if ( (LA50_0==LEFT_PAREN) ) {
-                int LA50_1 = input.LA(2);
+            if ( (LA51_0==LEFT_PAREN) ) {
+                int LA51_1 = input.LA(2);
 
-                if ( (LA50_1==LEFT_PAREN) ) {
-                    alt50=2;
-                }
-                else if ( (LA50_1==ID) ) {
+                if ( (LA51_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt50=2;
+                        alt51=2;
                         }
                         break;
                     case LEFT_PAREN:
                         {
                         switch ( input.LA(4) ) {
+                        case LEFT_PAREN:
+                            {
+                            int LA51_6 = input.LA(5);
+
+                            if ( (synpred3()) ) {
+                                alt51=1;
+                            }
+                            else if ( (true) ) {
+                                alt51=2;
+                            }
+                            else {
+                                if (backtracking>0) {failed=true; return retval;}
+                                NoViableAltException nvae =
+                                    new NoViableAltException("833: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 ) )* );", 51, 6, input);
+
+                                throw nvae;
+                            }
+                            }
+                            break;
                         case ID:
                             {
-                            int LA50_6 = input.LA(5);
+                            int LA51_7 = input.LA(5);
 
                             if ( (synpred3()) ) {
-                                alt50=1;
+                                alt51=1;
                             }
                             else if ( (true) ) {
-                                alt50=2;
+                                alt51=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, 6, input);
+                                    new NoViableAltException("833: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 ) )* );", 51, 7, input);
 
                                 throw nvae;
                             }
@@ -6045,6 +6120,7 @@
                         case VK_ENABLED:
                         case VK_ATTRIBUTES:
                         case VK_RULE:
+                        case VK_EXTEND:
                         case VK_IMPORT:
                         case VK_PACKAGE:
                         case VK_TEMPLATE:
@@ -6114,32 +6190,13 @@
                         case C_STYLE_SINGLE_LINE_COMMENT:
                         case MULTI_LINE_COMMENT:
                             {
-                            alt50=2;
+                            alt51=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("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);
+                                new NoViableAltException("833: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 ) )* );", 51, 4, input);
 
                             throw nvae;
                         }
@@ -6148,18 +6205,18 @@
                         break;
                     case ID:
                         {
-                        int LA50_5 = input.LA(4);
+                        int LA51_5 = input.LA(4);
 
                         if ( (synpred3()) ) {
-                            alt50=1;
+                            alt51=1;
                         }
                         else if ( (true) ) {
-                            alt50=2;
+                            alt51=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, 5, input);
+                                new NoViableAltException("833: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 ) )* );", 51, 5, input);
 
                             throw nvae;
                         }
@@ -6168,42 +6225,45 @@
                     default:
                         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, 3, input);
+                            new NoViableAltException("833: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 ) )* );", 51, 3, input);
 
                         throw nvae;
                     }
 
                 }
+                else if ( (LA51_1==LEFT_PAREN) ) {
+                    alt51=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, 1, input);
+                        new NoViableAltException("833: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 ) )* );", 51, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA50_0==ID) ) {
-                alt50=2;
+            else if ( (LA51_0==ID) ) {
+                alt51=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, 0, input);
+                    new NoViableAltException("833: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 ) )* );", 51, 0, input);
 
                 throw nvae;
             }
-            switch (alt50) {
+            switch (alt51) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:835:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:836:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
                     {
-                    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);
+                    LEFT_PAREN128=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2224); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN128);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN126, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN128, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_and_key_in_lhs_and2216);
+                    pushFollow(FOLLOW_and_key_in_lhs_and2234);
                     and=and_key();
                     _fsp--;
                     if (failed) return retval;
@@ -6211,51 +6271,51 @@
                     if ( backtracking==0 ) {
                       	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:839:4: ( lhs_unary )+
-                    int cnt47=0;
-                    loop47:
+                    // src/main/resources/org/drools/lang/DRL.g:840:4: ( lhs_unary )+
+                    int cnt48=0;
+                    loop48:
                     do {
-                        int alt47=2;
-                        int LA47_0 = input.LA(1);
+                        int alt48=2;
+                        int LA48_0 = input.LA(1);
 
-                        if ( (LA47_0==ID||LA47_0==LEFT_PAREN) ) {
-                            alt47=1;
+                        if ( (LA48_0==ID||LA48_0==LEFT_PAREN) ) {
+                            alt48=1;
                         }
 
 
-                        switch (alt47) {
+                        switch (alt48) {
                     	case 1 :
-                    	    // src/main/resources/org/drools/lang/DRL.g:839:4: lhs_unary
+                    	    // src/main/resources/org/drools/lang/DRL.g:840:4: lhs_unary
                     	    {
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2224);
-                    	    lhs_unary127=lhs_unary();
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2242);
+                    	    lhs_unary129=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary127.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary129.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt47 >= 1 ) break loop47;
+                    	    if ( cnt48 >= 1 ) break loop48;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(47, input);
+                                    new EarlyExitException(48, input);
                                 throw eee;
                         }
-                        cnt47++;
+                        cnt48++;
                     } while (true);
 
-                    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);
+                    RIGHT_PAREN130=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2248); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN130);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN128, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN130, DroolsEditorType.SYMBOL);	
                     }
 
                     // AST REWRITE
-                    // elements: lhs_unary, RIGHT_PAREN
+                    // elements: RIGHT_PAREN, lhs_unary
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -6265,9 +6325,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 841:3: -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
+                    // 842:3: -> ^( 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 )
+                        // src/main/resources/org/drools/lang/DRL.g:842: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);
@@ -6292,16 +6352,16 @@
                     }
                     break;
                 case 2 :
-                    // 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:843: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 )
-                    // src/main/resources/org/drools/lang/DRL.g:842:5: lhs_unary
+                    // src/main/resources/org/drools/lang/DRL.g:843:4: ( lhs_unary -> lhs_unary )
+                    // src/main/resources/org/drools/lang/DRL.g:843:5: lhs_unary
                     {
-                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2254);
-                    lhs_unary129=lhs_unary();
+                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2272);
+                    lhs_unary131=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_unary131.getTree());
 
                     // AST REWRITE
                     // elements: lhs_unary
@@ -6314,7 +6374,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 842:15: -> lhs_unary
+                    // 843:15: -> lhs_unary
                     {
                         adaptor.addChild(root_0, stream_lhs_unary.next());
 
@@ -6324,58 +6384,58 @@
 
                     }
 
-                    // 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:
+                    // src/main/resources/org/drools/lang/DRL.g:844:3: ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
+                    loop50:
                     do {
-                        int alt49=2;
-                        int LA49_0 = input.LA(1);
+                        int alt50=2;
+                        int LA50_0 = input.LA(1);
 
-                        if ( (LA49_0==ID) ) {
-                            int LA49_2 = input.LA(2);
+                        if ( (LA50_0==ID) ) {
+                            int LA50_2 = input.LA(2);
 
                             if ( ((synpred4()&&(validateIdentifierKey(DroolsSoftKeywords.AND)))) ) {
-                                alt49=1;
+                                alt50=1;
                             }
 
 
                         }
-                        else if ( (LA49_0==DOUBLE_AMPER) ) {
-                            int LA49_3 = input.LA(2);
+                        else if ( (LA50_0==DOUBLE_AMPER) ) {
+                            int LA50_3 = input.LA(2);
 
                             if ( (synpred4()) ) {
-                                alt49=1;
+                                alt50=1;
                             }
 
 
                         }
 
 
-                        switch (alt49) {
+                        switch (alt50) {
                     	case 1 :
-                    	    // 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:844:5: ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary
                     	    {
-                    	    // 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);
+                    	    // src/main/resources/org/drools/lang/DRL.g:844:30: (value= and_key | amper= DOUBLE_AMPER )
+                    	    int alt49=2;
+                    	    int LA49_0 = input.LA(1);
 
-                    	    if ( (LA48_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-                    	        alt48=1;
+                    	    if ( (LA49_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+                    	        alt49=1;
                     	    }
-                    	    else if ( (LA48_0==DOUBLE_AMPER) ) {
-                    	        alt48=2;
+                    	    else if ( (LA49_0==DOUBLE_AMPER) ) {
+                    	        alt49=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("843:30: (value= and_key | amper= DOUBLE_AMPER )", 48, 0, input);
+                    	            new NoViableAltException("844:30: (value= and_key | amper= DOUBLE_AMPER )", 49, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt48) {
+                    	    switch (alt49) {
                     	        case 1 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:843:31: value= and_key
+                    	            // src/main/resources/org/drools/lang/DRL.g:844:31: value= and_key
                     	            {
-                    	            pushFollow(FOLLOW_and_key_in_lhs_and2276);
+                    	            pushFollow(FOLLOW_and_key_in_lhs_and2294);
                     	            value=and_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -6387,10 +6447,10 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // src/main/resources/org/drools/lang/DRL.g:843:73: amper= DOUBLE_AMPER
+                    	            // src/main/resources/org/drools/lang/DRL.g:844:73: amper= DOUBLE_AMPER
                     	            {
                     	            amper=(Token)input.LT(1);
-                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2283); if (failed) return retval;
+                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2301); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_AMPER.add(amper);
 
                     	            if ( backtracking==0 ) {
@@ -6405,11 +6465,11 @@
                     	    if ( backtracking==0 ) {
                     	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
                     	    }
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2294);
-                    	    lhs_unary130=lhs_unary();
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2312);
+                    	    lhs_unary132=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary130.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary132.getTree());
 
                     	    // AST REWRITE
                     	    // elements: lhs_unary, lhs_and
@@ -6422,9 +6482,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 846:3: -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
+                    	    // 847:3: -> ^( 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 )
+                    	        // src/main/resources/org/drools/lang/DRL.g:847: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);
@@ -6443,7 +6503,7 @@
                     	    break;
 
                     	default :
-                    	    break loop49;
+                    	    break loop50;
                         }
                     } while (true);
 
@@ -6475,202 +6535,202 @@
     };
 
     // $ANTLR start lhs_unary
-    // 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 )? ;
+    // src/main/resources/org/drools/lang/DRL.g:850: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_PAREN136=null;
-        Token RIGHT_PAREN138=null;
-        Token SEMICOLON140=null;
-        lhs_exist_return lhs_exist131 = null;
+        Token LEFT_PAREN138=null;
+        Token RIGHT_PAREN140=null;
+        Token SEMICOLON142=null;
+        lhs_exist_return lhs_exist133 = null;
 
-        lhs_not_binding_return lhs_not_binding132 = null;
+        lhs_not_binding_return lhs_not_binding134 = null;
 
-        lhs_not_return lhs_not133 = null;
+        lhs_not_return lhs_not135 = null;
 
-        lhs_eval_return lhs_eval134 = null;
+        lhs_eval_return lhs_eval136 = null;
 
-        lhs_forall_return lhs_forall135 = null;
+        lhs_forall_return lhs_forall137 = null;
 
-        lhs_or_return lhs_or137 = null;
+        lhs_or_return lhs_or139 = null;
 
-        pattern_source_return pattern_source139 = null;
+        pattern_source_return pattern_source141 = null;
 
 
-        Object LEFT_PAREN136_tree=null;
-        Object RIGHT_PAREN138_tree=null;
-        Object SEMICOLON140_tree=null;
+        Object LEFT_PAREN138_tree=null;
+        Object RIGHT_PAREN140_tree=null;
+        Object SEMICOLON142_tree=null;
 
         try {
-            // 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 )?
+            // src/main/resources/org/drools/lang/DRL.g:851: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:851: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: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);
+            // src/main/resources/org/drools/lang/DRL.g:851:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )
+            int alt52=7;
+            int LA52_0 = input.LA(1);
 
-            if ( (LA51_0==ID) ) {
-                int LA51_1 = input.LA(2);
+            if ( (LA52_0==ID) ) {
+                int LA52_1 = input.LA(2);
 
                 if ( ((validateIdentifierKey(DroolsSoftKeywords.EXISTS))) ) {
-                    alt51=1;
+                    alt52=1;
                 }
                 else if ( ((validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))) ) {
-                    alt51=2;
+                    alt52=2;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                    alt51=3;
+                    alt52=3;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                    alt51=4;
+                    alt52=4;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.FORALL))) ) {
-                    alt51=5;
+                    alt52=5;
                 }
                 else if ( (true) ) {
-                    alt51=7;
+                    alt52=7;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        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);
+                        new NoViableAltException("851:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 52, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA51_0==LEFT_PAREN) ) {
-                alt51=6;
+            else if ( (LA52_0==LEFT_PAREN) ) {
+                alt52=6;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("851:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 52, 0, input);
 
                 throw nvae;
             }
-            switch (alt51) {
+            switch (alt52) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:850:6: lhs_exist
+                    // src/main/resources/org/drools/lang/DRL.g:851:6: lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2325);
-                    lhs_exist131=lhs_exist();
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2343);
+                    lhs_exist133=lhs_exist();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist131.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist133.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:851:4: {...}? => lhs_not_binding
+                    // src/main/resources/org/drools/lang/DRL.g:852: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_unary2333);
-                    lhs_not_binding132=lhs_not_binding();
+                    pushFollow(FOLLOW_lhs_not_binding_in_lhs_unary2351);
+                    lhs_not_binding134=lhs_not_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding132.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding134.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:852:5: lhs_not
+                    // src/main/resources/org/drools/lang/DRL.g:853:5: lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2339);
-                    lhs_not133=lhs_not();
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2357);
+                    lhs_not135=lhs_not();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not133.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not135.getTree());
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:853:5: lhs_eval
+                    // src/main/resources/org/drools/lang/DRL.g:854:5: lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2345);
-                    lhs_eval134=lhs_eval();
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2363);
+                    lhs_eval136=lhs_eval();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval134.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval136.getTree());
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:854:5: lhs_forall
+                    // src/main/resources/org/drools/lang/DRL.g:855:5: lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2351);
-                    lhs_forall135=lhs_forall();
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2369);
+                    lhs_forall137=lhs_forall();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall135.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall137.getTree());
 
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:855:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:856:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN136=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2357); if (failed) return retval;
+                    LEFT_PAREN138=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2375); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN136, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                      	emit(LEFT_PAREN138, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2368);
-                    lhs_or137=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2386);
+                    lhs_or139=lhs_or();
                     _fsp--;
                     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 ) adaptor.addChild(root_0, lhs_or139.getTree());
+                    RIGHT_PAREN140=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2392); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN138_tree = (Object)adaptor.create(RIGHT_PAREN138);
-                    adaptor.addChild(root_0, RIGHT_PAREN138_tree);
+                    RIGHT_PAREN140_tree = (Object)adaptor.create(RIGHT_PAREN140);
+                    adaptor.addChild(root_0, RIGHT_PAREN140_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN138, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN140, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 7 :
-                    // src/main/resources/org/drools/lang/DRL.g:858:5: pattern_source
+                    // src/main/resources/org/drools/lang/DRL.g:859:5: pattern_source
                     {
-                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2382);
-                    pattern_source139=pattern_source();
+                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2400);
+                    pattern_source141=pattern_source();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source139.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source141.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:860:3: ( ( SEMICOLON )=> SEMICOLON )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:861:3: ( ( SEMICOLON )=> SEMICOLON )?
+            int alt53=2;
+            int LA53_0 = input.LA(1);
 
-            if ( (LA52_0==SEMICOLON) ) {
-                int LA52_1 = input.LA(2);
+            if ( (LA53_0==SEMICOLON) ) {
+                int LA53_1 = input.LA(2);
 
                 if ( (synpred5()) ) {
-                    alt52=1;
+                    alt53=1;
                 }
             }
-            switch (alt52) {
+            switch (alt53) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:860:4: ( SEMICOLON )=> SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:861:4: ( SEMICOLON )=> SEMICOLON
                     {
-                    SEMICOLON140=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2396); if (failed) return retval;
+                    SEMICOLON142=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2414); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(SEMICOLON140, DroolsEditorType.SYMBOL);	
+                      	emit(SEMICOLON142, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -6704,91 +6764,91 @@
     };
 
     // $ANTLR start lhs_exist
-    // 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 )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:864: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_PAREN143=null;
-        Token RIGHT_PAREN145=null;
-        exists_key_return exists_key141 = null;
+        Token LEFT_PAREN145=null;
+        Token RIGHT_PAREN147=null;
+        exists_key_return exists_key143 = null;
 
-        lhs_or_return lhs_or142 = null;
-
         lhs_or_return lhs_or144 = null;
 
-        lhs_pattern_return lhs_pattern146 = null;
+        lhs_or_return lhs_or146 = null;
 
+        lhs_pattern_return lhs_pattern148 = null;
 
-        Object LEFT_PAREN143_tree=null;
-        Object RIGHT_PAREN145_tree=null;
+
+        Object LEFT_PAREN145_tree=null;
+        Object RIGHT_PAREN147_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: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 )
+            // src/main/resources/org/drools/lang/DRL.g:865: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:865: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_exist2412);
-            exists_key141=exists_key();
+            pushFollow(FOLLOW_exists_key_in_lhs_exist2430);
+            exists_key143=exists_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_exists_key.add(exists_key141.getTree());
+            if ( backtracking==0 ) stream_exists_key.add(exists_key143.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS);	
             }
-            // 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) {
+            // src/main/resources/org/drools/lang/DRL.g:867:10: ( ( 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:866:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // src/main/resources/org/drools/lang/DRL.g:867:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
                     {
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2439);
-                    lhs_or142=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2457);
+                    lhs_or144=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or142.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or144.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:867:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:868:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    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);
+                    LEFT_PAREN145=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2464); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN145);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN143, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN145, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2454);
-                    lhs_or144=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2472);
+                    lhs_or146=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    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 ) stream_lhs_or.add(lhs_or146.getTree());
+                    RIGHT_PAREN147=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2479); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN147);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN145, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN147, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:870:12: lhs_pattern
+                    // src/main/resources/org/drools/lang/DRL.g:871:12: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2476);
-                    lhs_pattern146=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2494);
+                    lhs_pattern148=lhs_pattern();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern146.getTree());
+                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern148.getTree());
 
                     }
                     break;
@@ -6797,7 +6857,7 @@
 
 
             // AST REWRITE
-            // elements: lhs_pattern, lhs_or, RIGHT_PAREN, exists_key
+            // elements: RIGHT_PAREN, lhs_pattern, lhs_or, exists_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6807,26 +6867,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 872:10: -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 873:10: -> ^( 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 )? )
+                // src/main/resources/org/drools/lang/DRL.g:873: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:872:26: ( lhs_or )?
+                // src/main/resources/org/drools/lang/DRL.g:873: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:872:34: ( lhs_pattern )?
+                // src/main/resources/org/drools/lang/DRL.g:873: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:872:47: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:873:47: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -6865,37 +6925,37 @@
     };
 
     // $ANTLR start lhs_not_binding
-    // src/main/resources/org/drools/lang/DRL.g:875:1: lhs_not_binding : not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) ;
+    // src/main/resources/org/drools/lang/DRL.g:876: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_key147 = null;
+        not_key_return not_key149 = null;
 
-        fact_binding_return fact_binding148 = null;
+        fact_binding_return fact_binding150 = 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: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
+            // src/main/resources/org/drools/lang/DRL.g:877:2: ( not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) )
+            // src/main/resources/org/drools/lang/DRL.g:877:4: not_key fact_binding
             {
-            pushFollow(FOLLOW_not_key_in_lhs_not_binding2522);
-            not_key147=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not_binding2540);
+            not_key149=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key147.getTree());
-            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2524);
-            fact_binding148=fact_binding();
+            if ( backtracking==0 ) stream_not_key.add(not_key149.getTree());
+            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2542);
+            fact_binding150=fact_binding();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact_binding.add(fact_binding148.getTree());
+            if ( backtracking==0 ) stream_fact_binding.add(fact_binding150.getTree());
 
             // AST REWRITE
-            // elements: not_key, fact_binding
+            // elements: fact_binding, not_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6905,14 +6965,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 877:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
+            // 878:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
             {
-                // src/main/resources/org/drools/lang/DRL.g:877:5: ^( not_key ^( VT_PATTERN fact_binding ) )
+                // src/main/resources/org/drools/lang/DRL.g:878: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:877:15: ^( VT_PATTERN fact_binding )
+                // src/main/resources/org/drools/lang/DRL.g:878:15: ^( VT_PATTERN fact_binding )
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_2);
@@ -6954,94 +7014,94 @@
     };
 
     // $ANTLR start lhs_not
-    // 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 )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:881: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_PAREN151=null;
-        Token RIGHT_PAREN153=null;
-        not_key_return not_key149 = null;
+        Token LEFT_PAREN153=null;
+        Token RIGHT_PAREN155=null;
+        not_key_return not_key151 = null;
 
-        lhs_or_return lhs_or150 = null;
-
         lhs_or_return lhs_or152 = null;
 
-        lhs_pattern_return lhs_pattern154 = null;
+        lhs_or_return lhs_or154 = null;
 
+        lhs_pattern_return lhs_pattern156 = null;
 
-        Object LEFT_PAREN151_tree=null;
-        Object RIGHT_PAREN153_tree=null;
+
+        Object LEFT_PAREN153_tree=null;
+        Object RIGHT_PAREN155_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: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 )
+            // src/main/resources/org/drools/lang/DRL.g:881: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:881: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_not2547);
-            not_key149=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not2565);
+            not_key151=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key149.getTree());
+            if ( backtracking==0 ) stream_not_key.add(not_key151.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT);	
             }
-            // 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) {
+            // src/main/resources/org/drools/lang/DRL.g:883:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            int alt55=3;
+            alt55 = dfa55.predict(input);
+            switch (alt55) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:882:5: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // src/main/resources/org/drools/lang/DRL.g:883: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_not2569);
-                    lhs_or150=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2587);
+                    lhs_or152=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or150.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or152.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:883:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:884:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    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);
+                    LEFT_PAREN153=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2594); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN153);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN151, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                      	emit(LEFT_PAREN153, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
                     }
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2585);
-                    lhs_or152=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2603);
+                    lhs_or154=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    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 ) stream_lhs_or.add(lhs_or154.getTree());
+                    RIGHT_PAREN155=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2609); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN155);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN153, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN155, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:886:6: lhs_pattern
+                    // src/main/resources/org/drools/lang/DRL.g:887:6: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2601);
-                    lhs_pattern154=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2619);
+                    lhs_pattern156=lhs_pattern();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern154.getTree());
+                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern156.getTree());
 
                     }
                     break;
@@ -7050,7 +7110,7 @@
 
 
             // AST REWRITE
-            // elements: lhs_pattern, RIGHT_PAREN, lhs_or, not_key
+            // elements: not_key, lhs_or, RIGHT_PAREN, lhs_pattern
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7060,26 +7120,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 887:10: -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 888:10: -> ^( 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 )? )
+                // src/main/resources/org/drools/lang/DRL.g:888: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:887:23: ( lhs_or )?
+                // src/main/resources/org/drools/lang/DRL.g:888: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:887:31: ( lhs_pattern )?
+                // src/main/resources/org/drools/lang/DRL.g:888: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:887:44: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:888:44: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -7118,7 +7178,7 @@
     };
 
     // $ANTLR start lhs_eval
-    // src/main/resources/org/drools/lang/DRL.g:890:1: lhs_eval : ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:891: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);
@@ -7130,13 +7190,13 @@
         paren_chunk_return pc = null;
 
 
+        RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         RewriteRuleSubtreeStream stream_eval_key=new RewriteRuleSubtreeStream(adaptor,"rule eval_key");
-        RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:892:2: (ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:892:4: ev= eval_key pc= paren_chunk
             {
-            pushFollow(FOLLOW_eval_key_in_lhs_eval2640);
+            pushFollow(FOLLOW_eval_key_in_lhs_eval2658);
             ev=eval_key();
             _fsp--;
             if (failed) return retval;
@@ -7144,7 +7204,7 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_EVAL);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2649);
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2667);
             pc=paren_chunk();
             _fsp--;
             if (failed) return retval;
@@ -7158,7 +7218,7 @@
             }
 
             // AST REWRITE
-            // elements: eval_key, paren_chunk
+            // elements: paren_chunk, eval_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7168,9 +7228,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 897:3: -> ^( eval_key paren_chunk )
+            // 898:3: -> ^( eval_key paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:897:6: ^( eval_key paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:898:6: ^( eval_key paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_eval_key.nextNode(), root_1);
@@ -7209,83 +7269,83 @@
     };
 
     // $ANTLR start lhs_forall
-    // 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 ) ;
+    // src/main/resources/org/drools/lang/DRL.g:901: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_PAREN156=null;
-        Token RIGHT_PAREN158=null;
-        forall_key_return forall_key155 = null;
+        Token LEFT_PAREN158=null;
+        Token RIGHT_PAREN160=null;
+        forall_key_return forall_key157 = null;
 
-        lhs_pattern_return lhs_pattern157 = null;
+        lhs_pattern_return lhs_pattern159 = null;
 
 
-        Object LEFT_PAREN156_tree=null;
-        Object RIGHT_PAREN158_tree=null;
+        Object LEFT_PAREN158_tree=null;
+        Object RIGHT_PAREN160_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: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
+            // src/main/resources/org/drools/lang/DRL.g:902:2: ( forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:902:4: forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN
             {
-            pushFollow(FOLLOW_forall_key_in_lhs_forall2676);
-            forall_key155=forall_key();
+            pushFollow(FOLLOW_forall_key_in_lhs_forall2694);
+            forall_key157=forall_key();
             _fsp--;
             if (failed) return retval;
-            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 ) stream_forall_key.add(forall_key157.getTree());
+            LEFT_PAREN158=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2699); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN158);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN156, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN158, DroolsEditorType.SYMBOL);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:903:4: ( lhs_pattern )+
-            int cnt55=0;
-            loop55:
+            // src/main/resources/org/drools/lang/DRL.g:904:4: ( lhs_pattern )+
+            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==ID) ) {
-                    alt55=1;
+                if ( (LA56_0==ID) ) {
+                    alt56=1;
                 }
 
 
-                switch (alt55) {
+                switch (alt56) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:903:4: lhs_pattern
+            	    // src/main/resources/org/drools/lang/DRL.g:904:4: lhs_pattern
             	    {
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2689);
-            	    lhs_pattern157=lhs_pattern();
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2707);
+            	    lhs_pattern159=lhs_pattern();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern157.getTree());
+            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern159.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    if ( cnt55 >= 1 ) break loop55;
+            	    if ( cnt56 >= 1 ) break loop56;
             	    if (backtracking>0) {failed=true; return retval;}
                         EarlyExitException eee =
-                            new EarlyExitException(55, input);
+                            new EarlyExitException(56, input);
                         throw eee;
                 }
-                cnt55++;
+                cnt56++;
             } while (true);
 
-            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);
+            RIGHT_PAREN160=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2713); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN160);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN158, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN160, DroolsEditorType.SYMBOL);	
             }
 
             // AST REWRITE
@@ -7299,9 +7359,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 905:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+            // 906:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:905:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:906:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_forall_key.nextNode(), root_1);
@@ -7348,111 +7408,111 @@
     };
 
     // $ANTLR start pattern_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 ) )? ;
+    // src/main/resources/org/drools/lang/DRL.g:909: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 FROM161=null;
-        lhs_pattern_return lhs_pattern159 = null;
+        Token FROM163=null;
+        lhs_pattern_return lhs_pattern161 = null;
 
-        over_clause_return over_clause160 = null;
+        over_clause_return over_clause162 = null;
 
-        accumulate_statement_return accumulate_statement162 = null;
+        accumulate_statement_return accumulate_statement164 = null;
 
-        collect_statement_return collect_statement163 = null;
+        collect_statement_return collect_statement165 = null;
 
-        entrypoint_statement_return entrypoint_statement164 = null;
+        entrypoint_statement_return entrypoint_statement166 = null;
 
-        from_source_return from_source165 = null;
+        from_source_return from_source167 = null;
 
 
-        Object FROM161_tree=null;
+        Object FROM163_tree=null;
 
          boolean isFailed = true;	
         try {
-            // 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 ) )?
+            // src/main/resources/org/drools/lang/DRL.g:912:2: ( lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? )
+            // src/main/resources/org/drools/lang/DRL.g:912: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_source2731);
-            lhs_pattern159=lhs_pattern();
+            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2749);
+            lhs_pattern161=lhs_pattern();
             _fsp--;
             if (failed) return retval;
-            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 ( backtracking==0 ) adaptor.addChild(root_0, lhs_pattern161.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:913:3: ( over_clause )?
+            int alt57=2;
+            int LA57_0 = input.LA(1);
 
-            if ( (LA56_0==OVER) ) {
-                alt56=1;
+            if ( (LA57_0==OVER) ) {
+                alt57=1;
             }
-            switch (alt56) {
+            switch (alt57) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:912:3: over_clause
+                    // src/main/resources/org/drools/lang/DRL.g:913:3: over_clause
                     {
-                    pushFollow(FOLLOW_over_clause_in_pattern_source2735);
-                    over_clause160=over_clause();
+                    pushFollow(FOLLOW_over_clause_in_pattern_source2753);
+                    over_clause162=over_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause160.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause162.getTree());
 
                     }
                     break;
 
             }
 
-            // 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);
+            // src/main/resources/org/drools/lang/DRL.g:914:3: ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
+            int alt59=2;
+            int LA59_0 = input.LA(1);
 
-            if ( (LA58_0==FROM) ) {
-                alt58=1;
+            if ( (LA59_0==FROM) ) {
+                alt59=1;
             }
-            switch (alt58) {
+            switch (alt59) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:914:4: FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    // src/main/resources/org/drools/lang/DRL.g:915:4: FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
                     {
-                    FROM161=(Token)input.LT(1);
-                    match(input,FROM,FOLLOW_FROM_in_pattern_source2745); if (failed) return retval;
+                    FROM163=(Token)input.LT(1);
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2763); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    FROM161_tree = (Object)adaptor.create(FROM161);
-                    root_0 = (Object)adaptor.becomeRoot(FROM161_tree, root_0);
+                    FROM163_tree = (Object)adaptor.create(FROM163);
+                    root_0 = (Object)adaptor.becomeRoot(FROM163_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(FROM161, DroolsEditorType.KEYWORD);
+                      	emit(FROM163, DroolsEditorType.KEYWORD);
                       			emit(Location.LOCATION_LHS_FROM);	
                     }
-                    // src/main/resources/org/drools/lang/DRL.g:917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
-                    int alt57=4;
+                    // src/main/resources/org/drools/lang/DRL.g:918:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    int alt58=4;
                     switch ( input.LA(1) ) {
                     case ACCUMULATE:
                         {
-                        alt57=1;
+                        alt58=1;
                         }
                         break;
                     case COLLECT:
                         {
-                        alt57=2;
+                        alt58=2;
                         }
                         break;
                     case ID:
                         {
-                        int LA57_3 = input.LA(2);
+                        int LA58_3 = input.LA(2);
 
-                        if ( (LA57_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
-                            alt57=3;
+                        if ( (LA58_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
+                            alt58=3;
                         }
-                        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 ( ((LA58_3>=SEMICOLON && LA58_3<=DOT)||LA58_3==END||(LA58_3>=LEFT_PAREN && LA58_3<=RIGHT_PAREN)||(LA58_3>=DOUBLE_PIPE && LA58_3<=DOUBLE_AMPER)||LA58_3==INIT||LA58_3==THEN) ) {
+                            alt58=4;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 3, input);
+                                new NoViableAltException("918:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 58, 3, input);
 
                             throw nvae;
                         }
@@ -7461,53 +7521,53 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("917:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 0, input);
+                            new NoViableAltException("918:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 58, 0, input);
 
                         throw nvae;
                     }
 
-                    switch (alt57) {
+                    switch (alt58) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:917:14: accumulate_statement
+                            // src/main/resources/org/drools/lang/DRL.g:918:14: accumulate_statement
                             {
-                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2765);
-                            accumulate_statement162=accumulate_statement();
+                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2783);
+                            accumulate_statement164=accumulate_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement162.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement164.getTree());
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:918:15: collect_statement
+                            // src/main/resources/org/drools/lang/DRL.g:919:15: collect_statement
                             {
-                            pushFollow(FOLLOW_collect_statement_in_pattern_source2781);
-                            collect_statement163=collect_statement();
+                            pushFollow(FOLLOW_collect_statement_in_pattern_source2799);
+                            collect_statement165=collect_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement163.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement165.getTree());
 
                             }
                             break;
                         case 3 :
-                            // src/main/resources/org/drools/lang/DRL.g:919:15: entrypoint_statement
+                            // src/main/resources/org/drools/lang/DRL.g:920:15: entrypoint_statement
                             {
-                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2798);
-                            entrypoint_statement164=entrypoint_statement();
+                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2816);
+                            entrypoint_statement166=entrypoint_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement164.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement166.getTree());
 
                             }
                             break;
                         case 4 :
-                            // src/main/resources/org/drools/lang/DRL.g:920:15: from_source
+                            // src/main/resources/org/drools/lang/DRL.g:921:15: from_source
                             {
-                            pushFollow(FOLLOW_from_source_in_pattern_source2814);
-                            from_source165=from_source();
+                            pushFollow(FOLLOW_from_source_in_pattern_source2832);
+                            from_source167=from_source();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source165.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source167.getTree());
 
                             }
                             break;
@@ -7538,7 +7598,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);
@@ -7562,57 +7622,57 @@
     };
 
     // $ANTLR start over_clause
-    // src/main/resources/org/drools/lang/DRL.g:938:1: over_clause : OVER over_elements ( COMMA over_elements )* ;
+    // src/main/resources/org/drools/lang/DRL.g:939: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 OVER166=null;
-        Token COMMA168=null;
-        over_elements_return over_elements167 = null;
-
+        Token OVER168=null;
+        Token COMMA170=null;
         over_elements_return over_elements169 = null;
 
+        over_elements_return over_elements171 = null;
 
-        Object OVER166_tree=null;
-        Object COMMA168_tree=null;
 
+        Object OVER168_tree=null;
+        Object COMMA170_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:940:2: ( OVER over_elements ( COMMA over_elements )* )
+            // src/main/resources/org/drools/lang/DRL.g:940:4: OVER over_elements ( COMMA over_elements )*
             {
             root_0 = (Object)adaptor.nil();
 
-            OVER166=(Token)input.LT(1);
-            match(input,OVER,FOLLOW_OVER_in_over_clause2846); if (failed) return retval;
+            OVER168=(Token)input.LT(1);
+            match(input,OVER,FOLLOW_OVER_in_over_clause2864); if (failed) return retval;
             if ( backtracking==0 ) {
-            OVER166_tree = (Object)adaptor.create(OVER166);
-            root_0 = (Object)adaptor.becomeRoot(OVER166_tree, root_0);
+            OVER168_tree = (Object)adaptor.create(OVER168);
+            root_0 = (Object)adaptor.becomeRoot(OVER168_tree, root_0);
             }
             if ( backtracking==0 ) {
-              	emit(OVER166, DroolsEditorType.KEYWORD);	
+              	emit(OVER168, DroolsEditorType.KEYWORD);	
             }
-            pushFollow(FOLLOW_over_elements_in_over_clause2851);
-            over_elements167=over_elements();
+            pushFollow(FOLLOW_over_elements_in_over_clause2869);
+            over_elements169=over_elements();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements167.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:940:4: ( COMMA over_elements )*
-            loop59:
+            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements169.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:941:4: ( COMMA over_elements )*
+            loop60:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt60=2;
+                int LA60_0 = input.LA(1);
 
-                if ( (LA59_0==COMMA) ) {
-                    int LA59_2 = input.LA(2);
+                if ( (LA60_0==COMMA) ) {
+                    int LA60_2 = input.LA(2);
 
-                    if ( (LA59_2==ID) ) {
-                        int LA59_3 = input.LA(3);
+                    if ( (LA60_2==ID) ) {
+                        int LA60_3 = input.LA(3);
 
-                        if ( (LA59_3==COLON) ) {
-                            alt59=1;
+                        if ( (LA60_3==COLON) ) {
+                            alt60=1;
                         }
 
 
@@ -7622,26 +7682,26 @@
                 }
 
 
-                switch (alt59) {
+                switch (alt60) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:940:5: COMMA over_elements
+            	    // src/main/resources/org/drools/lang/DRL.g:941:5: COMMA over_elements
             	    {
-            	    COMMA168=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2858); if (failed) return retval;
+            	    COMMA170=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2876); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA168, DroolsEditorType.SYMBOL);	
+            	      	emit(COMMA170, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_over_elements_in_over_clause2863);
-            	    over_elements169=over_elements();
+            	    pushFollow(FOLLOW_over_elements_in_over_clause2881);
+            	    over_elements171=over_elements();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements169.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements171.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop60;
                 }
             } while (true);
 
@@ -7671,7 +7731,7 @@
     };
 
     // $ANTLR start over_elements
-    // 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 ) ;
+    // src/main/resources/org/drools/lang/DRL.g:944: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);
@@ -7680,63 +7740,63 @@
 
         Token id1=null;
         Token id2=null;
-        Token COLON170=null;
-        paren_chunk_return paren_chunk171 = null;
+        Token COLON172=null;
+        paren_chunk_return paren_chunk173 = null;
 
 
         Object id1_tree=null;
         Object id2_tree=null;
-        Object COLON170_tree=null;
+        Object COLON172_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: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
+            // src/main/resources/org/drools/lang/DRL.g:945:2: (id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:945:4: id1= ID COLON id2= ID paren_chunk
             {
             id1=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2878); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_over_elements2896); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             if ( backtracking==0 ) {
               	emit(id1, DroolsEditorType.IDENTIFIER);	
             }
-            COLON170=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_over_elements2885); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON170);
+            COLON172=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_over_elements2903); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON172);
 
             if ( backtracking==0 ) {
-              	emit(COLON170, DroolsEditorType.SYMBOL);	
+              	emit(COLON172, DroolsEditorType.SYMBOL);	
             }
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2894); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_over_elements2912); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               	emit(id2, DroolsEditorType.IDENTIFIER);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_over_elements2901);
-            paren_chunk171=paren_chunk();
+            pushFollow(FOLLOW_paren_chunk_in_over_elements2919);
+            paren_chunk173=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk171.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk173.getTree());
 
             // AST REWRITE
             // elements: paren_chunk, id2, id1
-            // token labels: id1, id2
+            // token labels: id2, id1
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
             if ( backtracking==0 ) {
             retval.tree = root_0;
+            RewriteRuleTokenStream stream_id2=new RewriteRuleTokenStream(adaptor,"token id2",id2);
             RewriteRuleTokenStream stream_id1=new RewriteRuleTokenStream(adaptor,"token id1",id1);
-            RewriteRuleTokenStream stream_id2=new RewriteRuleTokenStream(adaptor,"token id2",id2);
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 948:2: -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
+            // 949:2: -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:948:5: ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:949: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);
@@ -7777,75 +7837,75 @@
     };
 
     // $ANTLR start accumulate_statement
-    // 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 ) ;
+    // src/main/resources/org/drools/lang/DRL.g:952: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 ACCUMULATE172=null;
-        Token LEFT_PAREN173=null;
-        Token COMMA175=null;
-        Token RIGHT_PAREN178=null;
-        lhs_or_return lhs_or174 = null;
+        Token ACCUMULATE174=null;
+        Token LEFT_PAREN175=null;
+        Token COMMA177=null;
+        Token RIGHT_PAREN180=null;
+        lhs_or_return lhs_or176 = null;
 
-        accumulate_init_clause_return accumulate_init_clause176 = null;
+        accumulate_init_clause_return accumulate_init_clause178 = null;
 
-        accumulate_id_clause_return accumulate_id_clause177 = null;
+        accumulate_id_clause_return accumulate_id_clause179 = 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");
+        Object ACCUMULATE174_tree=null;
+        Object LEFT_PAREN175_tree=null;
+        Object COMMA177_tree=null;
+        Object RIGHT_PAREN180_tree=null;
         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");
-        RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
+        RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         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: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
+            // src/main/resources/org/drools/lang/DRL.g:953: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:953:4: ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN
             {
-            ACCUMULATE172=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2927); if (failed) return retval;
-            if ( backtracking==0 ) stream_ACCUMULATE.add(ACCUMULATE172);
+            ACCUMULATE174=(Token)input.LT(1);
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2945); if (failed) return retval;
+            if ( backtracking==0 ) stream_ACCUMULATE.add(ACCUMULATE174);
 
             if ( backtracking==0 ) {
-              	emit(ACCUMULATE172, DroolsEditorType.KEYWORD);	
+              	emit(ACCUMULATE174, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE);	
             }
-            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);
+            LEFT_PAREN175=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2954); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN175);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN173, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN175, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2944);
-            lhs_or174=lhs_or();
+            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2962);
+            lhs_or176=lhs_or();
             _fsp--;
             if (failed) return retval;
-            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 ( backtracking==0 ) stream_lhs_or.add(lhs_or176.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:957:3: ( COMMA )?
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( (LA60_0==COMMA) ) {
-                alt60=1;
+            if ( (LA61_0==COMMA) ) {
+                alt61=1;
             }
-            switch (alt60) {
+            switch (alt61) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:956:3: COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:957:3: COMMA
                     {
-                    COMMA175=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2949); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COMMA.add(COMMA175);
+                    COMMA177=(Token)input.LT(1);
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2967); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COMMA.add(COMMA177);
 
 
                     }
@@ -7854,64 +7914,64 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(COMMA175, DroolsEditorType.SYMBOL);	
+              	emit(COMMA177, DroolsEditorType.SYMBOL);	
             }
-            // 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);
+            // src/main/resources/org/drools/lang/DRL.g:958:3: ( accumulate_init_clause | accumulate_id_clause )
+            int alt62=2;
+            int LA62_0 = input.LA(1);
 
-            if ( (LA61_0==INIT) ) {
-                alt61=1;
+            if ( (LA62_0==INIT) ) {
+                alt62=1;
             }
-            else if ( (LA61_0==ID) ) {
-                alt61=2;
+            else if ( (LA62_0==ID) ) {
+                alt62=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("957:3: ( accumulate_init_clause | accumulate_id_clause )", 61, 0, input);
+                    new NoViableAltException("958:3: ( accumulate_init_clause | accumulate_id_clause )", 62, 0, input);
 
                 throw nvae;
             }
-            switch (alt61) {
+            switch (alt62) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:957:5: accumulate_init_clause
+                    // src/main/resources/org/drools/lang/DRL.g:958:5: accumulate_init_clause
                     {
-                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2959);
-                    accumulate_init_clause176=accumulate_init_clause();
+                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2977);
+                    accumulate_init_clause178=accumulate_init_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause176.getTree());
+                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause178.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:958:5: accumulate_id_clause
+                    // src/main/resources/org/drools/lang/DRL.g:959:5: accumulate_id_clause
                     {
-                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2965);
-                    accumulate_id_clause177=accumulate_id_clause();
+                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2983);
+                    accumulate_id_clause179=accumulate_id_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause177.getTree());
+                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause179.getTree());
 
                     }
                     break;
 
             }
 
-            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);
+            RIGHT_PAREN180=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2991); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN180);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN178, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN180, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
 
             // AST REWRITE
-            // elements: accumulate_id_clause, RIGHT_PAREN, accumulate_init_clause, ACCUMULATE, lhs_or
+            // elements: lhs_or, ACCUMULATE, accumulate_id_clause, accumulate_init_clause, RIGHT_PAREN
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7921,21 +7981,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 962:3: -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
+            // 963:3: -> ^( 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 )
+                // src/main/resources/org/drools/lang/DRL.g:963: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:962:26: ( accumulate_init_clause )?
+                // src/main/resources/org/drools/lang/DRL.g:963: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:962:50: ( accumulate_id_clause )?
+                // src/main/resources/org/drools/lang/DRL.g:963:50: ( accumulate_id_clause )?
                 if ( stream_accumulate_id_clause.hasNext() ) {
                     adaptor.addChild(root_1, stream_accumulate_id_clause.next());
 
@@ -7975,7 +8035,7 @@
     };
 
     // $ANTLR start accumulate_init_clause
-    // 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) ) ;
+    // src/main/resources/org/drools/lang/DRL.g:967: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);
@@ -7985,7 +8045,7 @@
         Token cm1=null;
         Token cm2=null;
         Token cm3=null;
-        Token INIT179=null;
+        Token INIT181=null;
         accumulate_paren_chunk_return pc1 = null;
 
         accumulate_paren_chunk_return pc2 = null;
@@ -7996,54 +8056,54 @@
 
         accumulate_paren_chunk_return pc4 = null;
 
-        action_key_return action_key180 = null;
+        action_key_return action_key182 = null;
 
-        reverse_key_return reverse_key181 = null;
+        reverse_key_return reverse_key183 = null;
 
 
         Object cm1_tree=null;
         Object cm2_tree=null;
         Object cm3_tree=null;
-        Object INIT179_tree=null;
+        Object INIT181_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: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]
+            // src/main/resources/org/drools/lang/DRL.g:970: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:970: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]
             {
-            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);
+            INIT181=(Token)input.LT(1);
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause3037); if (failed) return retval;
+            if ( backtracking==0 ) stream_INIT.add(INIT181);
 
             if ( backtracking==0 ) {
-              	emit(INIT179, DroolsEditorType.KEYWORD);	
+              	emit(INIT181, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT);	
             }
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3030);
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3048);
             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:971:84: (cm1= COMMA )?
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:972:84: (cm1= 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:84: cm1= COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:972:84: cm1= COMMA
                     {
                     cm1=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3035); if (failed) return retval;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3053); if (failed) return retval;
                     if ( backtracking==0 ) stream_COMMA.add(cm1);
 
 
@@ -8058,29 +8118,29 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION);	
             }
-            pushFollow(FOLLOW_action_key_in_accumulate_init_clause3046);
-            action_key180=action_key();
+            pushFollow(FOLLOW_action_key_in_accumulate_init_clause3064);
+            action_key182=action_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_action_key.add(action_key180.getTree());
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3050);
+            if ( backtracking==0 ) stream_action_key.add(action_key182.getTree());
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3068);
             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:973:97: (cm2= COMMA )?
-            int alt63=2;
-            int LA63_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:974:97: (cm2= 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:973:97: cm2= COMMA
+                    // src/main/resources/org/drools/lang/DRL.g:974:97: cm2= COMMA
                     {
                     cm2=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3055); if (failed) return retval;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3073); if (failed) return retval;
                     if ( backtracking==0 ) stream_COMMA.add(cm2);
 
 
@@ -8095,36 +8155,36 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE);	
             }
-            // 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) {
+            // src/main/resources/org/drools/lang/DRL.g:977:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?
+            int alt66=2;
+            alt66 = dfa66.predict(input);
+            switch (alt66) {
                 case 1 :
-                    // 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 )?
+                    // src/main/resources/org/drools/lang/DRL.g:977:4: reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )?
                     {
-                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause3068);
-                    reverse_key181=reverse_key();
+                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause3086);
+                    reverse_key183=reverse_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key181.getTree());
-                    pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3072);
+                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key183.getTree());
+                    pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3090);
                     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:976:100: (cm3= COMMA )?
-                    int alt64=2;
-                    int LA64_0 = input.LA(1);
+                    // src/main/resources/org/drools/lang/DRL.g:977:100: (cm3= COMMA )?
+                    int alt65=2;
+                    int LA65_0 = input.LA(1);
 
-                    if ( (LA64_0==COMMA) ) {
-                        alt64=1;
+                    if ( (LA65_0==COMMA) ) {
+                        alt65=1;
                     }
-                    switch (alt64) {
+                    switch (alt65) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:976:100: cm3= COMMA
+                            // src/main/resources/org/drools/lang/DRL.g:977:100: cm3= COMMA
                             {
                             cm3=(Token)input.LT(1);
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3077); if (failed) return retval;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3095); if (failed) return retval;
                             if ( backtracking==0 ) stream_COMMA.add(cm3);
 
 
@@ -8145,7 +8205,7 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	
             }
-            pushFollow(FOLLOW_result_key_in_accumulate_init_clause3092);
+            pushFollow(FOLLOW_result_key_in_accumulate_init_clause3110);
             res1=result_key();
             _fsp--;
             if (failed) return retval;
@@ -8153,35 +8213,35 @@
             if ( backtracking==0 ) {
               	emit(((Token)res1.start), DroolsEditorType.KEYWORD);	
             }
-            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3098);
+            pushFollow(FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3116);
             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: pc3, action_key, pc2, pc1, INIT, pc4, reverse_key, result_key
+            // elements: pc3, action_key, result_key, INIT, pc2, reverse_key, pc1, pc4
             // token labels: 
-            // rule labels: pc2, pc4, pc3, pc1, retval
+            // rule labels: pc4, pc3, retval, pc1, pc2
             // 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_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_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+            RewriteRuleSubtreeStream stream_pc2=new RewriteRuleSubtreeStream(adaptor,"token pc2",pc2!=null?pc2.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 979:2: -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
+            // 980:2: -> ^( 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) )
+                // src/main/resources/org/drools/lang/DRL.g:980: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:979:33: ^( INIT $pc1)
+                // src/main/resources/org/drools/lang/DRL.g:980:33: ^( INIT $pc1)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_INIT.next(), root_2);
@@ -8190,7 +8250,7 @@
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // src/main/resources/org/drools/lang/DRL.g:979:46: ^( action_key $pc2)
+                // src/main/resources/org/drools/lang/DRL.g:980:46: ^( action_key $pc2)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_action_key.nextNode(), root_2);
@@ -8199,9 +8259,9 @@
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // src/main/resources/org/drools/lang/DRL.g:979:65: ( ^( reverse_key $pc3) )?
+                // src/main/resources/org/drools/lang/DRL.g:980:65: ( ^( reverse_key $pc3) )?
                 if ( stream_pc3.hasNext()||stream_reverse_key.hasNext() ) {
-                    // src/main/resources/org/drools/lang/DRL.g:979:65: ^( reverse_key $pc3)
+                    // src/main/resources/org/drools/lang/DRL.g:980:65: ^( reverse_key $pc3)
                     {
                     Object root_2 = (Object)adaptor.nil();
                     root_2 = (Object)adaptor.becomeRoot(stream_reverse_key.nextNode(), root_2);
@@ -8214,7 +8274,7 @@
                 }
                 stream_pc3.reset();
                 stream_reverse_key.reset();
-                // src/main/resources/org/drools/lang/DRL.g:979:86: ^( result_key $pc4)
+                // src/main/resources/org/drools/lang/DRL.g:980:86: ^( result_key $pc4)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_result_key.nextNode(), root_2);
@@ -8269,7 +8329,7 @@
     };
 
     // $ANTLR start accumulate_paren_chunk
-    // 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] ;
+    // src/main/resources/org/drools/lang/DRL.g:993: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);
@@ -8280,14 +8340,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: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]
+            // src/main/resources/org/drools/lang/DRL.g:996:3: (pc= accumulate_paren_chunk_data[false,$locationType] -> VT_PAREN_CHUNK[$pc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:996:5: pc= accumulate_paren_chunk_data[false,$locationType]
             {
-            pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3156);
+            pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3174);
             pc=accumulate_paren_chunk_data(false, locationType);
             _fsp--;
             if (failed) return retval;
@@ -8307,7 +8367,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 996:2: -> VT_PAREN_CHUNK[$pc.start,text]
+            // 997:2: -> VT_PAREN_CHUNK[$pc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_PAREN_CHUNK, ((Token)pc.start), text));
 
@@ -8340,7 +8400,7 @@
     };
 
     // $ANTLR start accumulate_paren_chunk_data
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1000: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);
@@ -8350,7 +8410,7 @@
         Token lp1=null;
         Token any=null;
         Token rp1=null;
-        accumulate_paren_chunk_data_return accumulate_paren_chunk_data182 = null;
+        accumulate_paren_chunk_data_return accumulate_paren_chunk_data184 = null;
 
 
         Object lp1_tree=null;
@@ -8358,13 +8418,13 @@
         Object rp1_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1001: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:1001: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_data3180); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3198); if (failed) return retval;
             if ( backtracking==0 ) {
             lp1_tree = (Object)adaptor.create(lp1);
             adaptor.addChild(root_0, lp1_tree);
@@ -8378,23 +8438,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1008:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )*
-            loop66:
+            // src/main/resources/org/drools/lang/DRL.g:1009:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | accumulate_paren_chunk_data[true,-1] )*
+            loop67:
             do {
-                int alt66=3;
-                int LA66_0 = input.LA(1);
+                int alt67=3;
+                int LA67_0 = input.LA(1);
 
-                if ( ((LA66_0>=VT_COMPILATION_UNIT && LA66_0<=STRING)||LA66_0==COMMA||(LA66_0>=AT && LA66_0<=MULTI_LINE_COMMENT)) ) {
-                    alt66=1;
+                if ( ((LA67_0>=VT_COMPILATION_UNIT && LA67_0<=STRING)||LA67_0==COMMA||(LA67_0>=AT && LA67_0<=MULTI_LINE_COMMENT)) ) {
+                    alt67=1;
                 }
-                else if ( (LA66_0==LEFT_PAREN) ) {
-                    alt66=2;
+                else if ( (LA67_0==LEFT_PAREN) ) {
+                    alt67=2;
                 }
 
 
-                switch (alt66) {
+                switch (alt67) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1008:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // src/main/resources/org/drools/lang/DRL.g:1009: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) ) {
@@ -8406,7 +8466,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_accumulate_paren_chunk_data3192);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_accumulate_paren_chunk_data3210);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -8416,24 +8476,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1008:87: accumulate_paren_chunk_data[true,-1]
+            	    // src/main/resources/org/drools/lang/DRL.g:1009:87: 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);
+            	    pushFollow(FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3226);
+            	    accumulate_paren_chunk_data184=accumulate_paren_chunk_data(true, -1);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_paren_chunk_data182.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_paren_chunk_data184.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop66;
+            	    break loop67;
                 }
             } while (true);
 
             rp1=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3219); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3237); if (failed) return retval;
             if ( backtracking==0 ) {
             rp1_tree = (Object)adaptor.create(rp1);
             adaptor.addChild(root_0, rp1_tree);
@@ -8472,39 +8532,39 @@
     };
 
     // $ANTLR start accumulate_id_clause
-    // src/main/resources/org/drools/lang/DRL.g:1018:1: accumulate_id_clause : ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1019: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 ID183=null;
-        paren_chunk_return paren_chunk184 = null;
+        Token ID185=null;
+        paren_chunk_return paren_chunk186 = null;
 
 
-        Object ID183_tree=null;
+        Object ID185_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: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
+            // src/main/resources/org/drools/lang/DRL.g:1020:2: ( ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:1020:4: ID paren_chunk
             {
-            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);
+            ID185=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accumulate_id_clause3253); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID185);
 
             if ( backtracking==0 ) {
-              	emit(ID183, DroolsEditorType.IDENTIFIER);	
+              	emit(ID185, DroolsEditorType.IDENTIFIER);	
             }
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause3241);
-            paren_chunk184=paren_chunk();
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause3259);
+            paren_chunk186=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk184.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk186.getTree());
 
             // AST REWRITE
-            // elements: paren_chunk, ID
+            // elements: ID, paren_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8514,9 +8574,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1021:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+            // 1022:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1021:5: ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+                // src/main/resources/org/drools/lang/DRL.g:1022: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);
@@ -8556,65 +8616,65 @@
     };
 
     // $ANTLR start collect_statement
-    // src/main/resources/org/drools/lang/DRL.g:1024:1: collect_statement : COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1025: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 COLLECT185=null;
-        Token LEFT_PAREN186=null;
-        Token RIGHT_PAREN188=null;
-        pattern_source_return pattern_source187 = null;
+        Token COLLECT187=null;
+        Token LEFT_PAREN188=null;
+        Token RIGHT_PAREN190=null;
+        pattern_source_return pattern_source189 = null;
 
 
-        Object COLLECT185_tree=null;
-        Object LEFT_PAREN186_tree=null;
-        Object RIGHT_PAREN188_tree=null;
+        Object COLLECT187_tree=null;
+        Object LEFT_PAREN188_tree=null;
+        Object RIGHT_PAREN190_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: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
+            // src/main/resources/org/drools/lang/DRL.g:1026:2: ( COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:1026:4: COLLECT LEFT_PAREN pattern_source RIGHT_PAREN
             {
-            COLLECT185=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3263); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLLECT.add(COLLECT185);
+            COLLECT187=(Token)input.LT(1);
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3281); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLLECT.add(COLLECT187);
 
             if ( backtracking==0 ) {
-              	emit(COLLECT185, DroolsEditorType.KEYWORD);	
+              	emit(COLLECT187, DroolsEditorType.KEYWORD);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_COLLECT);	
             }
-            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);
+            LEFT_PAREN188=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3290); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN188);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN186, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN188, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_pattern_source_in_collect_statement3279);
-            pattern_source187=pattern_source();
+            pushFollow(FOLLOW_pattern_source_in_collect_statement3297);
+            pattern_source189=pattern_source();
             _fsp--;
             if (failed) return retval;
-            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 ) stream_pattern_source.add(pattern_source189.getTree());
+            RIGHT_PAREN190=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3302); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN190);
 
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN188, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN190, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
 
             // AST REWRITE
-            // elements: COLLECT, RIGHT_PAREN, pattern_source
+            // elements: COLLECT, pattern_source, RIGHT_PAREN
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8624,9 +8684,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1031:2: -> ^( COLLECT pattern_source RIGHT_PAREN )
+            // 1032:2: -> ^( COLLECT pattern_source RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1031:5: ^( COLLECT pattern_source RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:1032:5: ^( COLLECT pattern_source RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_COLLECT.next(), root_1);
@@ -8666,43 +8726,43 @@
     };
 
     // $ANTLR start entrypoint_statement
-    // src/main/resources/org/drools/lang/DRL.g:1034:1: entrypoint_statement : entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1035: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_key189 = null;
+        entry_point_key_return entry_point_key191 = null;
 
-        entrypoint_id_return entrypoint_id190 = null;
+        entrypoint_id_return entrypoint_id192 = 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: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
+            // src/main/resources/org/drools/lang/DRL.g:1036:2: ( entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) )
+            // src/main/resources/org/drools/lang/DRL.g:1036:4: entry_point_key entrypoint_id
             {
-            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement3311);
-            entry_point_key189=entry_point_key();
+            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement3329);
+            entry_point_key191=entry_point_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key189.getTree());
+            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key191.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_FROM_COLLECT);	
             }
-            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement3319);
-            entrypoint_id190=entrypoint_id();
+            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement3337);
+            entrypoint_id192=entrypoint_id();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id190.getTree());
+            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id192.getTree());
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
             }
 
             // AST REWRITE
-            // elements: entrypoint_id, entry_point_key
+            // elements: entry_point_key, entrypoint_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8712,9 +8772,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1039:2: -> ^( entry_point_key entrypoint_id )
+            // 1040:2: -> ^( entry_point_key entrypoint_id )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1039:5: ^( entry_point_key entrypoint_id )
+                // src/main/resources/org/drools/lang/DRL.g:1040:5: ^( entry_point_key entrypoint_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_entry_point_key.nextNode(), root_1);
@@ -8753,7 +8813,7 @@
     };
 
     // $ANTLR start entrypoint_id
-    // src/main/resources/org/drools/lang/DRL.g:1042:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );
+    // src/main/resources/org/drools/lang/DRL.g:1043: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);
@@ -8763,33 +8823,33 @@
         Token value=null;
 
         Object value_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_STRING=new RewriteRuleTokenStream(adaptor,"token STRING");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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);
+            // src/main/resources/org/drools/lang/DRL.g:1044:2: (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] )
+            int alt68=2;
+            int LA68_0 = input.LA(1);
 
-            if ( (LA67_0==ID) ) {
-                alt67=1;
+            if ( (LA68_0==ID) ) {
+                alt68=1;
             }
-            else if ( (LA67_0==STRING) ) {
-                alt67=2;
+            else if ( (LA68_0==STRING) ) {
+                alt68=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1042:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 67, 0, input);
+                    new NoViableAltException("1043:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 68, 0, input);
 
                 throw nvae;
             }
-            switch (alt67) {
+            switch (alt68) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1043:5: value= ID
+                    // src/main/resources/org/drools/lang/DRL.g:1044:5: value= ID
                     {
                     value=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_entrypoint_id3345); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_entrypoint_id3363); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(value);
 
                     if ( backtracking==0 ) {
@@ -8807,7 +8867,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]
+                    // 1045:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8818,10 +8878,10 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1045:5: value= STRING
+                    // src/main/resources/org/drools/lang/DRL.g:1046:5: value= STRING
                     {
                     value=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id3362); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id3380); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(value);
 
                     if ( backtracking==0 ) {
@@ -8839,7 +8899,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1046:3: -> VT_ENTRYPOINT_ID[$value]
+                    // 1047:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8874,42 +8934,42 @@
     };
 
     // $ANTLR start from_source
-    // 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 )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1050: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 ID191=null;
+        Token ID193=null;
         paren_chunk_return args = null;
 
-        expression_chain_return expression_chain192 = null;
+        expression_chain_return expression_chain194 = null;
 
 
-        Object ID191_tree=null;
+        Object ID193_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
+        RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_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: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 )?
+            // src/main/resources/org/drools/lang/DRL.g:1051: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:1051:4: ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )?
             {
-            ID191=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_source3382); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID191);
+            ID193=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_from_source3400); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID193);
 
             if ( backtracking==0 ) {
-              	emit(ID191, DroolsEditorType.IDENTIFIER);	
+              	emit(ID193, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1051:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
-            int alt68=2;
-            alt68 = dfa68.predict(input);
-            switch (alt68) {
+            // src/main/resources/org/drools/lang/DRL.g:1052:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
+            int alt69=2;
+            alt69 = dfa69.predict(input);
+            switch (alt69) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1051:5: ( LEFT_PAREN )=>args= paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1052:5: ( LEFT_PAREN )=>args= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source3397);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source3415);
                     args=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
@@ -8920,22 +8980,22 @@
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1052:3: ( expression_chain )?
-            int alt69=2;
-            int LA69_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1053:3: ( expression_chain )?
+            int alt70=2;
+            int LA70_0 = input.LA(1);
 
-            if ( (LA69_0==DOT) ) {
-                alt69=1;
+            if ( (LA70_0==DOT) ) {
+                alt70=1;
             }
-            switch (alt69) {
+            switch (alt70) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1052:3: expression_chain
+                    // src/main/resources/org/drools/lang/DRL.g:1053:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source3404);
-                    expression_chain192=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_from_source3422);
+                    expression_chain194=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain192.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain194.getTree());
 
                     }
                     break;
@@ -8951,7 +9011,7 @@
             }
 
             // AST REWRITE
-            // elements: ID, expression_chain, paren_chunk
+            // elements: paren_chunk, ID, expression_chain
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8961,21 +9021,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1058:2: -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
+            // 1059:2: -> ^( 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 )? )
+                // src/main/resources/org/drools/lang/DRL.g:1059: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:1058:25: ( paren_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1059: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:1058:38: ( expression_chain )?
+                // src/main/resources/org/drools/lang/DRL.g:1059:38: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -9014,68 +9074,68 @@
     };
 
     // $ANTLR start 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 )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1062: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 DOT193=null;
-        Token ID194=null;
-        paren_chunk_return paren_chunk195 = null;
+        Token DOT195=null;
+        Token ID196=null;
+        paren_chunk_return paren_chunk197 = null;
 
-        square_chunk_return square_chunk196 = null;
+        square_chunk_return square_chunk198 = null;
 
-        expression_chain_return expression_chain197 = null;
+        expression_chain_return expression_chain199 = null;
 
 
-        Object DOT193_tree=null;
-        Object ID194_tree=null;
+        Object DOT195_tree=null;
+        Object ID196_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: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 )?
+            // src/main/resources/org/drools/lang/DRL.g:1063: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:1064:3: DOT ID ({...}? paren_chunk | square_chunk )? ( expression_chain )?
             {
-            DOT193=(Token)input.LT(1);
-            match(input,DOT,FOLLOW_DOT_in_expression_chain3437); if (failed) return retval;
-            if ( backtracking==0 ) stream_DOT.add(DOT193);
+            DOT195=(Token)input.LT(1);
+            match(input,DOT,FOLLOW_DOT_in_expression_chain3455); if (failed) return retval;
+            if ( backtracking==0 ) stream_DOT.add(DOT195);
 
             if ( backtracking==0 ) {
-              	emit(DOT193, DroolsEditorType.IDENTIFIER);	
+              	emit(DOT195, DroolsEditorType.IDENTIFIER);	
             }
-            ID194=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_expression_chain3444); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID194);
+            ID196=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_expression_chain3462); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID196);
 
             if ( backtracking==0 ) {
-              	emit(ID194, DroolsEditorType.IDENTIFIER);	
+              	emit(ID196, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1065:4: ({...}? paren_chunk | square_chunk )?
-            int alt70=3;
-            int LA70_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1066:4: ({...}? paren_chunk | square_chunk )?
+            int alt71=3;
+            int LA71_0 = input.LA(1);
 
-            if ( (LA70_0==LEFT_PAREN) ) {
+            if ( (LA71_0==LEFT_PAREN) ) {
                 switch ( input.LA(2) ) {
                     case LEFT_PAREN:
                         {
-                        int LA70_4 = input.LA(3);
+                        int LA71_4 = input.LA(3);
 
                         if ( (input.LA(1) == LEFT_PAREN) ) {
-                            alt70=1;
+                            alt71=1;
                         }
                         }
                         break;
                     case ID:
                         {
-                        int LA70_5 = input.LA(3);
+                        int LA71_5 = input.LA(3);
 
                         if ( (input.LA(1) == LEFT_PAREN) ) {
-                            alt70=1;
+                            alt71=1;
                         }
                         }
                         break;
@@ -9134,6 +9194,7 @@
                     case VK_ENABLED:
                     case VK_ATTRIBUTES:
                     case VK_RULE:
+                    case VK_EXTEND:
                     case VK_IMPORT:
                     case VK_PACKAGE:
                     case VK_TEMPLATE:
@@ -9203,61 +9264,61 @@
                     case C_STYLE_SINGLE_LINE_COMMENT:
                     case MULTI_LINE_COMMENT:
                         {
-                        alt70=1;
+                        alt71=1;
                         }
                         break;
                 }
 
             }
-            else if ( (LA70_0==LEFT_SQUARE) ) {
-                alt70=2;
+            else if ( (LA71_0==LEFT_SQUARE) ) {
+                alt71=2;
             }
-            switch (alt70) {
+            switch (alt71) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1066:6: {...}? paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1067: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_chain3460);
-                    paren_chunk195=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3478);
+                    paren_chunk197=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk195.getTree());
+                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk197.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1068:6: square_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1069:6: square_chunk
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain3474);
-                    square_chunk196=square_chunk();
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain3492);
+                    square_chunk198=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk196.getTree());
+                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk198.getTree());
 
                     }
                     break;
 
             }
 
-            // src/main/resources/org/drools/lang/DRL.g:1070:4: ( expression_chain )?
-            int alt71=2;
-            int LA71_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1071:4: ( expression_chain )?
+            int alt72=2;
+            int LA72_0 = input.LA(1);
 
-            if ( (LA71_0==DOT) ) {
-                alt71=1;
+            if ( (LA72_0==DOT) ) {
+                alt72=1;
             }
-            switch (alt71) {
+            switch (alt72) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1070:4: expression_chain
+                    // src/main/resources/org/drools/lang/DRL.g:1071:4: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain3485);
-                    expression_chain197=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain3503);
+                    expression_chain199=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain197.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain199.getTree());
 
                     }
                     break;
@@ -9266,7 +9327,7 @@
 
 
             // AST REWRITE
-            // elements: ID, paren_chunk, square_chunk, expression_chain
+            // elements: ID, paren_chunk, expression_chain, square_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9276,27 +9337,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1071:4: -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
+            // 1072:4: -> ^( 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 )? )
+                // src/main/resources/org/drools/lang/DRL.g:1072: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, DOT193), root_1);
+                root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_EXPRESSION_CHAIN, DOT195), root_1);
 
                 adaptor.addChild(root_1, stream_ID.next());
-                // src/main/resources/org/drools/lang/DRL.g:1071:38: ( square_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1072: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:1071:52: ( paren_chunk )?
+                // src/main/resources/org/drools/lang/DRL.g:1072: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:1071:65: ( expression_chain )?
+                // src/main/resources/org/drools/lang/DRL.g:1072:65: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -9335,38 +9396,38 @@
     };
 
     // $ANTLR start lhs_pattern
-    // src/main/resources/org/drools/lang/DRL.g:1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );
+    // src/main/resources/org/drools/lang/DRL.g:1075: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_binding198 = null;
+        fact_binding_return fact_binding200 = null;
 
-        fact_return fact199 = null;
+        fact_return fact201 = 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:1075:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1076:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
+            int alt73=2;
+            int LA73_0 = input.LA(1);
 
-            if ( (LA72_0==ID) ) {
-                int LA72_1 = input.LA(2);
+            if ( (LA73_0==ID) ) {
+                int LA73_1 = input.LA(2);
 
-                if ( (LA72_1==COLON) ) {
-                    alt72=1;
+                if ( (LA73_1==COLON) ) {
+                    alt73=1;
                 }
-                else if ( (LA72_1==DOT||LA72_1==LEFT_PAREN||LA72_1==LEFT_SQUARE) ) {
-                    alt72=2;
+                else if ( (LA73_1==DOT||LA73_1==LEFT_PAREN||LA73_1==LEFT_SQUARE) ) {
+                    alt73=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 72, 1, input);
+                        new NoViableAltException("1075:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 73, 1, input);
 
                     throw nvae;
                 }
@@ -9374,19 +9435,19 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1074:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 72, 0, input);
+                    new NoViableAltException("1075:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 73, 0, input);
 
                 throw nvae;
             }
-            switch (alt72) {
+            switch (alt73) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1075:4: fact_binding
+                    // src/main/resources/org/drools/lang/DRL.g:1076:4: fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3518);
-                    fact_binding198=fact_binding();
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3536);
+                    fact_binding200=fact_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding198.getTree());
+                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding200.getTree());
 
                     // AST REWRITE
                     // elements: fact_binding
@@ -9399,9 +9460,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1075:17: -> ^( VT_PATTERN fact_binding )
+                    // 1076:17: -> ^( VT_PATTERN fact_binding )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1075:20: ^( VT_PATTERN fact_binding )
+                        // src/main/resources/org/drools/lang/DRL.g:1076:20: ^( VT_PATTERN fact_binding )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -9418,13 +9479,13 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1076:4: fact
+                    // src/main/resources/org/drools/lang/DRL.g:1077:4: fact
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern3531);
-                    fact199=fact();
+                    pushFollow(FOLLOW_fact_in_lhs_pattern3549);
+                    fact201=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact199.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact201.getTree());
 
                     // AST REWRITE
                     // elements: fact
@@ -9437,9 +9498,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1076:9: -> ^( VT_PATTERN fact )
+                    // 1077:9: -> ^( VT_PATTERN fact )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1076:12: ^( VT_PATTERN fact )
+                        // src/main/resources/org/drools/lang/DRL.g:1077:12: ^( VT_PATTERN fact )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -9480,88 +9541,88 @@
     };
 
     // $ANTLR start fact_binding
-    // 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 )? ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1080: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_PAREN202=null;
-        Token RIGHT_PAREN204=null;
-        label_return label200 = null;
+        Token LEFT_PAREN204=null;
+        Token RIGHT_PAREN206=null;
+        label_return label202 = null;
 
-        fact_return fact201 = null;
+        fact_return fact203 = null;
 
-        fact_binding_expression_return fact_binding_expression203 = null;
+        fact_binding_expression_return fact_binding_expression205 = null;
 
 
-        Object LEFT_PAREN202_tree=null;
-        Object RIGHT_PAREN204_tree=null;
+        Object LEFT_PAREN204_tree=null;
+        Object RIGHT_PAREN206_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
+        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");
-        RewriteRuleSubtreeStream stream_fact_binding_expression=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding_expression");
-        RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
         try {
-            // 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 )
+            // src/main/resources/org/drools/lang/DRL.g:1081: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:1081:5: label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
             {
-            pushFollow(FOLLOW_label_in_fact_binding3551);
-            label200=label();
+            pushFollow(FOLLOW_label_in_fact_binding3569);
+            label202=label();
             _fsp--;
             if (failed) return retval;
-            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 ( backtracking==0 ) stream_label.add(label202.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1082:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
+            int alt74=2;
+            int LA74_0 = input.LA(1);
 
-            if ( (LA73_0==ID) ) {
-                alt73=1;
+            if ( (LA74_0==ID) ) {
+                alt74=1;
             }
-            else if ( (LA73_0==LEFT_PAREN) ) {
-                alt73=2;
+            else if ( (LA74_0==LEFT_PAREN) ) {
+                alt74=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1081:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 73, 0, input);
+                    new NoViableAltException("1082:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 74, 0, input);
 
                 throw nvae;
             }
-            switch (alt73) {
+            switch (alt74) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1081:5: fact
+                    // src/main/resources/org/drools/lang/DRL.g:1082:5: fact
                     {
-                    pushFollow(FOLLOW_fact_in_fact_binding3557);
-                    fact201=fact();
+                    pushFollow(FOLLOW_fact_in_fact_binding3575);
+                    fact203=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact201.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact203.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1082:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1083:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
                     {
-                    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);
+                    LEFT_PAREN204=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3582); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN204);
 
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN202, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN204, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding3572);
-                    fact_binding_expression203=fact_binding_expression();
+                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding3590);
+                    fact_binding_expression205=fact_binding_expression();
                     _fsp--;
                     if (failed) return retval;
-                    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 ) stream_fact_binding_expression.add(fact_binding_expression205.getTree());
+                    RIGHT_PAREN206=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3598); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN206);
 
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN204, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN206, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -9571,7 +9632,7 @@
 
 
             // AST REWRITE
-            // elements: label, RIGHT_PAREN, fact, fact_binding_expression
+            // elements: label, RIGHT_PAREN, fact_binding_expression, fact
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9581,27 +9642,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1086:3: -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
+            // 1087:3: -> ^( 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 )? )
+                // src/main/resources/org/drools/lang/DRL.g:1087: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:1086:30: ( fact )?
+                // src/main/resources/org/drools/lang/DRL.g:1087:30: ( fact )?
                 if ( stream_fact.hasNext() ) {
                     adaptor.addChild(root_1, stream_fact.next());
 
                 }
                 stream_fact.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1086:36: ( fact_binding_expression )?
+                // src/main/resources/org/drools/lang/DRL.g:1087: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:1086:61: ( RIGHT_PAREN )?
+                // src/main/resources/org/drools/lang/DRL.g:1087:61: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -9640,7 +9701,7 @@
     };
 
     // $ANTLR start fact_binding_expression
-    // 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 ) )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1090: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);
@@ -9650,30 +9711,30 @@
         Token pipe=null;
         or_key_return value = null;
 
-        fact_return fact205 = null;
+        fact_return fact207 = null;
 
-        fact_return fact206 = null;
+        fact_return fact208 = null;
 
 
         Object pipe_tree=null;
         RewriteRuleTokenStream stream_DOUBLE_PIPE=new RewriteRuleTokenStream(adaptor,"token DOUBLE_PIPE");
+        RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
         RewriteRuleSubtreeStream stream_or_key=new RewriteRuleSubtreeStream(adaptor,"rule or_key");
-        RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
-        
+
         	Token orToken = null;
 
         try {
-            // 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:1093: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:1093: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:5: ( fact -> fact )
-            // src/main/resources/org/drools/lang/DRL.g:1092:6: fact
+            // src/main/resources/org/drools/lang/DRL.g:1093:5: ( fact -> fact )
+            // src/main/resources/org/drools/lang/DRL.g:1093:6: fact
             {
-            pushFollow(FOLLOW_fact_in_fact_binding_expression3621);
-            fact205=fact();
+            pushFollow(FOLLOW_fact_in_fact_binding_expression3639);
+            fact207=fact();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact.add(fact205.getTree());
+            if ( backtracking==0 ) stream_fact.add(fact207.getTree());
 
             // AST REWRITE
             // elements: fact
@@ -9686,7 +9747,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1092:11: -> fact
+            // 1093:11: -> fact
             {
                 adaptor.addChild(root_0, stream_fact.next());
 
@@ -9696,46 +9757,46 @@
 
             }
 
-            // 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:
+            // src/main/resources/org/drools/lang/DRL.g:1093:20: ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
+            loop76:
             do {
-                int alt75=2;
-                int LA75_0 = input.LA(1);
+                int alt76=2;
+                int LA76_0 = input.LA(1);
 
-                if ( (LA75_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    alt75=1;
+                if ( (LA76_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    alt76=1;
                 }
-                else if ( (LA75_0==DOUBLE_PIPE) ) {
-                    alt75=1;
+                else if ( (LA76_0==DOUBLE_PIPE) ) {
+                    alt76=1;
                 }
 
 
-                switch (alt75) {
+                switch (alt76) {
             	case 1 :
-            	    // 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:1093:22: (value= or_key | pipe= DOUBLE_PIPE ) fact
             	    {
-            	    // 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);
+            	    // src/main/resources/org/drools/lang/DRL.g:1093:22: (value= or_key | pipe= DOUBLE_PIPE )
+            	    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=2;
+            	    else if ( (LA75_0==DOUBLE_PIPE) ) {
+            	        alt75=2;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("1092:22: (value= or_key | pipe= DOUBLE_PIPE )", 74, 0, input);
+            	            new NoViableAltException("1093:22: (value= or_key | pipe= DOUBLE_PIPE )", 75, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt74) {
+            	    switch (alt75) {
             	        case 1 :
-            	            // src/main/resources/org/drools/lang/DRL.g:1092:23: value= or_key
+            	            // src/main/resources/org/drools/lang/DRL.g:1093:23: value= or_key
             	            {
-            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3633);
+            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3651);
             	            value=or_key();
             	            _fsp--;
             	            if (failed) return retval;
@@ -9747,10 +9808,10 @@
             	            }
             	            break;
             	        case 2 :
-            	            // src/main/resources/org/drools/lang/DRL.g:1092:62: pipe= DOUBLE_PIPE
+            	            // src/main/resources/org/drools/lang/DRL.g:1093:62: pipe= DOUBLE_PIPE
             	            {
             	            pipe=(Token)input.LT(1);
-            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3639); if (failed) return retval;
+            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3657); if (failed) return retval;
             	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
             	            if ( backtracking==0 ) {
@@ -9762,11 +9823,11 @@
 
             	    }
 
-            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3644);
-            	    fact206=fact();
+            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3662);
+            	    fact208=fact();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_fact.add(fact206.getTree());
+            	    if ( backtracking==0 ) stream_fact.add(fact208.getTree());
 
             	    // AST REWRITE
             	    // elements: fact, fact_binding_expression
@@ -9779,9 +9840,9 @@
             	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             	    root_0 = (Object)adaptor.nil();
-            	    // 1093:3: -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
+            	    // 1094:3: -> ^( 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 )
+            	        // src/main/resources/org/drools/lang/DRL.g:1094: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);
@@ -9800,7 +9861,7 @@
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop76;
                 }
             } while (true);
 
@@ -9830,84 +9891,84 @@
     };
 
     // $ANTLR start fact
-    // 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 ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1097: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_PAREN208=null;
-        Token RIGHT_PAREN210=null;
-        pattern_type_return pattern_type207 = null;
+        Token LEFT_PAREN210=null;
+        Token RIGHT_PAREN212=null;
+        pattern_type_return pattern_type209 = null;
 
-        constraints_return constraints209 = null;
+        constraints_return constraints211 = null;
 
 
-        Object LEFT_PAREN208_tree=null;
-        Object RIGHT_PAREN210_tree=null;
+        Object LEFT_PAREN210_tree=null;
+        Object RIGHT_PAREN212_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
+        RewriteRuleSubtreeStream stream_constraints=new RewriteRuleSubtreeStream(adaptor,"rule constraints");
         RewriteRuleSubtreeStream stream_pattern_type=new RewriteRuleSubtreeStream(adaptor,"rule pattern_type");
-        RewriteRuleSubtreeStream stream_constraints=new RewriteRuleSubtreeStream(adaptor,"rule constraints");
          boolean isFailedOnConstraints = true; pushParaphrases(DroolsParaphraseTypes.PATTERN); 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1100:2: ( pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) )
+            // src/main/resources/org/drools/lang/DRL.g:1100:4: pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN
             {
-            pushFollow(FOLLOW_pattern_type_in_fact3684);
-            pattern_type207=pattern_type();
+            pushFollow(FOLLOW_pattern_type_in_fact3702);
+            pattern_type209=pattern_type();
             _fsp--;
             if (failed) return retval;
-            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 ) stream_pattern_type.add(pattern_type209.getTree());
+            LEFT_PAREN210=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3707); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN210);
 
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN208, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN210, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1102:4: ( constraints )?
-            int alt76=2;
-            int LA76_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1103:4: ( constraints )?
+            int alt77=2;
+            int LA77_0 = input.LA(1);
 
-            if ( (LA76_0==ID||LA76_0==LEFT_PAREN) ) {
-                alt76=1;
+            if ( (LA77_0==ID||LA77_0==LEFT_PAREN) ) {
+                alt77=1;
             }
-            switch (alt76) {
+            switch (alt77) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1102:4: constraints
+                    // src/main/resources/org/drools/lang/DRL.g:1103:4: constraints
                     {
-                    pushFollow(FOLLOW_constraints_in_fact3700);
-                    constraints209=constraints();
+                    pushFollow(FOLLOW_constraints_in_fact3718);
+                    constraints211=constraints();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_constraints.add(constraints209.getTree());
+                    if ( backtracking==0 ) stream_constraints.add(constraints211.getTree());
 
                     }
                     break;
 
             }
 
-            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);
+            RIGHT_PAREN212=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3724); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN212);
 
             if ( backtracking==0 ) {
               	isFailedOnConstraints = false;	
             }
             if ( backtracking==0 ) {
-              	if (RIGHT_PAREN210.getText().equals(")") ){ //WORKAROUND FOR ANTLR BUG!
-              			emit(RIGHT_PAREN210, DroolsEditorType.SYMBOL);
+              	if (RIGHT_PAREN212.getText().equals(")") ){ //WORKAROUND FOR ANTLR BUG!
+              			emit(RIGHT_PAREN212, DroolsEditorType.SYMBOL);
               			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
               		}	
             }
 
             // AST REWRITE
-            // elements: constraints, RIGHT_PAREN, pattern_type
+            // elements: pattern_type, RIGHT_PAREN, constraints
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9917,15 +9978,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1108:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+            // 1109:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1108:5: ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+                // src/main/resources/org/drools/lang/DRL.g:1109: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:1108:28: ( constraints )?
+                // src/main/resources/org/drools/lang/DRL.g:1109:28: ( constraints )?
                 if ( stream_constraints.hasNext() ) {
                     adaptor.addChild(root_1, stream_constraints.next());
 
@@ -9957,7 +10018,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);
@@ -9975,64 +10036,64 @@
     };
 
     // $ANTLR start constraints
-    // src/main/resources/org/drools/lang/DRL.g:1118:1: constraints : constraint ( COMMA constraint )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1119: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 COMMA212=null;
-        constraint_return constraint211 = null;
-
+        Token COMMA214=null;
         constraint_return constraint213 = null;
 
+        constraint_return constraint215 = null;
 
-        Object COMMA212_tree=null;
 
+        Object COMMA214_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1120:2: ( constraint ( COMMA constraint )* )
+            // src/main/resources/org/drools/lang/DRL.g:1120:4: constraint ( COMMA constraint )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_in_constraints3740);
-            constraint211=constraint();
+            pushFollow(FOLLOW_constraint_in_constraints3758);
+            constraint213=constraint();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, constraint211.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1119:15: ( COMMA constraint )*
-            loop77:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint213.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1120:15: ( COMMA constraint )*
+            loop78:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
+                int alt78=2;
+                int LA78_0 = input.LA(1);
 
-                if ( (LA77_0==COMMA) ) {
-                    alt77=1;
+                if ( (LA78_0==COMMA) ) {
+                    alt78=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt78) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1119:17: COMMA constraint
+            	    // src/main/resources/org/drools/lang/DRL.g:1120:17: COMMA constraint
             	    {
-            	    COMMA212=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3744); if (failed) return retval;
+            	    COMMA214=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3762); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA212, DroolsEditorType.SYMBOL);
+            	      	emit(COMMA214, DroolsEditorType.SYMBOL);
             	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
             	    }
-            	    pushFollow(FOLLOW_constraint_in_constraints3751);
-            	    constraint213=constraint();
+            	    pushFollow(FOLLOW_constraint_in_constraints3769);
+            	    constraint215=constraint();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint213.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint215.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop78;
                 }
             } while (true);
 
@@ -10062,28 +10123,28 @@
     };
 
     // $ANTLR start constraint
-    // src/main/resources/org/drools/lang/DRL.g:1124:1: constraint : or_constr ;
+    // src/main/resources/org/drools/lang/DRL.g:1125: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_constr214 = null;
+        or_constr_return or_constr216 = null;
 
 
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1125:2: ( or_constr )
-            // src/main/resources/org/drools/lang/DRL.g:1125:4: or_constr
+            // src/main/resources/org/drools/lang/DRL.g:1126:2: ( or_constr )
+            // src/main/resources/org/drools/lang/DRL.g:1126:4: or_constr
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_or_constr_in_constraint3765);
-            or_constr214=or_constr();
+            pushFollow(FOLLOW_or_constr_in_constraint3783);
+            or_constr216=or_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr214.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr216.getTree());
 
             }
 
@@ -10110,67 +10171,67 @@
     };
 
     // $ANTLR start or_constr
-    // src/main/resources/org/drools/lang/DRL.g:1128:1: or_constr : and_constr ( DOUBLE_PIPE and_constr )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1129: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_PIPE216=null;
-        and_constr_return and_constr215 = null;
-
+        Token DOUBLE_PIPE218=null;
         and_constr_return and_constr217 = null;
 
+        and_constr_return and_constr219 = null;
 
-        Object DOUBLE_PIPE216_tree=null;
 
+        Object DOUBLE_PIPE218_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1130:2: ( and_constr ( DOUBLE_PIPE and_constr )* )
+            // src/main/resources/org/drools/lang/DRL.g:1130:4: and_constr ( DOUBLE_PIPE and_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_constr_in_or_constr3776);
-            and_constr215=and_constr();
+            pushFollow(FOLLOW_and_constr_in_or_constr3794);
+            and_constr217=and_constr();
             _fsp--;
             if (failed) return retval;
-            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:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_constr217.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1130:15: ( DOUBLE_PIPE and_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_PIPE) ) {
-                    alt78=1;
+                if ( (LA79_0==DOUBLE_PIPE) ) {
+                    alt79=1;
                 }
 
 
-                switch (alt78) {
+                switch (alt79) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1129:17: DOUBLE_PIPE and_constr
+            	    // src/main/resources/org/drools/lang/DRL.g:1130:17: DOUBLE_PIPE and_constr
             	    {
-            	    DOUBLE_PIPE216=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3780); if (failed) return retval;
+            	    DOUBLE_PIPE218=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3798); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE216_tree = (Object)adaptor.create(DOUBLE_PIPE216);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE216_tree, root_0);
+            	    DOUBLE_PIPE218_tree = (Object)adaptor.create(DOUBLE_PIPE218);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE218_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_PIPE216, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_PIPE218, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr3787);
-            	    and_constr217=and_constr();
+            	    pushFollow(FOLLOW_and_constr_in_or_constr3805);
+            	    and_constr219=and_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr217.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr219.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop79;
                 }
             } while (true);
 
@@ -10200,67 +10261,67 @@
     };
 
     // $ANTLR start and_constr
-    // src/main/resources/org/drools/lang/DRL.g:1133:1: and_constr : unary_constr ( DOUBLE_AMPER unary_constr )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1134: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_AMPER219=null;
-        unary_constr_return unary_constr218 = null;
-
+        Token DOUBLE_AMPER221=null;
         unary_constr_return unary_constr220 = null;
 
+        unary_constr_return unary_constr222 = null;
 
-        Object DOUBLE_AMPER219_tree=null;
 
+        Object DOUBLE_AMPER221_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1135:2: ( unary_constr ( DOUBLE_AMPER unary_constr )* )
+            // src/main/resources/org/drools/lang/DRL.g:1135:4: unary_constr ( DOUBLE_AMPER unary_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_unary_constr_in_and_constr3802);
-            unary_constr218=unary_constr();
+            pushFollow(FOLLOW_unary_constr_in_and_constr3820);
+            unary_constr220=unary_constr();
             _fsp--;
             if (failed) return retval;
-            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:
+            if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr220.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1135:17: ( DOUBLE_AMPER unary_constr )*
+            loop80:
             do {
-                int alt79=2;
-                int LA79_0 = input.LA(1);
+                int alt80=2;
+                int LA80_0 = input.LA(1);
 
-                if ( (LA79_0==DOUBLE_AMPER) ) {
-                    alt79=1;
+                if ( (LA80_0==DOUBLE_AMPER) ) {
+                    alt80=1;
                 }
 
 
-                switch (alt79) {
+                switch (alt80) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1134:19: DOUBLE_AMPER unary_constr
+            	    // src/main/resources/org/drools/lang/DRL.g:1135:19: DOUBLE_AMPER unary_constr
             	    {
-            	    DOUBLE_AMPER219=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3806); if (failed) return retval;
+            	    DOUBLE_AMPER221=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3824); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER219_tree = (Object)adaptor.create(DOUBLE_AMPER219);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER219_tree, root_0);
+            	    DOUBLE_AMPER221_tree = (Object)adaptor.create(DOUBLE_AMPER221);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER221_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_AMPER219, DroolsEditorType.SYMBOL);;	
+            	      	emit(DOUBLE_AMPER221, DroolsEditorType.SYMBOL);;	
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr3813);
-            	    unary_constr220=unary_constr();
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr3831);
+            	    unary_constr222=unary_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr220.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr222.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop79;
+            	    break loop80;
                 }
             } while (true);
 
@@ -10290,52 +10351,52 @@
     };
 
     // $ANTLR start unary_constr
-    // 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 );
+    // src/main/resources/org/drools/lang/DRL.g:1139: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_PAREN224=null;
-        Token RIGHT_PAREN226=null;
-        eval_key_return eval_key221 = null;
+        Token LEFT_PAREN226=null;
+        Token RIGHT_PAREN228=null;
+        eval_key_return eval_key223 = null;
 
-        paren_chunk_return paren_chunk222 = null;
+        paren_chunk_return paren_chunk224 = null;
 
-        field_constraint_return field_constraint223 = null;
+        field_constraint_return field_constraint225 = null;
 
-        or_constr_return or_constr225 = null;
+        or_constr_return or_constr227 = null;
 
 
-        Object LEFT_PAREN224_tree=null;
-        Object RIGHT_PAREN226_tree=null;
+        Object LEFT_PAREN226_tree=null;
+        Object RIGHT_PAREN228_tree=null;
 
          boolean isFailed = true;	
         try {
-            // 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);
+            // src/main/resources/org/drools/lang/DRL.g:1143:2: ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN )
+            int alt81=3;
+            int LA81_0 = input.LA(1);
 
-            if ( (LA80_0==ID) ) {
-                int LA80_1 = input.LA(2);
+            if ( (LA81_0==ID) ) {
+                int LA81_1 = input.LA(2);
 
-                if ( ((LA80_1>=ID && LA80_1<=DOT)||LA80_1==COLON||(LA80_1>=EQUAL && LA80_1<=GRAVE_ACCENT)||LA80_1==LEFT_SQUARE) ) {
-                    alt80=2;
+                if ( ((LA81_1>=ID && LA81_1<=DOT)||LA81_1==COLON||(LA81_1>=EQUAL && LA81_1<=GRAVE_ACCENT)||LA81_1==LEFT_SQUARE) ) {
+                    alt81=2;
                 }
-                else if ( (LA80_1==LEFT_PAREN) ) {
-                    int LA80_4 = input.LA(3);
+                else if ( (LA81_1==LEFT_PAREN) ) {
+                    int LA81_14 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                        alt80=1;
+                        alt81=1;
                     }
                     else if ( (true) ) {
-                        alt80=2;
+                        alt81=2;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 4, input);
+                            new NoViableAltException("1139:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 81, 14, input);
 
                         throw nvae;
                     }
@@ -10343,76 +10404,76 @@
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 1, input);
+                        new NoViableAltException("1139:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 81, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA80_0==LEFT_PAREN) ) {
-                alt80=3;
+            else if ( (LA81_0==LEFT_PAREN) ) {
+                alt81=3;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1138:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 80, 0, input);
+                    new NoViableAltException("1139:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 81, 0, input);
 
                 throw nvae;
             }
-            switch (alt80) {
+            switch (alt81) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1142:4: eval_key paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1143:4: eval_key paren_chunk
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_eval_key_in_unary_constr3846);
-                    eval_key221=eval_key();
+                    pushFollow(FOLLOW_eval_key_in_unary_constr3864);
+                    eval_key223=eval_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key221.getTree(), root_0);
-                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3849);
-                    paren_chunk222=paren_chunk();
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key223.getTree(), root_0);
+                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3867);
+                    paren_chunk224=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk222.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk224.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1143:4: field_constraint
+                    // src/main/resources/org/drools/lang/DRL.g:1144:4: field_constraint
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr3854);
-                    field_constraint223=field_constraint();
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr3872);
+                    field_constraint225=field_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint223.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint225.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1144:5: LEFT_PAREN or_constr RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1145:5: LEFT_PAREN or_constr RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN224=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3860); if (failed) return retval;
+                    LEFT_PAREN226=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3878); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN224, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN226, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_constr_in_unary_constr3870);
-                    or_constr225=or_constr();
+                    pushFollow(FOLLOW_or_constr_in_unary_constr3888);
+                    or_constr227=or_constr();
                     _fsp--;
                     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 ) adaptor.addChild(root_0, or_constr227.getTree());
+                    RIGHT_PAREN228=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3893); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN226_tree = (Object)adaptor.create(RIGHT_PAREN226);
-                    adaptor.addChild(root_0, RIGHT_PAREN226_tree);
+                    RIGHT_PAREN228_tree = (Object)adaptor.create(RIGHT_PAREN228);
+                    adaptor.addChild(root_0, RIGHT_PAREN228_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN226, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN228, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -10453,7 +10514,7 @@
     };
 
     // $ANTLR start field_constraint
-    // 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 ) );
+    // src/main/resources/org/drools/lang/DRL.g:1158: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);
@@ -10461,46 +10522,46 @@
         Object root_0 = null;
 
         Token arw=null;
-        label_return label227 = null;
+        label_return label229 = null;
 
-        accessor_path_return accessor_path228 = null;
+        accessor_path_return accessor_path230 = null;
 
-        or_restr_connective_return or_restr_connective229 = null;
+        or_restr_connective_return or_restr_connective231 = null;
 
-        paren_chunk_return paren_chunk230 = null;
+        paren_chunk_return paren_chunk232 = null;
 
-        accessor_path_return accessor_path231 = null;
+        accessor_path_return accessor_path233 = null;
 
-        or_restr_connective_return or_restr_connective232 = null;
+        or_restr_connective_return or_restr_connective234 = 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: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);
+            // src/main/resources/org/drools/lang/DRL.g:1161: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 alt83=2;
+            int LA83_0 = input.LA(1);
 
-            if ( (LA82_0==ID) ) {
-                int LA82_1 = input.LA(2);
+            if ( (LA83_0==ID) ) {
+                int LA83_1 = input.LA(2);
 
-                if ( (LA82_1==COLON) ) {
-                    alt82=1;
+                if ( (LA83_1==COLON) ) {
+                    alt83=1;
                 }
-                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 ( ((LA83_1>=ID && LA83_1<=DOT)||LA83_1==LEFT_PAREN||(LA83_1>=EQUAL && LA83_1<=GRAVE_ACCENT)||LA83_1==LEFT_SQUARE) ) {
+                    alt83=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        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);
+                        new NoViableAltException("1158: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 ) );", 83, 1, input);
 
                     throw nvae;
                 }
@@ -10508,61 +10569,61 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("1158: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 ) );", 83, 0, input);
 
                 throw nvae;
             }
-            switch (alt82) {
+            switch (alt83) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1160:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
+                    // src/main/resources/org/drools/lang/DRL.g:1161:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
                     {
-                    pushFollow(FOLLOW_label_in_field_constraint3895);
-                    label227=label();
+                    pushFollow(FOLLOW_label_in_field_constraint3913);
+                    label229=label();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_label.add(label227.getTree());
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3897);
-                    accessor_path228=accessor_path();
+                    if ( backtracking==0 ) stream_label.add(label229.getTree());
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3915);
+                    accessor_path230=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    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 ( backtracking==0 ) stream_accessor_path.add(accessor_path230.getTree());
+                    // src/main/resources/org/drools/lang/DRL.g:1162:3: ( or_restr_connective | arw= ARROW paren_chunk )?
+                    int alt82=3;
+                    int LA82_0 = input.LA(1);
 
-                    if ( (LA81_0==ID||LA81_0==LEFT_PAREN||(LA81_0>=EQUAL && LA81_0<=GRAVE_ACCENT)) ) {
-                        alt81=1;
+                    if ( (LA82_0==ID||LA82_0==LEFT_PAREN||(LA82_0>=EQUAL && LA82_0<=GRAVE_ACCENT)) ) {
+                        alt82=1;
                     }
-                    else if ( (LA81_0==ARROW) ) {
-                        alt81=2;
+                    else if ( (LA82_0==ARROW) ) {
+                        alt82=2;
                     }
-                    switch (alt81) {
+                    switch (alt82) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:1161:5: or_restr_connective
+                            // src/main/resources/org/drools/lang/DRL.g:1162:5: or_restr_connective
                             {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3904);
-                            or_restr_connective229=or_restr_connective();
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3922);
+                            or_restr_connective231=or_restr_connective();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective229.getTree());
+                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective231.getTree());
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:1161:27: arw= ARROW paren_chunk
+                            // src/main/resources/org/drools/lang/DRL.g:1162:27: arw= ARROW paren_chunk
                             {
                             arw=(Token)input.LT(1);
-                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3910); if (failed) return retval;
+                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3928); if (failed) return retval;
                             if ( backtracking==0 ) stream_ARROW.add(arw);
 
                             if ( backtracking==0 ) {
                               	emit(arw, DroolsEditorType.SYMBOL);	
                             }
-                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3914);
-                            paren_chunk230=paren_chunk();
+                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3932);
+                            paren_chunk232=paren_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk230.getTree());
+                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk232.getTree());
                             if ( backtracking==0 ) {
                               isArrow = true;
                             }
@@ -10574,7 +10635,7 @@
 
 
                     // AST REWRITE
-                    // elements: accessor_path, accessor_path, label, paren_chunk, or_restr_connective, label
+                    // elements: label, accessor_path, paren_chunk, or_restr_connective, label, accessor_path
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -10584,15 +10645,15 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1162:3: -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                    // 1163: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:1162:17: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) )
+                        // src/main/resources/org/drools/lang/DRL.g:1163: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:1162:39: ^( VT_FIELD accessor_path )
+                        // src/main/resources/org/drools/lang/DRL.g:1163:39: ^( VT_FIELD accessor_path )
                         {
                         Object root_2 = (Object)adaptor.nil();
                         root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_FIELD, "VT_FIELD"), root_2);
@@ -10604,9 +10665,9 @@
 
                         adaptor.addChild(root_0, root_1);
                         }
-                        // src/main/resources/org/drools/lang/DRL.g:1162:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                        // src/main/resources/org/drools/lang/DRL.g:1163:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
                         if ( stream_paren_chunk.hasNext() ) {
-                            // src/main/resources/org/drools/lang/DRL.g:1162:66: ^( VK_EVAL[$arw] paren_chunk )
+                            // src/main/resources/org/drools/lang/DRL.g:1163:66: ^( VK_EVAL[$arw] paren_chunk )
                             {
                             Object root_1 = (Object)adaptor.nil();
                             root_1 = (Object)adaptor.becomeRoot(adaptor.create(VK_EVAL, arw), root_1);
@@ -10620,21 +10681,21 @@
                         stream_paren_chunk.reset();
 
                     }
-                    else // 1163:3: -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
+                    else // 1164:3: -> ^( 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 )? ) )
+                        // src/main/resources/org/drools/lang/DRL.g:1164: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:1163:28: ^( VT_FIELD accessor_path ( or_restr_connective )? )
+                        // src/main/resources/org/drools/lang/DRL.g:1164: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:1163:53: ( or_restr_connective )?
+                        // src/main/resources/org/drools/lang/DRL.g:1164:53: ( or_restr_connective )?
                         if ( stream_or_restr_connective.hasNext() ) {
                             adaptor.addChild(root_2, stream_or_restr_connective.next());
 
@@ -10654,18 +10715,18 @@
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1164:4: accessor_path or_restr_connective
+                    // src/main/resources/org/drools/lang/DRL.g:1165:4: accessor_path or_restr_connective
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3968);
-                    accessor_path231=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3986);
+                    accessor_path233=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path231.getTree());
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3970);
-                    or_restr_connective232=or_restr_connective();
+                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path233.getTree());
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3988);
+                    or_restr_connective234=or_restr_connective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective232.getTree());
+                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective234.getTree());
 
                     // AST REWRITE
                     // elements: or_restr_connective, accessor_path
@@ -10678,9 +10739,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 1165:3: -> ^( VT_FIELD accessor_path or_restr_connective )
+                    // 1166:3: -> ^( VT_FIELD accessor_path or_restr_connective )
                     {
-                        // src/main/resources/org/drools/lang/DRL.g:1165:6: ^( VT_FIELD accessor_path or_restr_connective )
+                        // src/main/resources/org/drools/lang/DRL.g:1166: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);
@@ -10722,7 +10783,7 @@
     };
 
     // $ANTLR start label
-    // src/main/resources/org/drools/lang/DRL.g:1168:1: label : value= ID COLON -> VT_LABEL[$value] ;
+    // src/main/resources/org/drools/lang/DRL.g:1169: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);
@@ -10730,30 +10791,30 @@
         Object root_0 = null;
 
         Token value=null;
-        Token COLON233=null;
+        Token COLON235=null;
 
         Object value_tree=null;
-        Object COLON233_tree=null;
+        Object COLON235_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:1169:2: (value= ID COLON -> VT_LABEL[$value] )
-            // src/main/resources/org/drools/lang/DRL.g:1169:4: value= ID COLON
+            // src/main/resources/org/drools/lang/DRL.g:1170:2: (value= ID COLON -> VT_LABEL[$value] )
+            // src/main/resources/org/drools/lang/DRL.g:1170:4: value= ID COLON
             {
             value=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_label3995); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_label4013); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(value);
 
             if ( backtracking==0 ) {
               	emit(value, DroolsEditorType.IDENTIFIER_VARIABLE);	
             }
-            COLON233=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_label4002); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON233);
+            COLON235=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_label4020); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON235);
 
             if ( backtracking==0 ) {
-              	emit(COLON233, DroolsEditorType.SYMBOL);	
+              	emit(COLON235, DroolsEditorType.SYMBOL);	
             }
 
             // AST REWRITE
@@ -10767,7 +10828,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1171:3: -> VT_LABEL[$value]
+            // 1172:3: -> VT_LABEL[$value]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_LABEL, value));
 
@@ -10800,65 +10861,65 @@
     };
 
     // $ANTLR start or_restr_connective
-    // src/main/resources/org/drools/lang/DRL.g:1174:1: or_restr_connective : and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1175: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_PIPE235=null;
-        and_restr_connective_return and_restr_connective234 = null;
-
+        Token DOUBLE_PIPE237=null;
         and_restr_connective_return and_restr_connective236 = null;
 
+        and_restr_connective_return and_restr_connective238 = null;
 
-        Object DOUBLE_PIPE235_tree=null;
 
+        Object DOUBLE_PIPE237_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1176:2: ( and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* )
+            // src/main/resources/org/drools/lang/DRL.g:1176:4: and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4023);
-            and_restr_connective234=and_restr_connective();
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4041);
+            and_restr_connective236=and_restr_connective();
             _fsp--;
             if (failed) return retval;
-            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:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective236.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1176:25: ({...}? => DOUBLE_PIPE and_restr_connective )*
+            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:1175:26: {...}? => DOUBLE_PIPE and_restr_connective
+            	    // src/main/resources/org/drools/lang/DRL.g:1176:26: {...}? => DOUBLE_PIPE and_restr_connective
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "or_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_PIPE235=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4029); if (failed) return retval;
+            	    DOUBLE_PIPE237=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4047); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE235_tree = (Object)adaptor.create(DOUBLE_PIPE235);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE235_tree, root_0);
+            	    DOUBLE_PIPE237_tree = (Object)adaptor.create(DOUBLE_PIPE237);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE237_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_PIPE235, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_PIPE237, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4037);
-            	    and_restr_connective236=and_restr_connective();
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4055);
+            	    and_restr_connective238=and_restr_connective();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective236.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective238.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop83;
+            	    break loop84;
                 }
             } while (true);
 
@@ -10888,65 +10949,65 @@
     };
 
     // $ANTLR start and_restr_connective
-    // src/main/resources/org/drools/lang/DRL.g:1179:1: and_restr_connective : constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* ;
+    // src/main/resources/org/drools/lang/DRL.g:1180: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_AMPER238=null;
-        constraint_expression_return constraint_expression237 = null;
-
+        Token DOUBLE_AMPER240=null;
         constraint_expression_return constraint_expression239 = null;
 
+        constraint_expression_return constraint_expression241 = null;
 
-        Object DOUBLE_AMPER238_tree=null;
 
+        Object DOUBLE_AMPER240_tree=null;
+
         try {
-            // 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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1181:2: ( constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* )
+            // src/main/resources/org/drools/lang/DRL.g:1181:4: constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4052);
-            constraint_expression237=constraint_expression();
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4070);
+            constraint_expression239=constraint_expression();
             _fsp--;
             if (failed) return retval;
-            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:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression239.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1181:26: ({...}? => DOUBLE_AMPER constraint_expression )*
+            loop85:
             do {
-                int alt84=2;
-                alt84 = dfa84.predict(input);
-                switch (alt84) {
+                int alt85=2;
+                alt85 = dfa85.predict(input);
+                switch (alt85) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1180:27: {...}? => DOUBLE_AMPER constraint_expression
+            	    // src/main/resources/org/drools/lang/DRL.g:1181:27: {...}? => DOUBLE_AMPER constraint_expression
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "and_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_AMPER238=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4058); if (failed) return retval;
+            	    DOUBLE_AMPER240=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4076); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER238_tree = (Object)adaptor.create(DOUBLE_AMPER238);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER238_tree, root_0);
+            	    DOUBLE_AMPER240_tree = (Object)adaptor.create(DOUBLE_AMPER240);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER240_tree, root_0);
             	    }
             	    if ( backtracking==0 ) {
-            	      	emit(DOUBLE_AMPER238, DroolsEditorType.SYMBOL);	
+            	      	emit(DOUBLE_AMPER240, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4065);
-            	    constraint_expression239=constraint_expression();
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4083);
+            	    constraint_expression241=constraint_expression();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression239.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression241.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop84;
+            	    break loop85;
                 }
             } while (true);
 
@@ -10976,200 +11037,105 @@
     };
 
     // $ANTLR start constraint_expression
-    // 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 );
+    // src/main/resources/org/drools/lang/DRL.g:1185: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_PAREN242=null;
-        Token RIGHT_PAREN244=null;
-        compound_operator_return compound_operator240 = null;
+        Token LEFT_PAREN244=null;
+        Token RIGHT_PAREN246=null;
+        compound_operator_return compound_operator242 = null;
 
-        simple_operator_return simple_operator241 = null;
+        simple_operator_return simple_operator243 = null;
 
-        or_restr_connective_return or_restr_connective243 = null;
+        or_restr_connective_return or_restr_connective245 = null;
 
 
-        Object LEFT_PAREN242_tree=null;
-        Object RIGHT_PAREN244_tree=null;
+        Object LEFT_PAREN244_tree=null;
+        Object RIGHT_PAREN246_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1187:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
-            int alt85=3;
+            // src/main/resources/org/drools/lang/DRL.g:1188:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
+            int alt86=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                int LA85_1 = input.LA(2);
+                int LA86_1 = input.LA(2);
 
-                if ( (LA85_1==ID) ) {
-                    int LA85_10 = input.LA(3);
+                if ( (LA86_1==ID) ) {
+                    int LA86_10 = input.LA(3);
 
-                    if ( (LA85_10==ID||LA85_10==STRING||(LA85_10>=BOOL && LA85_10<=INT)||(LA85_10>=FLOAT && LA85_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        alt85=2;
+                    if ( (LA86_10==ID||LA86_10==STRING||(LA86_10>=BOOL && LA86_10<=INT)||(LA86_10>=FLOAT && LA86_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        alt86=2;
                     }
-                    else if ( (LA85_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        int LA85_24 = input.LA(4);
+                    else if ( (LA86_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        int LA86_24 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt85=1;
+                            alt86=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt85=2;
+                            alt86=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, 24, input);
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 24, input);
 
                             throw nvae;
                         }
                     }
-                    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 ( (LA86_10==DOT||(LA86_10>=COMMA && LA86_10<=RIGHT_PAREN)||(LA86_10>=DOUBLE_PIPE && LA86_10<=DOUBLE_AMPER)||LA86_10==LEFT_SQUARE) ) {
+                        alt86=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, 10, input);
+                            new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 10, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA85_1==STRING||(LA85_1>=BOOL && LA85_1<=INT)||(LA85_1>=FLOAT && LA85_1<=NULL)) ) {
-                    alt85=2;
+                else if ( (LA86_1==STRING||(LA86_1>=BOOL && LA86_1<=INT)||(LA86_1>=FLOAT && LA86_1<=NULL)) ) {
+                    alt86=2;
                 }
-                else if ( (LA85_1==LEFT_PAREN) ) {
+                else if ( (LA86_1==LEFT_PAREN) ) {
                     switch ( input.LA(3) ) {
                     case ID:
                         {
-                        int LA85_31 = input.LA(4);
+                        int LA86_31 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt85=1;
+                            alt86=1;
                         }
                         else if ( (true) ) {
-                            alt85=2;
+                            alt86=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, 31, input);
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 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 LA85_37 = input.LA(4);
+                        int LA86_32 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt85=1;
+                            alt86=1;
                         }
                         else if ( (true) ) {
-                            alt85=2;
+                            alt86=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, 37, input);
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 32, input);
 
                             throw nvae;
                         }
@@ -11230,6 +11196,7 @@
                     case VK_ENABLED:
                     case VK_ATTRIBUTES:
                     case VK_RULE:
+                    case VK_EXTEND:
                     case VK_IMPORT:
                     case VK_PACKAGE:
                     case VK_TEMPLATE:
@@ -11294,25 +11261,120 @@
                     case C_STYLE_SINGLE_LINE_COMMENT:
                     case MULTI_LINE_COMMENT:
                         {
-                        alt85=2;
+                        alt86=2;
                         }
                         break;
+                    case STRING:
+                        {
+                        int LA86_34 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt86=1;
+                        }
+                        else if ( (true) ) {
+                            alt86=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 34, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case INT:
+                        {
+                        int LA86_35 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt86=1;
+                        }
+                        else if ( (true) ) {
+                            alt86=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 35, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case FLOAT:
+                        {
+                        int LA86_36 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt86=1;
+                        }
+                        else if ( (true) ) {
+                            alt86=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 36, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case BOOL:
+                        {
+                        int LA86_37 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt86=1;
+                        }
+                        else if ( (true) ) {
+                            alt86=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 37, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case NULL:
+                        {
+                        int LA86_38 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt86=1;
+                        }
+                        else if ( (true) ) {
+                            alt86=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 38, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
                     default:
                         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, 16, input);
+                            new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 16, input);
 
                         throw nvae;
                     }
 
                 }
-                else if ( (LA85_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt85=2;
+                else if ( (LA86_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt86=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, 1, input);
+                        new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 1, input);
 
                     throw nvae;
                 }
@@ -11326,72 +11388,72 @@
             case NOT_EQUAL:
             case GRAVE_ACCENT:
                 {
-                alt85=2;
+                alt86=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt85=3;
+                alt86=3;
                 }
                 break;
             default:
                 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, 0, input);
+                    new NoViableAltException("1185:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 86, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt85) {
+            switch (alt86) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1187:5: compound_operator
+                    // src/main/resources/org/drools/lang/DRL.g:1188:5: compound_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4087);
-                    compound_operator240=compound_operator();
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4105);
+                    compound_operator242=compound_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator240.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator242.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1188:4: simple_operator
+                    // src/main/resources/org/drools/lang/DRL.g:1189:4: simple_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4092);
-                    simple_operator241=simple_operator();
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4110);
+                    simple_operator243=simple_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator241.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator243.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1189:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
+                    // src/main/resources/org/drools/lang/DRL.g:1190:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN242=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4097); if (failed) return retval;
+                    LEFT_PAREN244=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4115); if (failed) return retval;
                     if ( backtracking==0 ) {
-                      	emit(LEFT_PAREN242, DroolsEditorType.SYMBOL);	
+                      	emit(LEFT_PAREN244, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4106);
-                    or_restr_connective243=or_restr_connective();
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4124);
+                    or_restr_connective245=or_restr_connective();
                     _fsp--;
                     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 ) adaptor.addChild(root_0, or_restr_connective245.getTree());
+                    RIGHT_PAREN246=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4129); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN244_tree = (Object)adaptor.create(RIGHT_PAREN244);
-                    adaptor.addChild(root_0, RIGHT_PAREN244_tree);
+                    RIGHT_PAREN246_tree = (Object)adaptor.create(RIGHT_PAREN246);
+                    adaptor.addChild(root_0, RIGHT_PAREN246_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(RIGHT_PAREN244, DroolsEditorType.SYMBOL);	
+                      	emit(RIGHT_PAREN246, DroolsEditorType.SYMBOL);	
                     }
 
                     }
@@ -11406,7 +11468,7 @@
             }
         }
         catch ( RecognitionException re ) {
-            
+
             	if (!lookaheadTest){
             		reportError(re);
             		recover(input, re);
@@ -11416,7 +11478,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);
@@ -11459,7 +11521,7 @@
     };
 
     // $ANTLR start simple_operator
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1235: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);
@@ -11472,37 +11534,37 @@
         Token id3=null;
         Token ga2=null;
         Token id4=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;
+        Token EQUAL247=null;
+        Token GREATER248=null;
+        Token GREATER_EQUAL249=null;
+        Token LESS250=null;
+        Token LESS_EQUAL251=null;
+        Token NOT_EQUAL252=null;
+        not_key_return not_key253 = null;
 
-        contains_key_return contains_key252 = null;
+        contains_key_return contains_key254 = null;
 
-        soundslike_key_return soundslike_key253 = null;
+        soundslike_key_return soundslike_key255 = null;
 
-        matches_key_return matches_key254 = null;
+        matches_key_return matches_key256 = null;
 
-        memberof_key_return memberof_key255 = null;
+        memberof_key_return memberof_key257 = null;
 
-        square_chunk_return square_chunk256 = null;
+        square_chunk_return square_chunk258 = null;
 
-        contains_key_return contains_key257 = null;
+        contains_key_return contains_key259 = null;
 
-        excludes_key_return excludes_key258 = null;
+        excludes_key_return excludes_key260 = null;
 
-        matches_key_return matches_key259 = null;
+        matches_key_return matches_key261 = null;
 
-        soundslike_key_return soundslike_key260 = null;
+        soundslike_key_return soundslike_key262 = null;
 
-        memberof_key_return memberof_key261 = null;
+        memberof_key_return memberof_key263 = null;
 
-        square_chunk_return square_chunk262 = null;
+        square_chunk_return square_chunk264 = null;
 
-        expression_value_return expression_value263 = null;
+        expression_value_return expression_value265 = null;
 
 
         Object id1_tree=null;
@@ -11511,84 +11573,84 @@
         Object id3_tree=null;
         Object ga2_tree=null;
         Object id4_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;
+        Object EQUAL247_tree=null;
+        Object GREATER248_tree=null;
+        Object GREATER_EQUAL249_tree=null;
+        Object LESS250_tree=null;
+        Object LESS_EQUAL251_tree=null;
+        Object NOT_EQUAL252_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1236: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:1236: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: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;
+            // src/main/resources/org/drools/lang/DRL.g:1237: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 alt88=14;
             switch ( input.LA(1) ) {
             case EQUAL:
                 {
-                alt87=1;
+                alt88=1;
                 }
                 break;
             case GREATER:
                 {
-                alt87=2;
+                alt88=2;
                 }
                 break;
             case GREATER_EQUAL:
                 {
-                alt87=3;
+                alt88=3;
                 }
                 break;
             case LESS:
                 {
-                alt87=4;
+                alt88=4;
                 }
                 break;
             case LESS_EQUAL:
                 {
-                alt87=5;
+                alt88=5;
                 }
                 break;
             case NOT_EQUAL:
                 {
-                alt87=6;
+                alt88=6;
                 }
                 break;
             case ID:
                 {
-                int LA87_7 = input.LA(2);
+                int LA88_7 = input.LA(2);
 
-                if ( (LA87_7==ID||LA87_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt87=7;
+                if ( (LA88_7==ID||LA88_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt88=7;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                    alt87=8;
+                    alt88=8;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))) ) {
-                    alt87=9;
+                    alt88=9;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                    alt87=10;
+                    alt88=10;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                    alt87=11;
+                    alt88=11;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                    alt87=12;
+                    alt88=12;
                 }
                 else if ( (true) ) {
-                    alt87=13;
+                    alt88=13;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        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);
+                        new NoViableAltException("1237: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 )", 88, 7, input);
 
                     throw nvae;
                 }
@@ -11596,206 +11658,206 @@
                 break;
             case GRAVE_ACCENT:
                 {
-                alt87=14;
+                alt88=14;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    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);
+                    new NoViableAltException("1237: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 )", 88, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt87) {
+            switch (alt88) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1236:4: EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1237:4: EQUAL
                     {
-                    EQUAL245=(Token)input.LT(1);
-                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator4140); if (failed) return retval;
+                    EQUAL247=(Token)input.LT(1);
+                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator4158); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    EQUAL245_tree = (Object)adaptor.create(EQUAL245);
-                    root_0 = (Object)adaptor.becomeRoot(EQUAL245_tree, root_0);
+                    EQUAL247_tree = (Object)adaptor.create(EQUAL247);
+                    root_0 = (Object)adaptor.becomeRoot(EQUAL247_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(EQUAL245, DroolsEditorType.SYMBOL);	
+                      	emit(EQUAL247, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1237:4: GREATER
+                    // src/main/resources/org/drools/lang/DRL.g:1238:4: GREATER
                     {
-                    GREATER246=(Token)input.LT(1);
-                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator4148); if (failed) return retval;
+                    GREATER248=(Token)input.LT(1);
+                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator4166); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER246_tree = (Object)adaptor.create(GREATER246);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER246_tree, root_0);
+                    GREATER248_tree = (Object)adaptor.create(GREATER248);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER248_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(GREATER246, DroolsEditorType.SYMBOL);	
+                      	emit(GREATER248, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1238:4: GREATER_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1239:4: GREATER_EQUAL
                     {
-                    GREATER_EQUAL247=(Token)input.LT(1);
-                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator4156); if (failed) return retval;
+                    GREATER_EQUAL249=(Token)input.LT(1);
+                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator4174); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER_EQUAL247_tree = (Object)adaptor.create(GREATER_EQUAL247);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL247_tree, root_0);
+                    GREATER_EQUAL249_tree = (Object)adaptor.create(GREATER_EQUAL249);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL249_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(GREATER_EQUAL247, DroolsEditorType.SYMBOL);	
+                      	emit(GREATER_EQUAL249, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:1239:4: LESS
+                    // src/main/resources/org/drools/lang/DRL.g:1240:4: LESS
                     {
-                    LESS248=(Token)input.LT(1);
-                    match(input,LESS,FOLLOW_LESS_in_simple_operator4164); if (failed) return retval;
+                    LESS250=(Token)input.LT(1);
+                    match(input,LESS,FOLLOW_LESS_in_simple_operator4182); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS248_tree = (Object)adaptor.create(LESS248);
-                    root_0 = (Object)adaptor.becomeRoot(LESS248_tree, root_0);
+                    LESS250_tree = (Object)adaptor.create(LESS250);
+                    root_0 = (Object)adaptor.becomeRoot(LESS250_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(LESS248, DroolsEditorType.SYMBOL);	
+                      	emit(LESS250, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:1240:4: LESS_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1241:4: LESS_EQUAL
                     {
-                    LESS_EQUAL249=(Token)input.LT(1);
-                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator4172); if (failed) return retval;
+                    LESS_EQUAL251=(Token)input.LT(1);
+                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator4190); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS_EQUAL249_tree = (Object)adaptor.create(LESS_EQUAL249);
-                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL249_tree, root_0);
+                    LESS_EQUAL251_tree = (Object)adaptor.create(LESS_EQUAL251);
+                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL251_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(LESS_EQUAL249, DroolsEditorType.SYMBOL);	
+                      	emit(LESS_EQUAL251, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 6 :
-                    // src/main/resources/org/drools/lang/DRL.g:1241:4: NOT_EQUAL
+                    // src/main/resources/org/drools/lang/DRL.g:1242:4: NOT_EQUAL
                     {
-                    NOT_EQUAL250=(Token)input.LT(1);
-                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator4180); if (failed) return retval;
+                    NOT_EQUAL252=(Token)input.LT(1);
+                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator4198); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    NOT_EQUAL250_tree = (Object)adaptor.create(NOT_EQUAL250);
-                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL250_tree, root_0);
+                    NOT_EQUAL252_tree = (Object)adaptor.create(NOT_EQUAL252);
+                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL252_tree, root_0);
                     }
                     if ( backtracking==0 ) {
-                      	emit(NOT_EQUAL250, DroolsEditorType.SYMBOL);	
+                      	emit(NOT_EQUAL252, DroolsEditorType.SYMBOL);	
                     }
 
                     }
                     break;
                 case 7 :
-                    // 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 )
+                    // src/main/resources/org/drools/lang/DRL.g:1243: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_operator4188);
-                    not_key251=not_key();
+                    pushFollow(FOLLOW_not_key_in_simple_operator4206);
+                    not_key253=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    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 ( backtracking==0 ) adaptor.addChild(root_0, not_key253.getTree());
+                    // src/main/resources/org/drools/lang/DRL.g:1244:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
+                    int alt87=6;
+                    int LA87_0 = input.LA(1);
 
-                    if ( (LA86_0==ID) ) {
-                        int LA86_1 = input.LA(2);
+                    if ( (LA87_0==ID) ) {
+                        int LA87_1 = input.LA(2);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                            alt86=1;
+                            alt87=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                            alt86=2;
+                            alt87=2;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                            alt86=3;
+                            alt87=3;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                            alt86=4;
+                            alt87=4;
                         }
                         else if ( (true) ) {
-                            alt86=5;
+                            alt87=5;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("1243:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 86, 1, input);
+                                new NoViableAltException("1244:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 87, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA86_0==GRAVE_ACCENT) ) {
-                        alt86=6;
+                    else if ( (LA87_0==GRAVE_ACCENT) ) {
+                        alt87=6;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1243:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 86, 0, input);
+                            new NoViableAltException("1244:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 87, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt86) {
+                    switch (alt87) {
                         case 1 :
-                            // src/main/resources/org/drools/lang/DRL.g:1243:5: contains_key
+                            // src/main/resources/org/drools/lang/DRL.g:1244:5: contains_key
                             {
-                            pushFollow(FOLLOW_contains_key_in_simple_operator4195);
-                            contains_key252=contains_key();
+                            pushFollow(FOLLOW_contains_key_in_simple_operator4213);
+                            contains_key254=contains_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key252.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key254.getTree(), root_0);
 
                             }
                             break;
                         case 2 :
-                            // src/main/resources/org/drools/lang/DRL.g:1244:5: soundslike_key
+                            // src/main/resources/org/drools/lang/DRL.g:1245:5: soundslike_key
                             {
-                            pushFollow(FOLLOW_soundslike_key_in_simple_operator4202);
-                            soundslike_key253=soundslike_key();
+                            pushFollow(FOLLOW_soundslike_key_in_simple_operator4220);
+                            soundslike_key255=soundslike_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key253.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key255.getTree(), root_0);
 
                             }
                             break;
                         case 3 :
-                            // src/main/resources/org/drools/lang/DRL.g:1245:5: matches_key
+                            // src/main/resources/org/drools/lang/DRL.g:1246:5: matches_key
                             {
-                            pushFollow(FOLLOW_matches_key_in_simple_operator4209);
-                            matches_key254=matches_key();
+                            pushFollow(FOLLOW_matches_key_in_simple_operator4227);
+                            matches_key256=matches_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key254.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key256.getTree(), root_0);
 
                             }
                             break;
                         case 4 :
-                            // src/main/resources/org/drools/lang/DRL.g:1246:5: memberof_key
+                            // src/main/resources/org/drools/lang/DRL.g:1247:5: memberof_key
                             {
-                            pushFollow(FOLLOW_memberof_key_in_simple_operator4216);
-                            memberof_key255=memberof_key();
+                            pushFollow(FOLLOW_memberof_key_in_simple_operator4234);
+                            memberof_key257=memberof_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key255.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key257.getTree(), root_0);
 
                             }
                             break;
                         case 5 :
-                            // src/main/resources/org/drools/lang/DRL.g:1247:5: id1= ID
+                            // src/main/resources/org/drools/lang/DRL.g:1248:5: id1= ID
                             {
                             id1=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator4225); if (failed) return retval;
+                            match(input,ID,FOLLOW_ID_in_simple_operator4243); if (failed) return retval;
                             if ( backtracking==0 ) {
                             id1_tree = (Object)adaptor.create(id1);
                             root_0 = (Object)adaptor.becomeRoot(id1_tree, root_0);
@@ -11807,15 +11869,15 @@
                             }
                             break;
                         case 6 :
-                            // src/main/resources/org/drools/lang/DRL.g:1248:5: ga1= GRAVE_ACCENT id2= ID square_chunk
+                            // src/main/resources/org/drools/lang/DRL.g:1249:5: ga1= GRAVE_ACCENT id2= ID square_chunk
                             {
                             ga1=(Token)input.LT(1);
-                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4236); if (failed) return retval;
+                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4254); if (failed) return retval;
                             if ( backtracking==0 ) {
                               	emit(ga1, DroolsEditorType.SYMBOL);	
                             }
                             id2=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator4244); if (failed) return retval;
+                            match(input,ID,FOLLOW_ID_in_simple_operator4262); if (failed) return retval;
                             if ( backtracking==0 ) {
                             id2_tree = (Object)adaptor.create(id2);
                             root_0 = (Object)adaptor.becomeRoot(id2_tree, root_0);
@@ -11823,11 +11885,11 @@
                             if ( backtracking==0 ) {
                               	emit(id2, DroolsEditorType.IDENTIFIER);	
                             }
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4250);
-                            square_chunk256=square_chunk();
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4268);
+                            square_chunk258=square_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk256.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk258.getTree());
 
                             }
                             break;
@@ -11838,65 +11900,65 @@
                     }
                     break;
                 case 8 :
-                    // src/main/resources/org/drools/lang/DRL.g:1249:4: contains_key
+                    // src/main/resources/org/drools/lang/DRL.g:1250:4: contains_key
                     {
-                    pushFollow(FOLLOW_contains_key_in_simple_operator4256);
-                    contains_key257=contains_key();
+                    pushFollow(FOLLOW_contains_key_in_simple_operator4274);
+                    contains_key259=contains_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key257.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key259.getTree(), root_0);
 
                     }
                     break;
                 case 9 :
-                    // src/main/resources/org/drools/lang/DRL.g:1250:4: excludes_key
+                    // src/main/resources/org/drools/lang/DRL.g:1251:4: excludes_key
                     {
-                    pushFollow(FOLLOW_excludes_key_in_simple_operator4262);
-                    excludes_key258=excludes_key();
+                    pushFollow(FOLLOW_excludes_key_in_simple_operator4280);
+                    excludes_key260=excludes_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key258.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key260.getTree(), root_0);
 
                     }
                     break;
                 case 10 :
-                    // src/main/resources/org/drools/lang/DRL.g:1251:4: matches_key
+                    // src/main/resources/org/drools/lang/DRL.g:1252:4: matches_key
                     {
-                    pushFollow(FOLLOW_matches_key_in_simple_operator4268);
-                    matches_key259=matches_key();
+                    pushFollow(FOLLOW_matches_key_in_simple_operator4286);
+                    matches_key261=matches_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key259.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key261.getTree(), root_0);
 
                     }
                     break;
                 case 11 :
-                    // src/main/resources/org/drools/lang/DRL.g:1252:4: soundslike_key
+                    // src/main/resources/org/drools/lang/DRL.g:1253:4: soundslike_key
                     {
-                    pushFollow(FOLLOW_soundslike_key_in_simple_operator4274);
-                    soundslike_key260=soundslike_key();
+                    pushFollow(FOLLOW_soundslike_key_in_simple_operator4292);
+                    soundslike_key262=soundslike_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key260.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key262.getTree(), root_0);
 
                     }
                     break;
                 case 12 :
-                    // src/main/resources/org/drools/lang/DRL.g:1253:4: memberof_key
+                    // src/main/resources/org/drools/lang/DRL.g:1254:4: memberof_key
                     {
-                    pushFollow(FOLLOW_memberof_key_in_simple_operator4280);
-                    memberof_key261=memberof_key();
+                    pushFollow(FOLLOW_memberof_key_in_simple_operator4298);
+                    memberof_key263=memberof_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key261.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key263.getTree(), root_0);
 
                     }
                     break;
                 case 13 :
-                    // src/main/resources/org/drools/lang/DRL.g:1254:4: id3= ID
+                    // src/main/resources/org/drools/lang/DRL.g:1255:4: id3= ID
                     {
                     id3=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4288); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_simple_operator4306); if (failed) return retval;
                     if ( backtracking==0 ) {
                     id3_tree = (Object)adaptor.create(id3);
                     root_0 = (Object)adaptor.becomeRoot(id3_tree, root_0);
@@ -11908,15 +11970,15 @@
                     }
                     break;
                 case 14 :
-                    // src/main/resources/org/drools/lang/DRL.g:1255:4: ga2= GRAVE_ACCENT id4= ID square_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1256:4: ga2= GRAVE_ACCENT id4= ID square_chunk
                     {
                     ga2=(Token)input.LT(1);
-                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4298); if (failed) return retval;
+                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4316); if (failed) return retval;
                     if ( backtracking==0 ) {
                       	emit(ga2, DroolsEditorType.SYMBOL);	
                     }
                     id4=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4306); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_simple_operator4324); if (failed) return retval;
                     if ( backtracking==0 ) {
                     id4_tree = (Object)adaptor.create(id4);
                     root_0 = (Object)adaptor.becomeRoot(id4_tree, root_0);
@@ -11924,11 +11986,11 @@
                     if ( backtracking==0 ) {
                       	emit(id4, DroolsEditorType.IDENTIFIER);	
                     }
-                    pushFollow(FOLLOW_square_chunk_in_simple_operator4312);
-                    square_chunk262=square_chunk();
+                    pushFollow(FOLLOW_square_chunk_in_simple_operator4330);
+                    square_chunk264=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk262.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk264.getTree());
 
                     }
                     break;
@@ -11938,11 +12000,11 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator4319);
-            expression_value263=expression_value();
+            pushFollow(FOLLOW_expression_value_in_simple_operator4337);
+            expression_value265=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value263.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value265.getTree());
 
             }
 
@@ -11969,57 +12031,57 @@
     };
 
     // $ANTLR start compound_operator
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1262: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_PAREN267=null;
-        Token COMMA269=null;
-        Token RIGHT_PAREN271=null;
-        in_key_return in_key264 = null;
+        Token LEFT_PAREN269=null;
+        Token COMMA271=null;
+        Token RIGHT_PAREN273=null;
+        in_key_return in_key266 = null;
 
-        not_key_return not_key265 = null;
+        not_key_return not_key267 = null;
 
-        in_key_return in_key266 = null;
+        in_key_return in_key268 = null;
 
-        expression_value_return expression_value268 = null;
-
         expression_value_return expression_value270 = null;
 
+        expression_value_return expression_value272 = null;
 
-        Object LEFT_PAREN267_tree=null;
-        Object COMMA269_tree=null;
-        Object RIGHT_PAREN271_tree=null;
 
+        Object LEFT_PAREN269_tree=null;
+        Object COMMA271_tree=null;
+        Object RIGHT_PAREN273_tree=null;
+
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1263:2: ( ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1263: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:1263:2: ( in_key | not_key in_key )
-            int alt88=2;
-            int LA88_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1264:2: ( in_key | not_key in_key )
+            int alt89=2;
+            int LA89_0 = input.LA(1);
 
-            if ( (LA88_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.IN))||(validateIdentifierKey(DroolsSoftKeywords.NOT))))) {
-                int LA88_1 = input.LA(2);
+            if ( (LA89_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.IN))||(validateIdentifierKey(DroolsSoftKeywords.NOT))))) {
+                int LA89_1 = input.LA(2);
 
-                if ( (LA88_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
-                    alt88=1;
+                if ( (LA89_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
+                    alt89=1;
                 }
-                else if ( (LA88_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt88=2;
+                else if ( (LA89_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt89=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1263:2: ( in_key | not_key in_key )", 88, 1, input);
+                        new NoViableAltException("1264:2: ( in_key | not_key in_key )", 89, 1, input);
 
                     throw nvae;
                 }
@@ -12027,35 +12089,35 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1263:2: ( in_key | not_key in_key )", 88, 0, input);
+                    new NoViableAltException("1264:2: ( in_key | not_key in_key )", 89, 0, input);
 
                 throw nvae;
             }
-            switch (alt88) {
+            switch (alt89) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1263:4: in_key
+                    // src/main/resources/org/drools/lang/DRL.g:1264:4: in_key
                     {
-                    pushFollow(FOLLOW_in_key_in_compound_operator4337);
-                    in_key264=in_key();
+                    pushFollow(FOLLOW_in_key_in_compound_operator4355);
+                    in_key266=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key264.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key266.getTree(), root_0);
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1263:14: not_key in_key
+                    // src/main/resources/org/drools/lang/DRL.g:1264:14: not_key in_key
                     {
-                    pushFollow(FOLLOW_not_key_in_compound_operator4342);
-                    not_key265=not_key();
+                    pushFollow(FOLLOW_not_key_in_compound_operator4360);
+                    not_key267=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key265.getTree());
-                    pushFollow(FOLLOW_in_key_in_compound_operator4344);
-                    in_key266=in_key();
+                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key267.getTree());
+                    pushFollow(FOLLOW_in_key_in_compound_operator4362);
+                    in_key268=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key266.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key268.getTree(), root_0);
 
                     }
                     break;
@@ -12065,58 +12127,58 @@
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
             }
-            LEFT_PAREN267=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4355); if (failed) return retval;
+            LEFT_PAREN269=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4373); if (failed) return retval;
             if ( backtracking==0 ) {
-              	emit(LEFT_PAREN267, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_PAREN269, DroolsEditorType.SYMBOL);	
             }
-            pushFollow(FOLLOW_expression_value_in_compound_operator4363);
-            expression_value268=expression_value();
+            pushFollow(FOLLOW_expression_value_in_compound_operator4381);
+            expression_value270=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value268.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1266:21: ( COMMA expression_value )*
-            loop89:
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value270.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1267:21: ( COMMA expression_value )*
+            loop90:
             do {
-                int alt89=2;
-                int LA89_0 = input.LA(1);
+                int alt90=2;
+                int LA90_0 = input.LA(1);
 
-                if ( (LA89_0==COMMA) ) {
-                    alt89=1;
+                if ( (LA90_0==COMMA) ) {
+                    alt90=1;
                 }
 
 
-                switch (alt89) {
+                switch (alt90) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1266:23: COMMA expression_value
+            	    // src/main/resources/org/drools/lang/DRL.g:1267:23: COMMA expression_value
             	    {
-            	    COMMA269=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4367); if (failed) return retval;
+            	    COMMA271=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4385); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      	emit(COMMA269, DroolsEditorType.SYMBOL);	
+            	      	emit(COMMA271, DroolsEditorType.SYMBOL);	
             	    }
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator4372);
-            	    expression_value270=expression_value();
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4390);
+            	    expression_value272=expression_value();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value270.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value272.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop89;
+            	    break loop90;
                 }
             } while (true);
 
-            RIGHT_PAREN271=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4380); if (failed) return retval;
+            RIGHT_PAREN273=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4398); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_PAREN271_tree = (Object)adaptor.create(RIGHT_PAREN271);
-            adaptor.addChild(root_0, RIGHT_PAREN271_tree);
+            RIGHT_PAREN273_tree = (Object)adaptor.create(RIGHT_PAREN273);
+            adaptor.addChild(root_0, RIGHT_PAREN273_tree);
             }
             if ( backtracking==0 ) {
-              	emit(RIGHT_PAREN271, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_PAREN273, DroolsEditorType.SYMBOL);	
             }
             if ( backtracking==0 ) {
               	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	
@@ -12153,33 +12215,33 @@
     };
 
     // $ANTLR start expression_value
-    // src/main/resources/org/drools/lang/DRL.g:1277:1: expression_value : ( accessor_path | literal_constraint | paren_chunk ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1278: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_path272 = null;
+        accessor_path_return accessor_path274 = null;
 
-        literal_constraint_return literal_constraint273 = null;
+        literal_constraint_return literal_constraint275 = null;
 
-        paren_chunk_return paren_chunk274 = null;
+        paren_chunk_return paren_chunk276 = null;
 
 
 
         try {
-            // 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 )
+            // src/main/resources/org/drools/lang/DRL.g:1279:2: ( ( accessor_path | literal_constraint | paren_chunk ) )
+            // src/main/resources/org/drools/lang/DRL.g:1279:4: ( accessor_path | literal_constraint | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            // src/main/resources/org/drools/lang/DRL.g:1278:4: ( accessor_path | literal_constraint | paren_chunk )
-            int alt90=3;
+            // src/main/resources/org/drools/lang/DRL.g:1279:4: ( accessor_path | literal_constraint | paren_chunk )
+            int alt91=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                alt90=1;
+                alt91=1;
                 }
                 break;
             case STRING:
@@ -12188,53 +12250,53 @@
             case FLOAT:
             case NULL:
                 {
-                alt90=2;
+                alt91=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt90=3;
+                alt91=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1278:4: ( accessor_path | literal_constraint | paren_chunk )", 90, 0, input);
+                    new NoViableAltException("1279:4: ( accessor_path | literal_constraint | paren_chunk )", 91, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt90) {
+            switch (alt91) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1278:5: accessor_path
+                    // src/main/resources/org/drools/lang/DRL.g:1279:5: accessor_path
                     {
-                    pushFollow(FOLLOW_accessor_path_in_expression_value4401);
-                    accessor_path272=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4419);
+                    accessor_path274=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path272.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path274.getTree());
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1279:4: literal_constraint
+                    // src/main/resources/org/drools/lang/DRL.g:1280:4: literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value4406);
-                    literal_constraint273=literal_constraint();
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4424);
+                    literal_constraint275=literal_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint273.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint275.getTree());
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1280:4: paren_chunk
+                    // src/main/resources/org/drools/lang/DRL.g:1281:4: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value4412);
-                    paren_chunk274=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4430);
+                    paren_chunk276=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk274.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk276.getTree());
 
                     }
                     break;
@@ -12280,144 +12342,144 @@
     };
 
     // $ANTLR start literal_constraint
-    // src/main/resources/org/drools/lang/DRL.g:1294:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );
+    // src/main/resources/org/drools/lang/DRL.g:1295: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 STRING275=null;
-        Token INT276=null;
-        Token FLOAT277=null;
-        Token BOOL278=null;
-        Token NULL279=null;
+        Token STRING277=null;
+        Token INT278=null;
+        Token FLOAT279=null;
+        Token BOOL280=null;
+        Token NULL281=null;
 
-        Object STRING275_tree=null;
-        Object INT276_tree=null;
-        Object FLOAT277_tree=null;
-        Object BOOL278_tree=null;
-        Object NULL279_tree=null;
+        Object STRING277_tree=null;
+        Object INT278_tree=null;
+        Object FLOAT279_tree=null;
+        Object BOOL280_tree=null;
+        Object NULL281_tree=null;
 
         try {
-            // src/main/resources/org/drools/lang/DRL.g:1295:2: ( STRING | INT | FLOAT | BOOL | NULL )
-            int alt91=5;
+            // src/main/resources/org/drools/lang/DRL.g:1296:2: ( STRING | INT | FLOAT | BOOL | NULL )
+            int alt92=5;
             switch ( input.LA(1) ) {
             case STRING:
                 {
-                alt91=1;
+                alt92=1;
                 }
                 break;
             case INT:
                 {
-                alt91=2;
+                alt92=2;
                 }
                 break;
             case FLOAT:
                 {
-                alt91=3;
+                alt92=3;
                 }
                 break;
             case BOOL:
                 {
-                alt91=4;
+                alt92=4;
                 }
                 break;
             case NULL:
                 {
-                alt91=5;
+                alt92=5;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1294:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );", 91, 0, input);
+                    new NoViableAltException("1295:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );", 92, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt91) {
+            switch (alt92) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1295:4: STRING
+                    // src/main/resources/org/drools/lang/DRL.g:1296:4: STRING
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    STRING275=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4431); if (failed) return retval;
+                    STRING277=(Token)input.LT(1);
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4449); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    STRING275_tree = (Object)adaptor.create(STRING275);
-                    adaptor.addChild(root_0, STRING275_tree);
+                    STRING277_tree = (Object)adaptor.create(STRING277);
+                    adaptor.addChild(root_0, STRING277_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(STRING275, DroolsEditorType.STRING_CONST);	
+                      	emit(STRING277, DroolsEditorType.STRING_CONST);	
                     }
 
                     }
                     break;
                 case 2 :
-                    // src/main/resources/org/drools/lang/DRL.g:1296:4: INT
+                    // src/main/resources/org/drools/lang/DRL.g:1297:4: INT
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    INT276=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint4438); if (failed) return retval;
+                    INT278=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4456); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    INT276_tree = (Object)adaptor.create(INT276);
-                    adaptor.addChild(root_0, INT276_tree);
+                    INT278_tree = (Object)adaptor.create(INT278);
+                    adaptor.addChild(root_0, INT278_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(INT276, DroolsEditorType.NUMERIC_CONST);	
+                      	emit(INT278, DroolsEditorType.NUMERIC_CONST);	
                     }
 
                     }
                     break;
                 case 3 :
-                    // src/main/resources/org/drools/lang/DRL.g:1297:4: FLOAT
+                    // src/main/resources/org/drools/lang/DRL.g:1298:4: FLOAT
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    FLOAT277=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4445); if (failed) return retval;
+                    FLOAT279=(Token)input.LT(1);
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4463); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    FLOAT277_tree = (Object)adaptor.create(FLOAT277);
-                    adaptor.addChild(root_0, FLOAT277_tree);
+                    FLOAT279_tree = (Object)adaptor.create(FLOAT279);
+                    adaptor.addChild(root_0, FLOAT279_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(FLOAT277, DroolsEditorType.NUMERIC_CONST);	
+                      	emit(FLOAT279, DroolsEditorType.NUMERIC_CONST);	
                     }
 
                     }
                     break;
                 case 4 :
-                    // src/main/resources/org/drools/lang/DRL.g:1298:4: BOOL
+                    // src/main/resources/org/drools/lang/DRL.g:1299:4: BOOL
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    BOOL278=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4452); if (failed) return retval;
+                    BOOL280=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4470); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL278_tree = (Object)adaptor.create(BOOL278);
-                    adaptor.addChild(root_0, BOOL278_tree);
+                    BOOL280_tree = (Object)adaptor.create(BOOL280);
+                    adaptor.addChild(root_0, BOOL280_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(BOOL278, DroolsEditorType.BOOLEAN_CONST);	
+                      	emit(BOOL280, DroolsEditorType.BOOLEAN_CONST);	
                     }
 
                     }
                     break;
                 case 5 :
-                    // src/main/resources/org/drools/lang/DRL.g:1299:4: NULL
+                    // src/main/resources/org/drools/lang/DRL.g:1300:4: NULL
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    NULL279=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4459); if (failed) return retval;
+                    NULL281=(Token)input.LT(1);
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4477); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    NULL279_tree = (Object)adaptor.create(NULL279);
-                    adaptor.addChild(root_0, NULL279_tree);
+                    NULL281_tree = (Object)adaptor.create(NULL281);
+                    adaptor.addChild(root_0, NULL281_tree);
                     }
                     if ( backtracking==0 ) {
-                      	emit(NULL279, DroolsEditorType.NULL_CONST);	
+                      	emit(NULL281, DroolsEditorType.NULL_CONST);	
                     }
 
                     }
@@ -12447,7 +12509,7 @@
     };
 
     // $ANTLR start pattern_type
-    // 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 )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1303: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);
@@ -12456,7 +12518,7 @@
 
         Token id=null;
         List list_id=null;
-        dimension_definition_return dimension_definition280 = null;
+        dimension_definition_return dimension_definition282 = null;
 
 
         Object id_tree=null;
@@ -12464,40 +12526,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: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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1304:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1304:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_pattern_type4474); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_pattern_type4492); 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:1303:11: (id+= DOT id+= ID )*
-            loop92:
+            // src/main/resources/org/drools/lang/DRL.g:1304:11: (id+= DOT id+= ID )*
+            loop93:
             do {
-                int alt92=2;
-                int LA92_0 = input.LA(1);
+                int alt93=2;
+                int LA93_0 = input.LA(1);
 
-                if ( (LA92_0==DOT) ) {
-                    alt92=1;
+                if ( (LA93_0==DOT) ) {
+                    alt93=1;
                 }
 
 
-                switch (alt92) {
+                switch (alt93) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1303:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:1304:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_pattern_type4480); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_pattern_type4498); 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_type4484); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_pattern_type4502); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -12508,7 +12570,7 @@
             	    break;
 
             	default :
-            	    break loop92;
+            	    break loop93;
                 }
             } while (true);
 
@@ -12516,32 +12578,32 @@
               	emit(list_id, DroolsEditorType.IDENTIFIER);
               		setParaphrasesValue(DroolsParaphraseTypes.PATTERN, buildStringFromTokens(list_id));	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1306:6: ( dimension_definition )*
-            loop93:
+            // src/main/resources/org/drools/lang/DRL.g:1307:6: ( dimension_definition )*
+            loop94:
             do {
-                int alt93=2;
-                int LA93_0 = input.LA(1);
+                int alt94=2;
+                int LA94_0 = input.LA(1);
 
-                if ( (LA93_0==LEFT_SQUARE) ) {
-                    alt93=1;
+                if ( (LA94_0==LEFT_SQUARE) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt94) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1306:6: dimension_definition
+            	    // src/main/resources/org/drools/lang/DRL.g:1307:6: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type4499);
-            	    dimension_definition280=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type4517);
+            	    dimension_definition282=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_definition282.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop94;
                 }
             } while (true);
 
@@ -12557,9 +12619,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1307:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+            // 1308:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1307:6: ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+                // src/main/resources/org/drools/lang/DRL.g:1308: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);
@@ -12572,7 +12634,7 @@
 
                 }
                 stream_ID.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1307:28: ( dimension_definition )*
+                // src/main/resources/org/drools/lang/DRL.g:1308:28: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -12611,7 +12673,7 @@
     };
 
     // $ANTLR start data_type
-    // 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 )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1311: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);
@@ -12620,7 +12682,7 @@
 
         Token id=null;
         List list_id=null;
-        dimension_definition_return dimension_definition281 = null;
+        dimension_definition_return dimension_definition283 = null;
 
 
         Object id_tree=null;
@@ -12628,40 +12690,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: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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1312:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1312:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_data_type4527); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_data_type4545); 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:1311:11: (id+= DOT id+= ID )*
-            loop94:
+            // src/main/resources/org/drools/lang/DRL.g:1312:11: (id+= DOT id+= ID )*
+            loop95:
             do {
-                int alt94=2;
-                int LA94_0 = input.LA(1);
+                int alt95=2;
+                int LA95_0 = input.LA(1);
 
-                if ( (LA94_0==DOT) ) {
-                    alt94=1;
+                if ( (LA95_0==DOT) ) {
+                    alt95=1;
                 }
 
 
-                switch (alt94) {
+                switch (alt95) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1311:13: id+= DOT id+= ID
+            	    // src/main/resources/org/drools/lang/DRL.g:1312:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_data_type4533); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_data_type4551); 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_type4537); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_data_type4555); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -12672,36 +12734,36 @@
             	    break;
 
             	default :
-            	    break loop94;
+            	    break loop95;
                 }
             } while (true);
 
-            // src/main/resources/org/drools/lang/DRL.g:1311:31: ( dimension_definition )*
-            loop95:
+            // src/main/resources/org/drools/lang/DRL.g:1312:31: ( dimension_definition )*
+            loop96:
             do {
-                int alt95=2;
-                int LA95_0 = input.LA(1);
+                int alt96=2;
+                int LA96_0 = input.LA(1);
 
-                if ( (LA95_0==LEFT_SQUARE) ) {
-                    alt95=1;
+                if ( (LA96_0==LEFT_SQUARE) ) {
+                    alt96=1;
                 }
 
 
-                switch (alt95) {
+                switch (alt96) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1311:31: dimension_definition
+            	    // src/main/resources/org/drools/lang/DRL.g:1312:31: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_data_type4542);
-            	    dimension_definition281=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_data_type4560);
+            	    dimension_definition283=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition281.getTree());
+            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition283.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop95;
+            	    break loop96;
                 }
             } while (true);
 
@@ -12720,9 +12782,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1313:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+            // 1314:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1313:6: ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+                // src/main/resources/org/drools/lang/DRL.g:1314: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);
@@ -12735,7 +12797,7 @@
 
                 }
                 stream_ID.reset();
-                // src/main/resources/org/drools/lang/DRL.g:1313:25: ( dimension_definition )*
+                // src/main/resources/org/drools/lang/DRL.g:1314:25: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -12774,42 +12836,42 @@
     };
 
     // $ANTLR start dimension_definition
-    // src/main/resources/org/drools/lang/DRL.g:1316:1: dimension_definition : LEFT_SQUARE RIGHT_SQUARE ;
+    // src/main/resources/org/drools/lang/DRL.g:1317: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_SQUARE282=null;
-        Token RIGHT_SQUARE283=null;
+        Token LEFT_SQUARE284=null;
+        Token RIGHT_SQUARE285=null;
 
-        Object LEFT_SQUARE282_tree=null;
-        Object RIGHT_SQUARE283_tree=null;
+        Object LEFT_SQUARE284_tree=null;
+        Object RIGHT_SQUARE285_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1318:2: ( LEFT_SQUARE RIGHT_SQUARE )
+            // src/main/resources/org/drools/lang/DRL.g:1318:4: LEFT_SQUARE RIGHT_SQUARE
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_SQUARE282=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition4571); if (failed) return retval;
+            LEFT_SQUARE284=(Token)input.LT(1);
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition4589); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_SQUARE282_tree = (Object)adaptor.create(LEFT_SQUARE282);
-            adaptor.addChild(root_0, LEFT_SQUARE282_tree);
+            LEFT_SQUARE284_tree = (Object)adaptor.create(LEFT_SQUARE284);
+            adaptor.addChild(root_0, LEFT_SQUARE284_tree);
             }
             if ( backtracking==0 ) {
-              	emit(LEFT_SQUARE282, DroolsEditorType.SYMBOL);	
+              	emit(LEFT_SQUARE284, DroolsEditorType.SYMBOL);	
             }
-            RIGHT_SQUARE283=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition4578); if (failed) return retval;
+            RIGHT_SQUARE285=(Token)input.LT(1);
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition4596); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_SQUARE283_tree = (Object)adaptor.create(RIGHT_SQUARE283);
-            adaptor.addChild(root_0, RIGHT_SQUARE283_tree);
+            RIGHT_SQUARE285_tree = (Object)adaptor.create(RIGHT_SQUARE285);
+            adaptor.addChild(root_0, RIGHT_SQUARE285_tree);
             }
             if ( backtracking==0 ) {
-              	emit(RIGHT_SQUARE283, DroolsEditorType.SYMBOL);	
+              	emit(RIGHT_SQUARE285, DroolsEditorType.SYMBOL);	
             }
 
             }
@@ -12837,64 +12899,64 @@
     };
 
     // $ANTLR start accessor_path
-    // src/main/resources/org/drools/lang/DRL.g:1321:1: accessor_path : accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1322: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 DOT285=null;
-        accessor_element_return accessor_element284 = null;
-
+        Token DOT287=null;
         accessor_element_return accessor_element286 = null;
 
+        accessor_element_return accessor_element288 = null;
 
-        Object DOT285_tree=null;
+
+        Object DOT287_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: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 )*
+            // src/main/resources/org/drools/lang/DRL.g:1323:2: ( accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) )
+            // src/main/resources/org/drools/lang/DRL.g:1323:4: accessor_element ( DOT accessor_element )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path4592);
-            accessor_element284=accessor_element();
+            pushFollow(FOLLOW_accessor_element_in_accessor_path4610);
+            accessor_element286=accessor_element();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_accessor_element.add(accessor_element284.getTree());
-            // src/main/resources/org/drools/lang/DRL.g:1322:21: ( DOT accessor_element )*
-            loop96:
+            if ( backtracking==0 ) stream_accessor_element.add(accessor_element286.getTree());
+            // src/main/resources/org/drools/lang/DRL.g:1323:21: ( DOT accessor_element )*
+            loop97:
             do {
-                int alt96=2;
-                int LA96_0 = input.LA(1);
+                int alt97=2;
+                int LA97_0 = input.LA(1);
 
-                if ( (LA96_0==DOT) ) {
-                    alt96=1;
+                if ( (LA97_0==DOT) ) {
+                    alt97=1;
                 }
 
 
-                switch (alt96) {
+                switch (alt97) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1322:23: DOT accessor_element
+            	    // src/main/resources/org/drools/lang/DRL.g:1323:23: DOT accessor_element
             	    {
-            	    DOT285=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4596); if (failed) return retval;
-            	    if ( backtracking==0 ) stream_DOT.add(DOT285);
+            	    DOT287=(Token)input.LT(1);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4614); if (failed) return retval;
+            	    if ( backtracking==0 ) stream_DOT.add(DOT287);
 
             	    if ( backtracking==0 ) {
-            	      	emit(DOT285, DroolsEditorType.IDENTIFIER);	
+            	      	emit(DOT287, DroolsEditorType.IDENTIFIER);	
             	    }
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4600);
-            	    accessor_element286=accessor_element();
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4618);
+            	    accessor_element288=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element286.getTree());
+            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element288.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop97;
                 }
             } while (true);
 
@@ -12910,9 +12972,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1323:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+            // 1324:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1323:5: ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+                // src/main/resources/org/drools/lang/DRL.g:1324: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);
@@ -12958,57 +13020,57 @@
     };
 
     // $ANTLR start accessor_element
-    // src/main/resources/org/drools/lang/DRL.g:1326:1: accessor_element : ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) ;
+    // src/main/resources/org/drools/lang/DRL.g:1327: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 ID287=null;
-        square_chunk_return square_chunk288 = null;
+        Token ID289=null;
+        square_chunk_return square_chunk290 = null;
 
 
-        Object ID287_tree=null;
+        Object ID289_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:1327:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
-            // src/main/resources/org/drools/lang/DRL.g:1327:4: ID ( square_chunk )*
+            // src/main/resources/org/drools/lang/DRL.g:1328:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
+            // src/main/resources/org/drools/lang/DRL.g:1328:4: ID ( square_chunk )*
             {
-            ID287=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accessor_element4624); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID287);
+            ID289=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accessor_element4642); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID289);
 
             if ( backtracking==0 ) {
-              	emit(ID287, DroolsEditorType.IDENTIFIER);	
+              	emit(ID289, DroolsEditorType.IDENTIFIER);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1328:3: ( square_chunk )*
-            loop97:
+            // src/main/resources/org/drools/lang/DRL.g:1329:3: ( square_chunk )*
+            loop98:
             do {
-                int alt97=2;
-                int LA97_0 = input.LA(1);
+                int alt98=2;
+                int LA98_0 = input.LA(1);
 
-                if ( (LA97_0==LEFT_SQUARE) ) {
-                    alt97=1;
+                if ( (LA98_0==LEFT_SQUARE) ) {
+                    alt98=1;
                 }
 
 
-                switch (alt97) {
+                switch (alt98) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1328:3: square_chunk
+            	    // src/main/resources/org/drools/lang/DRL.g:1329:3: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4630);
-            	    square_chunk288=square_chunk();
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4648);
+            	    square_chunk290=square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk288.getTree());
+            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk290.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop97;
+            	    break loop98;
                 }
             } while (true);
 
@@ -13024,15 +13086,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1329:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+            // 1330:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
             {
-                // src/main/resources/org/drools/lang/DRL.g:1329:5: ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+                // src/main/resources/org/drools/lang/DRL.g:1330: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:1329:30: ( square_chunk )*
+                // src/main/resources/org/drools/lang/DRL.g:1330:30: ( square_chunk )*
                 while ( stream_square_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_square_chunk.next());
 
@@ -13071,7 +13133,7 @@
     };
 
     // $ANTLR start rhs_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1332:1: rhs_chunk : rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1333: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);
@@ -13082,14 +13144,14 @@
 
 
         RewriteRuleSubtreeStream stream_rhs_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk_data");
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1336:3: (rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1336:5: rc= rhs_chunk_data
             {
-            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk4659);
+            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk4677);
             rc=rhs_chunk_data();
             _fsp--;
             if (failed) return retval;
@@ -13109,7 +13171,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1336:2: -> VT_RHS_CHUNK[$rc.start,text]
+            // 1337:2: -> VT_RHS_CHUNK[$rc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_RHS_CHUNK, ((Token)rc.start), text));
 
@@ -13142,7 +13204,7 @@
     };
 
     // $ANTLR start rhs_chunk_data
-    // src/main/resources/org/drools/lang/DRL.g:1339:1: rhs_chunk_data : THEN (any=~ END )* end1= END ( SEMICOLON )? ;
+    // src/main/resources/org/drools/lang/DRL.g:1340: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);
@@ -13151,46 +13213,46 @@
 
         Token any=null;
         Token end1=null;
-        Token THEN289=null;
-        Token SEMICOLON290=null;
+        Token THEN291=null;
+        Token SEMICOLON292=null;
 
         Object any_tree=null;
         Object end1_tree=null;
-        Object THEN289_tree=null;
-        Object SEMICOLON290_tree=null;
+        Object THEN291_tree=null;
+        Object SEMICOLON292_tree=null;
 
         try {
-            // 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 )?
+            // src/main/resources/org/drools/lang/DRL.g:1341:2: ( THEN (any=~ END )* end1= END ( SEMICOLON )? )
+            // src/main/resources/org/drools/lang/DRL.g:1341:4: THEN (any=~ END )* end1= END ( SEMICOLON )?
             {
             root_0 = (Object)adaptor.nil();
 
-            THEN289=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data4678); if (failed) return retval;
+            THEN291=(Token)input.LT(1);
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data4696); if (failed) return retval;
             if ( backtracking==0 ) {
-            THEN289_tree = (Object)adaptor.create(THEN289);
-            adaptor.addChild(root_0, THEN289_tree);
+            THEN291_tree = (Object)adaptor.create(THEN291);
+            adaptor.addChild(root_0, THEN291_tree);
             }
             if ( backtracking==0 ) {
-              	if (THEN289.getText().equalsIgnoreCase("then")){
-              			emit(THEN289, DroolsEditorType.KEYWORD);
+              	if (THEN291.getText().equalsIgnoreCase("then")){
+              			emit(THEN291, DroolsEditorType.KEYWORD);
               			emit(Location.LOCATION_RHS);
               		}	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1345:4: (any=~ END )*
-            loop98:
+            // src/main/resources/org/drools/lang/DRL.g:1346:4: (any=~ END )*
+            loop99:
             do {
-                int alt98=2;
-                int LA98_0 = input.LA(1);
+                int alt99=2;
+                int LA99_0 = input.LA(1);
 
-                if ( ((LA98_0>=VT_COMPILATION_UNIT && LA98_0<=DOT_STAR)||(LA98_0>=STRING && LA98_0<=MULTI_LINE_COMMENT)) ) {
-                    alt98=1;
+                if ( ((LA99_0>=VT_COMPILATION_UNIT && LA99_0<=DOT_STAR)||(LA99_0>=STRING && LA99_0<=MULTI_LINE_COMMENT)) ) {
+                    alt99=1;
                 }
 
 
-                switch (alt98) {
+                switch (alt99) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1345:6: any=~ END
+            	    // src/main/resources/org/drools/lang/DRL.g:1346: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) ) {
@@ -13202,7 +13264,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data4691);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data4709);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13213,12 +13275,12 @@
             	    break;
 
             	default :
-            	    break loop98;
+            	    break loop99;
                 }
             } while (true);
 
             end1=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk_data4704); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_rhs_chunk_data4722); if (failed) return retval;
             if ( backtracking==0 ) {
             end1_tree = (Object)adaptor.create(end1);
             adaptor.addChild(root_0, end1_tree);
@@ -13226,22 +13288,22 @@
             if ( backtracking==0 ) {
               	emit(end1, DroolsEditorType.KEYWORD);	
             }
-            // src/main/resources/org/drools/lang/DRL.g:1347:3: ( SEMICOLON )?
-            int alt99=2;
-            int LA99_0 = input.LA(1);
+            // src/main/resources/org/drools/lang/DRL.g:1348:3: ( SEMICOLON )?
+            int alt100=2;
+            int LA100_0 = input.LA(1);
 
-            if ( (LA99_0==SEMICOLON) ) {
-                alt99=1;
+            if ( (LA100_0==SEMICOLON) ) {
+                alt100=1;
             }
-            switch (alt99) {
+            switch (alt100) {
                 case 1 :
-                    // src/main/resources/org/drools/lang/DRL.g:1347:3: SEMICOLON
+                    // src/main/resources/org/drools/lang/DRL.g:1348:3: SEMICOLON
                     {
-                    SEMICOLON290=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data4710); if (failed) return retval;
+                    SEMICOLON292=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data4728); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    SEMICOLON290_tree = (Object)adaptor.create(SEMICOLON290);
-                    adaptor.addChild(root_0, SEMICOLON290_tree);
+                    SEMICOLON292_tree = (Object)adaptor.create(SEMICOLON292);
+                    adaptor.addChild(root_0, SEMICOLON292_tree);
                     }
 
                     }
@@ -13250,7 +13312,7 @@
             }
 
             if ( backtracking==0 ) {
-              	emit(SEMICOLON290, DroolsEditorType.KEYWORD);	
+              	emit(SEMICOLON292, DroolsEditorType.KEYWORD);	
             }
 
             }
@@ -13278,7 +13340,7 @@
     };
 
     // $ANTLR start curly_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1350:1: curly_chunk : cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1351: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);
@@ -13289,14 +13351,14 @@
 
 
         RewriteRuleSubtreeStream stream_curly_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule curly_chunk_data");
-        
+
         	String text = "";
 
         try {
-            // 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]
+            // src/main/resources/org/drools/lang/DRL.g:1354:3: (cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1354:5: cc= curly_chunk_data[false]
             {
-            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk4729);
+            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk4747);
             cc=curly_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13316,7 +13378,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1354:2: -> VT_CURLY_CHUNK[$cc.start,text]
+            // 1355:2: -> VT_CURLY_CHUNK[$cc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_CURLY_CHUNK, ((Token)cc.start), text));
 
@@ -13349,7 +13411,7 @@
     };
 
     // $ANTLR start curly_chunk_data
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1358: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);
@@ -13359,7 +13421,7 @@
         Token lc1=null;
         Token any=null;
         Token rc1=null;
-        curly_chunk_data_return curly_chunk_data291 = null;
+        curly_chunk_data_return curly_chunk_data293 = null;
 
 
         Object lc1_tree=null;
@@ -13367,13 +13429,13 @@
         Object rc1_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1359:2: (lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY )
+            // src/main/resources/org/drools/lang/DRL.g:1359: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_data4752); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk_data4770); if (failed) return retval;
             if ( backtracking==0 ) {
             lc1_tree = (Object)adaptor.create(lc1);
             adaptor.addChild(root_0, lc1_tree);
@@ -13386,23 +13448,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1365:4: (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )*
-            loop100:
+            // src/main/resources/org/drools/lang/DRL.g:1366:4: (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_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<=THEN)||(LA100_0>=MISC && LA100_0<=MULTI_LINE_COMMENT)) ) {
-                    alt100=1;
+                if ( ((LA101_0>=VT_COMPILATION_UNIT && LA101_0<=THEN)||(LA101_0>=MISC && LA101_0<=MULTI_LINE_COMMENT)) ) {
+                    alt101=1;
                 }
-                else if ( (LA100_0==LEFT_CURLY) ) {
-                    alt100=2;
+                else if ( (LA101_0==LEFT_CURLY) ) {
+                    alt101=2;
                 }
 
 
-                switch (alt100) {
+                switch (alt101) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1365:5: any=~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // src/main/resources/org/drools/lang/DRL.g:1366: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) ) {
@@ -13414,7 +13476,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data4764);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data4782);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13424,24 +13486,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1365:87: curly_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1366:87: curly_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data4780);
-            	    curly_chunk_data291=curly_chunk_data(true);
+            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data4798);
+            	    curly_chunk_data293=curly_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data291.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data293.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop101;
                 }
             } while (true);
 
             rc1=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data4791); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data4809); if (failed) return retval;
             if ( backtracking==0 ) {
             rc1_tree = (Object)adaptor.create(rc1);
             adaptor.addChild(root_0, rc1_tree);
@@ -13480,7 +13542,7 @@
     };
 
     // $ANTLR start paren_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1375:1: paren_chunk : pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1376: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);
@@ -13491,14 +13553,14 @@
 
 
         RewriteRuleSubtreeStream stream_paren_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk_data");
-        
+
         	String text = "";
 
         try {
-            // 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]
+            // src/main/resources/org/drools/lang/DRL.g:1379:3: (pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1379:5: pc= paren_chunk_data[false]
             {
-            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk4812);
+            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk4830);
             pc=paren_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13518,7 +13580,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1379:2: -> VT_PAREN_CHUNK[$pc.start,text]
+            // 1380:2: -> VT_PAREN_CHUNK[$pc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_PAREN_CHUNK, ((Token)pc.start), text));
 
@@ -13551,7 +13613,7 @@
     };
 
     // $ANTLR start paren_chunk_data
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1383: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);
@@ -13561,7 +13623,7 @@
         Token lp1=null;
         Token any=null;
         Token rp1=null;
-        paren_chunk_data_return paren_chunk_data292 = null;
+        paren_chunk_data_return paren_chunk_data294 = null;
 
 
         Object lp1_tree=null;
@@ -13569,13 +13631,13 @@
         Object rp1_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1384:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN )
+            // src/main/resources/org/drools/lang/DRL.g:1384: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_data4836); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk_data4854); if (failed) return retval;
             if ( backtracking==0 ) {
             lp1_tree = (Object)adaptor.create(lp1);
             adaptor.addChild(root_0, lp1_tree);
@@ -13588,23 +13650,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1390:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )*
-            loop101:
+            // src/main/resources/org/drools/lang/DRL.g:1391:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_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<=STRING)||LA101_0==COMMA||(LA101_0>=AT && LA101_0<=MULTI_LINE_COMMENT)) ) {
-                    alt101=1;
+                if ( ((LA102_0>=VT_COMPILATION_UNIT && LA102_0<=STRING)||LA102_0==COMMA||(LA102_0>=AT && LA102_0<=MULTI_LINE_COMMENT)) ) {
+                    alt102=1;
                 }
-                else if ( (LA101_0==LEFT_PAREN) ) {
-                    alt101=2;
+                else if ( (LA102_0==LEFT_PAREN) ) {
+                    alt102=2;
                 }
 
 
-                switch (alt101) {
+                switch (alt102) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1390:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // src/main/resources/org/drools/lang/DRL.g:1391: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) ) {
@@ -13616,7 +13678,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data4848);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data4866);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13626,24 +13688,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1390:87: paren_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1391:87: paren_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data4864);
-            	    paren_chunk_data292=paren_chunk_data(true);
+            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data4882);
+            	    paren_chunk_data294=paren_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data292.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data294.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop101;
+            	    break loop102;
                 }
             } while (true);
 
             rp1=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data4875); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data4893); if (failed) return retval;
             if ( backtracking==0 ) {
             rp1_tree = (Object)adaptor.create(rp1);
             adaptor.addChild(root_0, rp1_tree);
@@ -13682,7 +13744,7 @@
     };
 
     // $ANTLR start square_chunk
-    // src/main/resources/org/drools/lang/DRL.g:1400:1: square_chunk : sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1401: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);
@@ -13693,14 +13755,14 @@
 
 
         RewriteRuleSubtreeStream stream_square_chunk_data=new RewriteRuleSubtreeStream(adaptor,"rule square_chunk_data");
-        
+
         	String text = "";
 
         try {
-            // 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]
+            // src/main/resources/org/drools/lang/DRL.g:1404:3: (sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] )
+            // src/main/resources/org/drools/lang/DRL.g:1404:5: sc= square_chunk_data[false]
             {
-            pushFollow(FOLLOW_square_chunk_data_in_square_chunk4896);
+            pushFollow(FOLLOW_square_chunk_data_in_square_chunk4914);
             sc=square_chunk_data(false);
             _fsp--;
             if (failed) return retval;
@@ -13720,7 +13782,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1404:2: -> VT_SQUARE_CHUNK[$sc.start,text]
+            // 1405:2: -> VT_SQUARE_CHUNK[$sc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_SQUARE_CHUNK, ((Token)sc.start), text));
 
@@ -13753,7 +13815,7 @@
     };
 
     // $ANTLR start square_chunk_data
-    // 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 ;
+    // src/main/resources/org/drools/lang/DRL.g:1408: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);
@@ -13763,7 +13825,7 @@
         Token ls1=null;
         Token any=null;
         Token rs1=null;
-        square_chunk_data_return square_chunk_data293 = null;
+        square_chunk_data_return square_chunk_data295 = null;
 
 
         Object ls1_tree=null;
@@ -13771,13 +13833,13 @@
         Object rs1_tree=null;
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1409:2: (ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE )
+            // src/main/resources/org/drools/lang/DRL.g:1409: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_data4919); if (failed) return retval;
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk_data4937); if (failed) return retval;
             if ( backtracking==0 ) {
             ls1_tree = (Object)adaptor.create(ls1);
             adaptor.addChild(root_0, ls1_tree);
@@ -13790,23 +13852,23 @@
               			}	
               		
             }
-            // src/main/resources/org/drools/lang/DRL.g:1415:4: (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )*
-            loop102:
+            // src/main/resources/org/drools/lang/DRL.g:1416:4: (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )*
+            loop103:
             do {
-                int alt102=3;
-                int LA102_0 = input.LA(1);
+                int alt103=3;
+                int LA103_0 = input.LA(1);
 
-                if ( ((LA102_0>=VT_COMPILATION_UNIT && LA102_0<=NULL)||(LA102_0>=THEN && LA102_0<=MULTI_LINE_COMMENT)) ) {
-                    alt102=1;
+                if ( ((LA103_0>=VT_COMPILATION_UNIT && LA103_0<=NULL)||(LA103_0>=THEN && LA103_0<=MULTI_LINE_COMMENT)) ) {
+                    alt103=1;
                 }
-                else if ( (LA102_0==LEFT_SQUARE) ) {
-                    alt102=2;
+                else if ( (LA103_0==LEFT_SQUARE) ) {
+                    alt103=2;
                 }
 
 
-                switch (alt102) {
+                switch (alt103) {
             	case 1 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1415:5: any=~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // src/main/resources/org/drools/lang/DRL.g:1416: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) ) {
@@ -13818,7 +13880,7 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4931);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4949);    throw mse;
             	    }
 
             	    if ( backtracking==0 ) {
@@ -13828,24 +13890,24 @@
             	    }
             	    break;
             	case 2 :
-            	    // src/main/resources/org/drools/lang/DRL.g:1415:88: square_chunk_data[true]
+            	    // src/main/resources/org/drools/lang/DRL.g:1416:88: square_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4946);
-            	    square_chunk_data293=square_chunk_data(true);
+            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4964);
+            	    square_chunk_data295=square_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data293.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data295.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop102;
+            	    break loop103;
                 }
             } while (true);
 
             rs1=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4957); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4975); if (failed) return retval;
             if ( backtracking==0 ) {
             rs1_tree = (Object)adaptor.create(rs1);
             adaptor.addChild(root_0, rs1_tree);
@@ -13884,7 +13946,7 @@
     };
 
     // $ANTLR start lock_on_active_key
-    // 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] ;
+    // src/main/resources/org/drools/lang/DRL.g:1426: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);
@@ -13902,38 +13964,38 @@
         Object id2_tree=null;
         Object mis2_tree=null;
         Object id3_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1429: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:1429: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_key4981); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4999); 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_key4985); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key5003); 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_key4989); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key5007); 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_key4993); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key5011); 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_key4997); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key5015); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id3);
 
             if ( backtracking==0 ) {
@@ -13958,7 +14020,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1434:3: -> VK_LOCK_ON_ACTIVE[$start, text]
+            // 1435:3: -> VK_LOCK_ON_ACTIVE[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_LOCK_ON_ACTIVE, ((Token)retval.start),  text));
 
@@ -13991,7 +14053,7 @@
     };
 
     // $ANTLR start date_effective_key
-    // src/main/resources/org/drools/lang/DRL.g:1437:1: date_effective_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1438: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);
@@ -14005,30 +14067,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1441:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1441: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_key5029); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_effective_key5047); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_effective_key5033); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_date_effective_key5051); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_effective_key5037); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_effective_key5055); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14051,7 +14113,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1444:3: -> VK_DATE_EFFECTIVE[$start, text]
+            // 1445:3: -> VK_DATE_EFFECTIVE[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DATE_EFFECTIVE, ((Token)retval.start),  text));
 
@@ -14084,7 +14146,7 @@
     };
 
     // $ANTLR start date_expires_key
-    // src/main/resources/org/drools/lang/DRL.g:1447:1: date_expires_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1448: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);
@@ -14098,30 +14160,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1451:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1451: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_key5069); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_expires_key5087); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_expires_key5073); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_date_expires_key5091); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_expires_key5077); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_date_expires_key5095); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14144,7 +14206,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1454:3: -> VK_DATE_EXPIRES[$start, text]
+            // 1455:3: -> VK_DATE_EXPIRES[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DATE_EXPIRES, ((Token)retval.start),  text));
 
@@ -14177,7 +14239,7 @@
     };
 
     // $ANTLR start no_loop_key
-    // src/main/resources/org/drools/lang/DRL.g:1457:1: no_loop_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1458: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);
@@ -14191,30 +14253,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1461:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1461: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_key5109); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_no_loop_key5127); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_no_loop_key5113); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_no_loop_key5131); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_no_loop_key5117); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_no_loop_key5135); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14237,7 +14299,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1464:3: -> VK_NO_LOOP[$start, text]
+            // 1465:3: -> VK_NO_LOOP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NO_LOOP, ((Token)retval.start),  text));
 
@@ -14270,7 +14332,7 @@
     };
 
     // $ANTLR start auto_focus_key
-    // src/main/resources/org/drools/lang/DRL.g:1467:1: auto_focus_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1468: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);
@@ -14284,30 +14346,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1471:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1471: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_key5149); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_auto_focus_key5167); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_auto_focus_key5153); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_auto_focus_key5171); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_auto_focus_key5157); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_auto_focus_key5175); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14330,7 +14392,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1474:3: -> VK_AUTO_FOCUS[$start, text]
+            // 1475:3: -> VK_AUTO_FOCUS[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AUTO_FOCUS, ((Token)retval.start),  text));
 
@@ -14363,7 +14425,7 @@
     };
 
     // $ANTLR start activation_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1477:1: activation_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1478: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);
@@ -14377,30 +14439,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1481:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1481: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_key5189); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_activation_group_key5207); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_activation_group_key5193); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_activation_group_key5211); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_activation_group_key5197); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_activation_group_key5215); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14423,7 +14485,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1484:3: -> VK_ACTIVATION_GROUP[$start, text]
+            // 1485:3: -> VK_ACTIVATION_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTIVATION_GROUP, ((Token)retval.start),  text));
 
@@ -14456,7 +14518,7 @@
     };
 
     // $ANTLR start agenda_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1487:1: agenda_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1488: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);
@@ -14470,30 +14532,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1491:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1491: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_key5229); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5247); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_agenda_group_key5233); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_agenda_group_key5251); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_agenda_group_key5237); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5255); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14516,7 +14578,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1494:3: -> VK_AGENDA_GROUP[$start, text]
+            // 1495:3: -> VK_AGENDA_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AGENDA_GROUP, ((Token)retval.start),  text));
 
@@ -14549,7 +14611,7 @@
     };
 
     // $ANTLR start ruleflow_group_key
-    // src/main/resources/org/drools/lang/DRL.g:1497:1: ruleflow_group_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1498: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);
@@ -14563,30 +14625,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1501:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1501: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_key5269); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5287); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key5273); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key5291); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5277); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5295); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14609,7 +14671,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1504:3: -> VK_RULEFLOW_GROUP[$start, text]
+            // 1505:3: -> VK_RULEFLOW_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULEFLOW_GROUP, ((Token)retval.start),  text));
 
@@ -14642,7 +14704,7 @@
     };
 
     // $ANTLR start entry_point_key
-    // src/main/resources/org/drools/lang/DRL.g:1507:1: entry_point_key : {...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] ;
+    // src/main/resources/org/drools/lang/DRL.g:1508: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);
@@ -14656,30 +14718,30 @@
         Object id1_tree=null;
         Object mis1_tree=null;
         Object id2_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
-        
+
         	String text = "";
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1511:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] )
+            // src/main/resources/org/drools/lang/DRL.g:1511: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_key5309); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_entry_point_key5327); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id1);
 
             mis1=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_entry_point_key5313); if (failed) return retval;
+            match(input,MISC,FOLLOW_MISC_in_entry_point_key5331); if (failed) return retval;
             if ( backtracking==0 ) stream_MISC.add(mis1);
 
             id2=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_entry_point_key5317); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_entry_point_key5335); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
@@ -14702,7 +14764,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1514:3: -> VK_ENTRY_POINT[$start, text]
+            // 1515:3: -> VK_ENTRY_POINT[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ENTRY_POINT, ((Token)retval.start),  text));
 
@@ -14735,7 +14797,7 @@
     };
 
     // $ANTLR start duration_key
-    // src/main/resources/org/drools/lang/DRL.g:1517:1: duration_key : {...}? =>id= ID -> VK_DURATION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1518: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);
@@ -14748,15 +14810,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1519:2: ({...}? =>id= ID -> VK_DURATION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1519: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_key5346); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_duration_key5364); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14774,7 +14836,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1520:3: -> VK_DURATION[$id]
+            // 1521:3: -> VK_DURATION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DURATION, id));
 
@@ -14807,7 +14869,7 @@
     };
 
     // $ANTLR start package_key
-    // src/main/resources/org/drools/lang/DRL.g:1523:1: package_key : {...}? =>id= ID -> VK_PACKAGE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1524: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);
@@ -14820,15 +14882,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1525:2: ({...}? =>id= ID -> VK_PACKAGE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1525: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_key5373); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_package_key5391); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14846,7 +14908,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1526:3: -> VK_PACKAGE[$id]
+            // 1527:3: -> VK_PACKAGE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_PACKAGE, id));
 
@@ -14879,7 +14941,7 @@
     };
 
     // $ANTLR start import_key
-    // src/main/resources/org/drools/lang/DRL.g:1529:1: import_key : {...}? =>id= ID -> VK_IMPORT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1530: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);
@@ -14892,15 +14954,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1531:2: ({...}? =>id= ID -> VK_IMPORT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1531: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_key5400); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_import_key5418); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14918,7 +14980,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1532:3: -> VK_IMPORT[$id]
+            // 1533:3: -> VK_IMPORT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IMPORT, id));
 
@@ -14951,7 +15013,7 @@
     };
 
     // $ANTLR start dialect_key
-    // src/main/resources/org/drools/lang/DRL.g:1535:1: dialect_key : {...}? =>id= ID -> VK_DIALECT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1536: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);
@@ -14964,15 +15026,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1537:2: ({...}? =>id= ID -> VK_DIALECT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1537: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_key5427); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_dialect_key5445); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -14990,7 +15052,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1538:3: -> VK_DIALECT[$id]
+            // 1539:3: -> VK_DIALECT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DIALECT, id));
 
@@ -15023,7 +15085,7 @@
     };
 
     // $ANTLR start salience_key
-    // src/main/resources/org/drools/lang/DRL.g:1541:1: salience_key : {...}? =>id= ID -> VK_SALIENCE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1542: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);
@@ -15036,15 +15098,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1543:2: ({...}? =>id= ID -> VK_SALIENCE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1543: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_key5454); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_salience_key5472); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15062,7 +15124,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1544:3: -> VK_SALIENCE[$id]
+            // 1545:3: -> VK_SALIENCE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SALIENCE, id));
 
@@ -15095,7 +15157,7 @@
     };
 
     // $ANTLR start enabled_key
-    // src/main/resources/org/drools/lang/DRL.g:1547:1: enabled_key : {...}? =>id= ID -> VK_ENABLED[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1548: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);
@@ -15108,15 +15170,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1549:2: ({...}? =>id= ID -> VK_ENABLED[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1549: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_key5481); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_enabled_key5499); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15134,7 +15196,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1550:3: -> VK_ENABLED[$id]
+            // 1551:3: -> VK_ENABLED[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ENABLED, id));
 
@@ -15167,7 +15229,7 @@
     };
 
     // $ANTLR start attributes_key
-    // src/main/resources/org/drools/lang/DRL.g:1553:1: attributes_key : {...}? =>id= ID -> VK_ATTRIBUTES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1554: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);
@@ -15180,15 +15242,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1555:2: ({...}? =>id= ID -> VK_ATTRIBUTES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1555: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_key5508); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_attributes_key5526); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15206,7 +15268,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1556:3: -> VK_ATTRIBUTES[$id]
+            // 1557:3: -> VK_ATTRIBUTES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ATTRIBUTES, id));
 
@@ -15239,7 +15301,7 @@
     };
 
     // $ANTLR start rule_key
-    // src/main/resources/org/drools/lang/DRL.g:1559:1: rule_key : {...}? =>id= ID -> VK_RULE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1560: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);
@@ -15252,15 +15314,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1561:2: ({...}? =>id= ID -> VK_RULE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1561: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_key5535); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_rule_key5553); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15278,7 +15340,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1562:3: -> VK_RULE[$id]
+            // 1563:3: -> VK_RULE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULE, id));
 
@@ -15305,13 +15367,85 @@
     }
     // $ANTLR end rule_key
 
+    public static class extend_key_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+    // $ANTLR start extend_key
+    // src/main/resources/org/drools/lang/DRL.g:1566:1: extend_key : {...}? =>id= ID -> VK_EXTEND[$id] ;
+    public final extend_key_return extend_key() throws RecognitionException {
+        extend_key_return retval = new extend_key_return();
+        retval.start = input.LT(1);
+
+        Object root_0 = null;
+
+        Token id=null;
+
+        Object id_tree=null;
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
+
+        try {
+            // src/main/resources/org/drools/lang/DRL.g:1567:2: ({...}? =>id= ID -> VK_EXTEND[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1567:4: {...}? =>id= ID
+            {
+            if ( !((validateIdentifierKey(DroolsSoftKeywords.EXTEND))) ) {
+                if (backtracking>0) {failed=true; return retval;}
+                throw new FailedPredicateException(input, "extend_key", "(validateIdentifierKey(DroolsSoftKeywords.EXTEND))");
+            }
+            id=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_extend_key5580); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id);
+
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
+
+            // AST REWRITE
+            // elements: 
+            // token labels: 
+            // rule labels: retval
+            // token list labels: 
+            // rule list labels: 
+            if ( backtracking==0 ) {
+            retval.tree = root_0;
+            RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
+
+            root_0 = (Object)adaptor.nil();
+            // 1569:3: -> VK_EXTEND[$id]
+            {
+                adaptor.addChild(root_0, adaptor.create(VK_EXTEND, id));
+
+            }
+
+            }
+
+            }
+
+            retval.stop = input.LT(-1);
+
+            if ( backtracking==0 ) {
+                retval.tree = (Object)adaptor.rulePostProcessing(root_0);
+                adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return retval;
+    }
+    // $ANTLR end extend_key
+
     public static class template_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
     // $ANTLR start template_key
-    // src/main/resources/org/drools/lang/DRL.g:1565:1: template_key : {...}? =>id= ID -> VK_TEMPLATE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1572: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);
@@ -15324,15 +15458,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1573:2: ({...}? =>id= ID -> VK_TEMPLATE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1573: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_key5562); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_template_key5607); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15350,7 +15484,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1568:3: -> VK_TEMPLATE[$id]
+            // 1575:3: -> VK_TEMPLATE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_TEMPLATE, id));
 
@@ -15383,7 +15517,7 @@
     };
 
     // $ANTLR start query_key
-    // src/main/resources/org/drools/lang/DRL.g:1571:1: query_key : {...}? =>id= ID -> VK_QUERY[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1578: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);
@@ -15396,15 +15530,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1579:2: ({...}? =>id= ID -> VK_QUERY[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1579: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_key5589); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_query_key5634); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15422,7 +15556,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1574:3: -> VK_QUERY[$id]
+            // 1581:3: -> VK_QUERY[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_QUERY, id));
 
@@ -15455,7 +15589,7 @@
     };
 
     // $ANTLR start declare_key
-    // src/main/resources/org/drools/lang/DRL.g:1577:1: declare_key : {...}? =>id= ID -> VK_DECLARE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1584: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);
@@ -15468,15 +15602,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1585:2: ({...}? =>id= ID -> VK_DECLARE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1585: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_key5616); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_declare_key5661); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15494,7 +15628,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1580:3: -> VK_DECLARE[$id]
+            // 1587:3: -> VK_DECLARE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DECLARE, id));
 
@@ -15527,7 +15661,7 @@
     };
 
     // $ANTLR start function_key
-    // src/main/resources/org/drools/lang/DRL.g:1583:1: function_key : {...}? =>id= ID -> VK_FUNCTION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1590: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);
@@ -15540,15 +15674,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1591:2: ({...}? =>id= ID -> VK_FUNCTION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1591: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_key5643); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function_key5688); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15566,7 +15700,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1586:3: -> VK_FUNCTION[$id]
+            // 1593:3: -> VK_FUNCTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FUNCTION, id));
 
@@ -15599,7 +15733,7 @@
     };
 
     // $ANTLR start global_key
-    // src/main/resources/org/drools/lang/DRL.g:1589:1: global_key : {...}? =>id= ID -> VK_GLOBAL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1596: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);
@@ -15612,15 +15746,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1597:2: ({...}? =>id= ID -> VK_GLOBAL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1597: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_key5670); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_global_key5715); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15638,7 +15772,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1592:3: -> VK_GLOBAL[$id]
+            // 1599:3: -> VK_GLOBAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_GLOBAL, id));
 
@@ -15671,7 +15805,7 @@
     };
 
     // $ANTLR start eval_key
-    // src/main/resources/org/drools/lang/DRL.g:1595:1: eval_key : {...}? =>id= ID -> VK_EVAL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1602: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);
@@ -15684,15 +15818,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1603:2: ({...}? =>id= ID -> VK_EVAL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1603: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_key5697); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_eval_key5742); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15710,7 +15844,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1598:3: -> VK_EVAL[$id]
+            // 1605:3: -> VK_EVAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EVAL, id));
 
@@ -15743,7 +15877,7 @@
     };
 
     // $ANTLR start contains_key
-    // src/main/resources/org/drools/lang/DRL.g:1601:1: contains_key : {...}? =>id= ID -> VK_CONTAINS[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1608: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);
@@ -15756,15 +15890,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1609:2: ({...}? =>id= ID -> VK_CONTAINS[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1609: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_key5724); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_contains_key5769); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15782,7 +15916,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1604:3: -> VK_CONTAINS[$id]
+            // 1611:3: -> VK_CONTAINS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_CONTAINS, id));
 
@@ -15815,7 +15949,7 @@
     };
 
     // $ANTLR start matches_key
-    // src/main/resources/org/drools/lang/DRL.g:1607:1: matches_key : {...}? =>id= ID -> VK_MATCHES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1614: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);
@@ -15828,15 +15962,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1615:2: ({...}? =>id= ID -> VK_MATCHES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1615: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_key5751); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_matches_key5796); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15854,7 +15988,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1610:3: -> VK_MATCHES[$id]
+            // 1617:3: -> VK_MATCHES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MATCHES, id));
 
@@ -15887,7 +16021,7 @@
     };
 
     // $ANTLR start excludes_key
-    // src/main/resources/org/drools/lang/DRL.g:1613:1: excludes_key : {...}? =>id= ID -> VK_EXCLUDES[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1620: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);
@@ -15900,15 +16034,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1621:2: ({...}? =>id= ID -> VK_EXCLUDES[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1621: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_key5778); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_excludes_key5823); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15926,7 +16060,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1616:3: -> VK_EXCLUDES[$id]
+            // 1623:3: -> VK_EXCLUDES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXCLUDES, id));
 
@@ -15959,7 +16093,7 @@
     };
 
     // $ANTLR start soundslike_key
-    // src/main/resources/org/drools/lang/DRL.g:1619:1: soundslike_key : {...}? =>id= ID -> VK_SOUNDSLIKE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1626: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);
@@ -15972,15 +16106,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1627:2: ({...}? =>id= ID -> VK_SOUNDSLIKE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1627: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_key5805); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_soundslike_key5850); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -15998,7 +16132,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1622:3: -> VK_SOUNDSLIKE[$id]
+            // 1629:3: -> VK_SOUNDSLIKE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SOUNDSLIKE, id));
 
@@ -16031,7 +16165,7 @@
     };
 
     // $ANTLR start memberof_key
-    // src/main/resources/org/drools/lang/DRL.g:1625:1: memberof_key : {...}? =>id= ID -> VK_MEMBEROF[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1632: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);
@@ -16044,15 +16178,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1633:2: ({...}? =>id= ID -> VK_MEMBEROF[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1633: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_key5832); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_memberof_key5877); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16070,7 +16204,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1628:3: -> VK_MEMBEROF[$id]
+            // 1635:3: -> VK_MEMBEROF[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MEMBEROF, id));
 
@@ -16103,7 +16237,7 @@
     };
 
     // $ANTLR start not_key
-    // src/main/resources/org/drools/lang/DRL.g:1631:1: not_key : {...}? =>id= ID -> VK_NOT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1638: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);
@@ -16116,15 +16250,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1639:2: ({...}? =>id= ID -> VK_NOT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1639: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_key5859); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_not_key5904); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16142,7 +16276,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1634:3: -> VK_NOT[$id]
+            // 1641:3: -> VK_NOT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NOT, id));
 
@@ -16175,7 +16309,7 @@
     };
 
     // $ANTLR start in_key
-    // src/main/resources/org/drools/lang/DRL.g:1637:1: in_key : {...}? =>id= ID -> VK_IN[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1644: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);
@@ -16188,15 +16322,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1645:2: ({...}? =>id= ID -> VK_IN[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1645: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_key5886); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_in_key5931); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16214,7 +16348,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1640:3: -> VK_IN[$id]
+            // 1647:3: -> VK_IN[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IN, id));
 
@@ -16247,7 +16381,7 @@
     };
 
     // $ANTLR start or_key
-    // src/main/resources/org/drools/lang/DRL.g:1643:1: or_key : {...}? =>id= ID -> VK_OR[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1650: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);
@@ -16260,15 +16394,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1651:2: ({...}? =>id= ID -> VK_OR[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1651: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_key5913); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_or_key5958); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16286,7 +16420,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1646:3: -> VK_OR[$id]
+            // 1653:3: -> VK_OR[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_OR, id));
 
@@ -16319,7 +16453,7 @@
     };
 
     // $ANTLR start and_key
-    // src/main/resources/org/drools/lang/DRL.g:1649:1: and_key : {...}? =>id= ID -> VK_AND[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1656: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);
@@ -16332,15 +16466,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1657:2: ({...}? =>id= ID -> VK_AND[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1657: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_key5940); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_and_key5985); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16358,7 +16492,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1652:3: -> VK_AND[$id]
+            // 1659:3: -> VK_AND[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AND, id));
 
@@ -16391,7 +16525,7 @@
     };
 
     // $ANTLR start exists_key
-    // src/main/resources/org/drools/lang/DRL.g:1655:1: exists_key : {...}? =>id= ID -> VK_EXISTS[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1662: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);
@@ -16404,15 +16538,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1663:2: ({...}? =>id= ID -> VK_EXISTS[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1663: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_key5967); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_exists_key6012); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16430,7 +16564,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1658:3: -> VK_EXISTS[$id]
+            // 1665:3: -> VK_EXISTS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXISTS, id));
 
@@ -16463,7 +16597,7 @@
     };
 
     // $ANTLR start forall_key
-    // src/main/resources/org/drools/lang/DRL.g:1661:1: forall_key : {...}? =>id= ID -> VK_FORALL[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1668: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);
@@ -16476,15 +16610,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1669:2: ({...}? =>id= ID -> VK_FORALL[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1669: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_key5994); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_forall_key6039); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16502,7 +16636,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1664:3: -> VK_FORALL[$id]
+            // 1671:3: -> VK_FORALL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FORALL, id));
 
@@ -16535,7 +16669,7 @@
     };
 
     // $ANTLR start action_key
-    // src/main/resources/org/drools/lang/DRL.g:1667:1: action_key : {...}? =>id= ID -> VK_ACTION[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1674: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);
@@ -16548,15 +16682,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1675:2: ({...}? =>id= ID -> VK_ACTION[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1675: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_key6021); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_action_key6066); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16574,7 +16708,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1670:3: -> VK_ACTION[$id]
+            // 1677:3: -> VK_ACTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTION, id));
 
@@ -16607,7 +16741,7 @@
     };
 
     // $ANTLR start reverse_key
-    // src/main/resources/org/drools/lang/DRL.g:1673:1: reverse_key : {...}? =>id= ID -> VK_REVERSE[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1680: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);
@@ -16620,15 +16754,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1681:2: ({...}? =>id= ID -> VK_REVERSE[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1681: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_key6048); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_reverse_key6093); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16646,7 +16780,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1676:3: -> VK_REVERSE[$id]
+            // 1683:3: -> VK_REVERSE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_REVERSE, id));
 
@@ -16679,7 +16813,7 @@
     };
 
     // $ANTLR start result_key
-    // src/main/resources/org/drools/lang/DRL.g:1679:1: result_key : {...}? =>id= ID -> VK_RESULT[$id] ;
+    // src/main/resources/org/drools/lang/DRL.g:1686: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);
@@ -16692,15 +16826,15 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // 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
+            // src/main/resources/org/drools/lang/DRL.g:1687:2: ({...}? =>id= ID -> VK_RESULT[$id] )
+            // src/main/resources/org/drools/lang/DRL.g:1687: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_key6075); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_result_key6120); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
@@ -16718,7 +16852,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1682:3: -> VK_RESULT[$id]
+            // 1689:3: -> VK_RESULT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RESULT, id));
 
@@ -16747,11 +16881,11 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // 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
+        // src/main/resources/org/drools/lang/DRL.g:819:5: ( LEFT_PAREN or_key )
+        // src/main/resources/org/drools/lang/DRL.g:819:6: LEFT_PAREN or_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred12069); if (failed) return ;
-        pushFollow(FOLLOW_or_key_in_synpred12071);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred12087); if (failed) return ;
+        pushFollow(FOLLOW_or_key_in_synpred12089);
         or_key();
         _fsp--;
         if (failed) return ;
@@ -16762,28 +16896,28 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:826:5: ( or_key | DOUBLE_PIPE )
-        int alt103=2;
-        int LA103_0 = input.LA(1);
+        // src/main/resources/org/drools/lang/DRL.g:827:5: ( or_key | DOUBLE_PIPE )
+        int alt104=2;
+        int LA104_0 = input.LA(1);
 
-        if ( (LA103_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-            alt103=1;
+        if ( (LA104_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+            alt104=1;
         }
-        else if ( (LA103_0==DOUBLE_PIPE) ) {
-            alt103=2;
+        else if ( (LA104_0==DOUBLE_PIPE) ) {
+            alt104=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("826:5: synpred2 : ( or_key | DOUBLE_PIPE );", 103, 0, input);
+                new NoViableAltException("827:5: synpred2 : ( or_key | DOUBLE_PIPE );", 104, 0, input);
 
             throw nvae;
         }
-        switch (alt103) {
+        switch (alt104) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:826:6: or_key
+                // src/main/resources/org/drools/lang/DRL.g:827:6: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred22138);
+                pushFollow(FOLLOW_or_key_in_synpred22156);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16791,9 +16925,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:826:13: DOUBLE_PIPE
+                // src/main/resources/org/drools/lang/DRL.g:827:13: DOUBLE_PIPE
                 {
-                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred22140); if (failed) return ;
+                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred22158); if (failed) return ;
 
                 }
                 break;
@@ -16803,11 +16937,11 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // 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
+        // src/main/resources/org/drools/lang/DRL.g:836:5: ( LEFT_PAREN and_key )
+        // src/main/resources/org/drools/lang/DRL.g:836:6: LEFT_PAREN and_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred32197); if (failed) return ;
-        pushFollow(FOLLOW_and_key_in_synpred32199);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred32215); if (failed) return ;
+        pushFollow(FOLLOW_and_key_in_synpred32217);
         and_key();
         _fsp--;
         if (failed) return ;
@@ -16818,28 +16952,28 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:843:5: ( and_key | DOUBLE_AMPER )
-        int alt104=2;
-        int LA104_0 = input.LA(1);
+        // src/main/resources/org/drools/lang/DRL.g:844:5: ( and_key | DOUBLE_AMPER )
+        int alt105=2;
+        int LA105_0 = input.LA(1);
 
-        if ( (LA104_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-            alt104=1;
+        if ( (LA105_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+            alt105=1;
         }
-        else if ( (LA104_0==DOUBLE_AMPER) ) {
-            alt104=2;
+        else if ( (LA105_0==DOUBLE_AMPER) ) {
+            alt105=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("843:5: synpred4 : ( and_key | DOUBLE_AMPER );", 104, 0, input);
+                new NoViableAltException("844:5: synpred4 : ( and_key | DOUBLE_AMPER );", 105, 0, input);
 
             throw nvae;
         }
-        switch (alt104) {
+        switch (alt105) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:843:6: and_key
+                // src/main/resources/org/drools/lang/DRL.g:844:6: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred42267);
+                pushFollow(FOLLOW_and_key_in_synpred42285);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16847,9 +16981,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:843:14: DOUBLE_AMPER
+                // src/main/resources/org/drools/lang/DRL.g:844:14: DOUBLE_AMPER
                 {
-                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42269); if (failed) return ;
+                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42287); if (failed) return ;
 
                 }
                 break;
@@ -16859,10 +16993,10 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:860:4: ( SEMICOLON )
-        // src/main/resources/org/drools/lang/DRL.g:860:5: SEMICOLON
+        // src/main/resources/org/drools/lang/DRL.g:861:4: ( SEMICOLON )
+        // src/main/resources/org/drools/lang/DRL.g:861:5: SEMICOLON
         {
-        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52392); if (failed) return ;
+        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52410); if (failed) return ;
 
         }
     }
@@ -16870,27 +17004,27 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // 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 )
+        // src/main/resources/org/drools/lang/DRL.g:867:12: ( LEFT_PAREN ( or_key | and_key ) )
+        // src/main/resources/org/drools/lang/DRL.g:867:13: LEFT_PAREN ( or_key | and_key )
         {
-        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);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred62447); if (failed) return ;
+        // src/main/resources/org/drools/lang/DRL.g:867:24: ( 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("866:24: ( or_key | and_key )", 105, 1, input);
+                    new NoViableAltException("867:24: ( or_key | and_key )", 106, 1, input);
 
                 throw nvae;
             }
@@ -16898,15 +17032,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("866:24: ( or_key | and_key )", 105, 0, input);
+                new NoViableAltException("867:24: ( or_key | and_key )", 106, 0, input);
 
             throw nvae;
         }
-        switch (alt105) {
+        switch (alt106) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:866:25: or_key
+                // src/main/resources/org/drools/lang/DRL.g:867:25: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred62432);
+                pushFollow(FOLLOW_or_key_in_synpred62450);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16914,9 +17048,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:866:32: and_key
+                // src/main/resources/org/drools/lang/DRL.g:867:32: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred62434);
+                pushFollow(FOLLOW_and_key_in_synpred62452);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16933,27 +17067,27 @@
 
     // $ANTLR start synpred7
     public final void synpred7_fragment() throws RecognitionException {   
-        // 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 )
+        // src/main/resources/org/drools/lang/DRL.g:883:5: ( LEFT_PAREN ( or_key | and_key ) )
+        // src/main/resources/org/drools/lang/DRL.g:883:6: LEFT_PAREN ( or_key | and_key )
         {
-        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);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred72575); if (failed) return ;
+        // src/main/resources/org/drools/lang/DRL.g:883:17: ( or_key | and_key )
+        int alt107=2;
+        int LA107_0 = input.LA(1);
 
-        if ( (LA106_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-            int LA106_1 = input.LA(2);
+        if ( (LA107_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
+            int LA107_1 = input.LA(2);
 
             if ( ((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
-                alt106=1;
+                alt107=1;
             }
             else if ( ((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
-                alt106=2;
+                alt107=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("882:17: ( or_key | and_key )", 106, 1, input);
+                    new NoViableAltException("883:17: ( or_key | and_key )", 107, 1, input);
 
                 throw nvae;
             }
@@ -16961,15 +17095,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("882:17: ( or_key | and_key )", 106, 0, input);
+                new NoViableAltException("883:17: ( or_key | and_key )", 107, 0, input);
 
             throw nvae;
         }
-        switch (alt106) {
+        switch (alt107) {
             case 1 :
-                // src/main/resources/org/drools/lang/DRL.g:882:18: or_key
+                // src/main/resources/org/drools/lang/DRL.g:883:18: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred72560);
+                pushFollow(FOLLOW_or_key_in_synpred72578);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16977,9 +17111,9 @@
                 }
                 break;
             case 2 :
-                // src/main/resources/org/drools/lang/DRL.g:882:25: and_key
+                // src/main/resources/org/drools/lang/DRL.g:883:25: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred72562);
+                pushFollow(FOLLOW_and_key_in_synpred72580);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16996,20 +17130,20 @@
 
     // $ANTLR start synpred8
     public final void synpred8_fragment() throws RecognitionException {   
-        // src/main/resources/org/drools/lang/DRL.g:1051:5: ( LEFT_PAREN )
-        // src/main/resources/org/drools/lang/DRL.g:1051:6: LEFT_PAREN
+        // src/main/resources/org/drools/lang/DRL.g:1052:5: ( LEFT_PAREN )
+        // src/main/resources/org/drools/lang/DRL.g:1052:6: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred83391); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred83409); if (failed) return ;
 
         }
     }
     // $ANTLR end synpred8
 
-    public final boolean synpred4() {
+    public final boolean synpred5() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred4_fragment(); // can never throw exception
+            synpred5_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17019,11 +17153,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred7() {
+    public final boolean synpred6() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred7_fragment(); // can never throw exception
+            synpred6_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17033,11 +17167,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred2() {
+    public final boolean synpred7() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred2_fragment(); // can never throw exception
+            synpred7_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17047,11 +17181,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred3() {
+    public final boolean synpred8() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred3_fragment(); // can never throw exception
+            synpred8_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17075,11 +17209,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred5() {
+    public final boolean synpred2() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred5_fragment(); // can never throw exception
+            synpred2_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17089,11 +17223,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred6() {
+    public final boolean synpred3() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred6_fragment(); // can never throw exception
+            synpred3_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17103,11 +17237,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred8() {
+    public final boolean synpred4() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred8_fragment(); // can never throw exception
+            synpred4_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -17121,22 +17255,22 @@
 
     protected DFA12 dfa12 = new DFA12(this);
     protected DFA17 dfa17 = new DFA17(this);
-    protected DFA36 dfa36 = new DFA36(this);
-    protected DFA53 dfa53 = new DFA53(this);
+    protected DFA37 dfa37 = new DFA37(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 DFA55 dfa55 = new DFA55(this);
+    protected DFA66 dfa66 = new DFA66(this);
+    protected DFA69 dfa69 = new DFA69(this);
     protected DFA84 dfa84 = new DFA84(this);
+    protected DFA85 dfa85 = new DFA85(this);
     static final String DFA12_eotS =
         "\16\uffff";
     static final String DFA12_eofS =
         "\16\uffff";
     static final String DFA12_minS =
-        "\2\123\1\uffff\1\123\1\uffff\2\123\2\163\2\123\1\130\1\163\1\123";
+        "\2\124\1\uffff\1\124\1\uffff\2\124\2\164\2\124\1\131\1\164\1\124";
     static final String DFA12_maxS =
-        "\1\130\1\132\1\uffff\1\162\1\uffff\1\162\1\123\2\163\3\162\1\163"+
-        "\1\162";
+        "\1\131\1\133\1\uffff\1\163\1\uffff\1\163\1\124\2\164\3\163\1\164"+
+        "\1\163";
     static final String DFA12_acceptS =
         "\2\uffff\1\2\1\uffff\1\1\11\uffff";
     static final String DFA12_specialS =
@@ -17188,7 +17322,7 @@
             this.transition = DFA12_transition;
         }
         public String getDescription() {
-            return "537:3: ( parameters )?";
+            return "538:3: ( parameters )?";
         }
     }
     static final String DFA17_eotS =
@@ -17196,9 +17330,9 @@
     static final String DFA17_eofS =
         "\6\uffff";
     static final String DFA17_minS =
-        "\2\123\1\163\2\uffff\1\123";
+        "\2\124\1\164\2\uffff\1\124";
     static final String DFA17_maxS =
-        "\1\123\1\162\1\163\2\uffff\1\162";
+        "\1\124\1\163\1\164\2\uffff\1\163";
     static final String DFA17_acceptS =
         "\3\uffff\1\2\1\1\1\uffff";
     static final String DFA17_specialS =
@@ -17242,40 +17376,40 @@
             this.transition = DFA17_transition;
         }
         public String getDescription() {
-            return "563:4: ( data_type )?";
+            return "564:4: ( data_type )?";
         }
     }
-    static final String DFA36_eotS =
+    static final String DFA37_eotS =
         "\31\uffff";
-    static final String DFA36_eofS =
+    static final String DFA37_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"+
+    static final String DFA37_minS =
+        "\1\124\1\130\1\124\2\uffff\1\4\1\0\1\130\1\4\2\0\3\uffff\1\0\2"+
+        "\uffff\1\0\7\uffff";
+    static final String DFA37_maxS =
+        "\1\124\1\170\1\124\2\uffff\1\u0081\1\0\1\170\1\u0081\2\0\3\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\2\1\5\1\3\1\10\1\11\2\uffff\1\12\2\uffff\1\7\1\0\1\4\1\uffff"+
-        "\1\6\2\uffff\1\1\7\uffff}>";
-    static final String[] DFA36_transitionS = {
+    static final String DFA37_acceptS =
+        "\3\uffff\1\14\1\11\6\uffff\1\1\1\4\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 DFA37_specialS =
+        "\1\7\1\4\1\12\2\uffff\1\3\1\1\1\0\1\11\1\10\1\5\3\uffff\1\6\2\uffff"+
+        "\1\2\7\uffff}>";
+    static final String[] DFA37_transitionS = {
             "\1\1",
-            "\1\5\1\4\6\uffff\1\6\1\3\26\uffff\1\2",
+            "\1\3\1\5\6\uffff\1\4\1\6\26\uffff\1\2",
             "\1\7",
-            "\1\uffff",
-            "\124\12\1\13\1\12\1\14\46\12",
             "",
             "",
+            "\125\10\1\11\1\10\1\12\46\10",
+            "\1\uffff",
             "\1\16\37\uffff\1\15",
-            "",
-            "",
-            "\124\12\1\21\1\12\1\14\46\12",
+            "\125\10\1\21\1\10\1\12\46\10",
             "\1\uffff",
             "\1\uffff",
             "",
+            "",
+            "",
             "\1\uffff",
             "",
             "",
@@ -17289,138 +17423,148 @@
             ""
     };
 
-    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 final short[] DFA37_eot = DFA.unpackEncodedString(DFA37_eotS);
+    static final short[] DFA37_eof = DFA.unpackEncodedString(DFA37_eofS);
+    static final char[] DFA37_min = DFA.unpackEncodedStringToUnsignedChars(DFA37_minS);
+    static final char[] DFA37_max = DFA.unpackEncodedStringToUnsignedChars(DFA37_maxS);
+    static final short[] DFA37_accept = DFA.unpackEncodedString(DFA37_acceptS);
+    static final short[] DFA37_special = DFA.unpackEncodedString(DFA37_specialS);
+    static final short[][] DFA37_transition;
 
     static {
-        int numStates = DFA36_transitionS.length;
-        DFA36_transition = new short[numStates][];
+        int numStates = DFA37_transitionS.length;
+        DFA37_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA36_transition[i] = DFA.unpackEncodedString(DFA36_transitionS[i]);
+            DFA37_transition[i] = DFA.unpackEncodedString(DFA37_transitionS[i]);
         }
     }
 
-    class DFA36 extends DFA {
+    class DFA37 extends DFA {
 
-        public DFA36(BaseRecognizer recognizer) {
+        public DFA37(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;
+            this.decisionNumber = 37;
+            this.eot = DFA37_eot;
+            this.eof = DFA37_eof;
+            this.min = DFA37_min;
+            this.max = DFA37_max;
+            this.accept = DFA37_accept;
+            this.special = DFA37_special;
+            this.transition = DFA37_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 );";
+            return "685: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_11 = input.LA(1);
+                        int LA37_7 = input.LA(1);
 
                          
-                        int index36_11 = input.index();
+                        int index37_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 18;}
+                        if ( (LA37_7==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE)))) {s = 13;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+                        else if ( (LA37_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))))) {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_11);
+                        input.seek(index37_7);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA36_17 = input.LA(1);
+                        int LA37_6 = input.LA(1);
 
                          
-                        int index36_17 = input.index();
+                        int index37_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 24;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 11;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {s = 12;}
 
                          
-                        input.seek(index36_17);
+                        input.seek(index37_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA36_0 = input.LA(1);
+                        int LA37_17 = input.LA(1);
 
                          
-                        int index36_0 = input.index();
+                        int index37_17 = 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;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 24;}
 
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 4;}
+
                          
-                        input.seek(index36_0);
+                        input.seek(index37_17);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA36_2 = input.LA(1);
+                        int LA37_5 = input.LA(1);
 
                          
-                        int index36_2 = input.index();
+                        int index37_5 = 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;}
+                        if ( ((LA37_5>=VT_COMPILATION_UNIT && LA37_5<=STRING)||LA37_5==COMMA||(LA37_5>=AT && LA37_5<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 8;}
 
+                        else if ( (LA37_5==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 9;}
+
+                        else if ( (LA37_5==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 10;}
+
                          
-                        input.seek(index36_2);
+                        input.seek(index37_5);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA36_12 = input.LA(1);
+                        int LA37_1 = input.LA(1);
 
                          
-                        int index36_12 = input.index();
+                        int index37_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 8;}
+                        if ( (LA37_1==MISC) && (((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) && validateL!
 T(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 2;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 6;}
+                        else if ( (LA37_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {s = 3;}
 
+                        else if ( (LA37_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {s = 4;}
+
+                        else if ( (LA37_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 5;}
+
+                        else if ( (LA37_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {s = 6;}
+
                          
-                        input.seek(index36_12);
+                        input.seek(index37_1);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA36_1 = input.LA(1);
+                        int LA37_10 = input.LA(1);
 
                          
-                        int index36_1 = input.index();
+                        int index37_10 = 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;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 11;}
 
-                        else if ( (LA36_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {s = 3;}
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 4;}
 
-                        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);
+                        input.seek(index37_10);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA36_14 = input.LA(1);
+                        int LA37_14 = input.LA(1);
 
                          
-                        int index36_14 = input.index();
+                        int index37_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {s = 19;}
@@ -17434,125 +17578,115 @@
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {s = 23;}
 
                          
-                        input.seek(index36_14);
+                        input.seek(index37_14);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA36_10 = input.LA(1);
+                        int LA37_0 = input.LA(1);
 
                          
-                        int index36_10 = input.index();
+                        int index37_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_10==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 12;}
+                        if ( (LA37_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.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(Dro!
 olsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 1;}
 
-                        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);
+                        input.seek(index37_0);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA36_3 = input.LA(1);
+                        int LA37_9 = input.LA(1);
 
                          
-                        int index36_3 = input.index();
+                        int index37_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 8;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 18;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {s = 9;}
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.ENABLED))) ) {s = 4;}
 
                          
-                        input.seek(index36_3);
+                        input.seek(index37_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA36_4 = input.LA(1);
+                        int LA37_8 = input.LA(1);
 
                          
-                        int index36_4 = input.index();
+                        int index37_8 = 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;}
+                        if ( (LA37_8==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 10;}
 
-                        else if ( (LA36_4==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 11;}
+                        else if ( ((LA37_8>=VT_COMPILATION_UNIT && LA37_8<=STRING)||LA37_8==COMMA||(LA37_8>=AT && LA37_8<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 8;}
 
-                        else if ( (LA36_4==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 12;}
+                        else if ( (LA37_8==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))))) {s = 17;}
 
                          
-                        input.seek(index36_4);
+                        input.seek(index37_8);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA36_7 = input.LA(1);
+                        int LA37_2 = input.LA(1);
 
                          
-                        int index36_7 = input.index();
+                        int index37_2 = 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;}
+                        if ( (LA37_2==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.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))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validate!
 LT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))))) {s = 7;}
 
-                        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);
+                        input.seek(index37_2);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 36, _s, input);
+                new NoViableAltException(getDescription(), 37, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA53_eotS =
+    static final String DFA54_eotS =
         "\u0082\uffff";
-    static final String DFA53_eofS =
+    static final String DFA54_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 = {
+    static final String DFA54_minS =
+        "\3\124\2\0\2\124\1\164\1\0\3\uffff\1\125\1\124\1\125\1\131\1\uffff"+
+        "\1\124\1\164\1\124\1\125\1\124\1\125\1\131\1\124\2\0\1\124\1\164"+
+        "\2\124\2\0\1\124\1\0\1\4\11\124\2\uffff\1\125\1\131\1\124\1\0\2"+
+        "\124\1\4\11\124\1\0\1\uffff\1\124\1\uffff\1\4\32\0\1\uffff\23\0"+
+        "\1\uffff\17\0";
+    static final String DFA54_maxS =
+        "\2\131\1\163\2\0\1\131\1\124\1\164\1\0\3\uffff\1\163\1\124\2\163"+
+        "\1\uffff\1\124\1\164\1\133\1\163\1\133\3\163\2\0\1\124\1\164\1\133"+
+        "\1\163\2\0\1\124\1\0\1\u0081\1\124\7\162\1\124\2\uffff\3\163\1\0"+
+        "\1\142\1\124\1\u0081\1\124\7\162\1\124\1\0\1\uffff\1\163\1\uffff"+
+        "\1\u0081\32\0\1\uffff\23\0\1\uffff\17\0";
+    static final String DFA54_acceptS =
+        "\11\uffff\1\1\2\2\4\uffff\1\3\34\uffff\2\3\21\uffff\1\3\1\uffff"+
+        "\1\3\33\uffff\1\3\23\uffff\1\3\17\uffff";
+    static final String DFA54_specialS =
+        "\2\uffff\1\2\1\12\1\11\3\uffff\1\10\20\uffff\1\7\1\3\4\uffff\1"+
+        "\6\1\4\1\uffff\1\0\17\uffff\1\5\14\uffff\1\1\102\uffff}>";
+    static final String[] DFA54_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",
+            "\1\11\1\6\3\uffff\1\10\3\uffff\1\5\25\uffff\1\7",
             "\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",
@@ -17560,69 +17694,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\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\101",
             "\1\uffff",
-            "\156\103\1\104\1\105\15\103",
+            "\157\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\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\33\3\uffff\1\35\31\uffff\1\34",
             "\1\35\31\uffff\1\34",
-            "\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\125\1\124\3\uffff\1\135\3\uffff\1\122\14\uffff\1\126\1"+
+            "\127\1\130\1\131\1\132\1\133\1\134\2\uffff\1\123",
             "\1\uffff",
             "\1\137\6\uffff\1\141\6\uffff\1\140",
             "\1\142",
-            "\156\143\1\144\1\145\15\143",
+            "\157\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\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\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\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\103\1\104\1\105\15\103",
+            "\157\103\1\104\1\105\15\103",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17687,260 +17821,260 @@
             "\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 "866:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "867: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 LA53_4 = input.LA(1);
+                        int LA54_34 = input.LA(1);
 
                          
-                        int index53_4 = input.index();
+                        int index54_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (true) ) {s = 66;}
 
                          
-                        input.seek(index53_4);
+                        input.seek(index54_34);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA53_26 = input.LA(1);
+                        int LA54_63 = input.LA(1);
 
                          
-                        int index53_26 = input.index();
+                        int index54_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 114;}
 
                          
-                        input.seek(index53_26);
+                        input.seek(index54_63);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA53_32 = input.LA(1);
+                        int LA54_2 = input.LA(1);
 
                          
-                        int index53_32 = input.index();
+                        int index54_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (LA54_2==COLON) ) {s = 5;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (LA54_2==DOT) ) {s = 6;}
 
+                        else if ( (LA54_2==LEFT_SQUARE) ) {s = 7;}
+
+                        else if ( (LA54_2==LEFT_PAREN) ) {s = 8;}
+
+                        else if ( (LA54_2==ID) && (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||((synpred6()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred!
 6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))))) {s = 9;}
+
                          
-                        input.seek(index53_32);
+                        input.seek(index54_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA53_3 = input.LA(1);
+                        int LA54_26 = input.LA(1);
 
                          
-                        int index53_3 = input.index();
+                        int index54_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 10;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_3);
+                        input.seek(index54_26);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA53_34 = input.LA(1);
+                        int LA54_32 = input.LA(1);
 
                          
-                        int index53_34 = input.index();
+                        int index54_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 66;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_34);
+                        input.seek(index54_32);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA53_63 = input.LA(1);
+                        int LA54_50 = input.LA(1);
 
                          
-                        int index53_63 = input.index();
+                        int index54_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 114;}
+                        else if ( (true) ) {s = 94;}
 
                          
-                        input.seek(index53_63);
+                        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 ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA53_2==LEFT_PAREN) ) {s = 6;}
+                        else if ( (true) ) {s = 64;}
 
-                        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(index53_2);
+                        input.seek(index54_31);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA53_6 = input.LA(1);
+                        int LA54_25 = input.LA(1);
 
                          
-                        int index53_6 = input.index();
+                        int index54_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 14;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index53_6);
+                        input.seek(index54_25);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA53_31 = input.LA(1);
+                        int LA54_8 = input.LA(1);
 
                          
-                        int index53_31 = input.index();
+                        int index54_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) ) {s = 9;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (true) ) {s = 16;}
 
                          
-                        input.seek(index53_31);
+                        input.seek(index54_8);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA53_25 = input.LA(1);
+                        int LA54_4 = input.LA(1);
 
                          
-                        int index53_25 = input.index();
+                        int index54_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 11;}
 
                          
-                        input.seek(index53_25);
+                        input.seek(index54_4);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA53_50 = input.LA(1);
+                        int LA54_3 = input.LA(1);
 
                          
-                        int index53_50 = input.index();
+                        int index54_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (true) ) {s = 94;}
+                        else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index53_50);
+                        input.seek(index54_3);
                         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 DFA54_eotS =
+    static final String DFA55_eotS =
         "\u0082\uffff";
-    static final String DFA54_eofS =
+    static final String DFA55_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 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 = {
+    static final String DFA55_minS =
+        "\3\124\2\0\1\124\1\uffff\1\124\1\164\1\0\2\uffff\1\125\1\124\1"+
+        "\125\1\131\1\uffff\1\124\1\164\1\124\1\125\1\124\1\125\1\131\1\124"+
+        "\2\0\1\124\1\164\2\124\2\0\1\124\1\4\11\124\1\0\2\uffff\1\125\1"+
+        "\131\1\124\1\0\2\124\1\0\1\4\11\124\1\uffff\1\124\1\4\16\0\1\uffff"+
+        "\14\0\1\uffff\4\0\1\uffff\36\0";
+    static final String DFA55_maxS =
+        "\2\131\1\163\2\0\1\131\1\uffff\1\124\1\164\1\0\2\uffff\1\163\1"+
+        "\124\2\163\1\uffff\1\124\1\164\1\133\1\163\1\133\3\163\2\0\1\124"+
+        "\1\164\1\133\1\163\2\0\1\124\1\u0081\1\124\7\162\1\124\1\0\2\uffff"+
+        "\3\163\1\0\1\142\1\124\1\0\1\u0081\1\124\7\162\1\124\1\uffff\1\163"+
+        "\1\u0081\16\0\1\uffff\14\0\1\uffff\4\0\1\uffff\36\0";
+    static final String DFA55_acceptS =
+        "\6\uffff\1\1\3\uffff\2\2\4\uffff\1\3\34\uffff\2\3\21\uffff\1\3"+
+        "\20\uffff\1\3\14\uffff\1\3\4\uffff\1\3\36\uffff";
+    static final String DFA55_specialS =
+        "\2\uffff\1\2\1\11\1\4\4\uffff\1\12\17\uffff\1\6\1\0\4\uffff\1\5"+
+        "\1\3\13\uffff\1\1\5\uffff\1\7\2\uffff\1\10\114\uffff}>";
+    static final String[] DFA55_transitionS = {
             "\1\2\4\uffff\1\1",
             "\1\4\4\uffff\1\3",
-            "\1\7\1\10\3\uffff\1\6\3\uffff\1\5\25\uffff\1\11",
+            "\1\6\1\7\3\uffff\1\11\3\uffff\1\5\25\uffff\1\10",
             "\1\uffff",
             "\1\uffff",
             "\1\14\4\uffff\1\15",
-            "\1\uffff",
             "",
+            "\1\16",
             "\1\17",
-            "\1\20",
+            "\1\uffff",
             "",
             "",
             "\1\21\3\uffff\1\23\31\uffff\1\22",
             "\1\24",
+            "\1\7\3\uffff\1\25\31\uffff\1\10",
+            "\1\25\31\uffff\1\10",
             "",
-            "\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",
@@ -17948,68 +18082,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\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\uffff",
             "\1\uffff",
             "\1\101",
-            "\156\102\1\103\1\104\15\102",
+            "\157\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\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\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\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\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",
+            "\157\144\1\145\1\146\15\144",
+            "\1\147",
+            "\1\150\3\uffff\1\151\1\156\6\uffff\1\154\1\152\16\uffff\1"+
+            "\157\1\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\160\3\uffff\1\151\1\161\6\uffff\1\154\1\152\17\uffff\1"+
+            "\153\1\155",
+            "\1\162",
             "",
-            "\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\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",
+            "\157\102\1\103\1\104\15\102",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18042,6 +18176,7 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18057,7 +18192,6 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18075,237 +18209,237 @@
             "\1\uffff"
     };
 
-    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 final short[] DFA55_eot = DFA.unpackEncodedString(DFA55_eotS);
+    static final short[] DFA55_eof = DFA.unpackEncodedString(DFA55_eofS);
+    static final char[] DFA55_min = DFA.unpackEncodedStringToUnsignedChars(DFA55_minS);
+    static final char[] DFA55_max = DFA.unpackEncodedStringToUnsignedChars(DFA55_maxS);
+    static final short[] DFA55_accept = DFA.unpackEncodedString(DFA55_acceptS);
+    static final short[] DFA55_special = DFA.unpackEncodedString(DFA55_specialS);
+    static final short[][] DFA55_transition;
 
     static {
-        int numStates = DFA54_transitionS.length;
-        DFA54_transition = new short[numStates][];
+        int numStates = DFA55_transitionS.length;
+        DFA55_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
+            DFA55_transition[i] = DFA.unpackEncodedString(DFA55_transitionS[i]);
         }
     }
 
-    class DFA54 extends DFA {
+    class DFA55 extends DFA {
 
-        public DFA54(BaseRecognizer recognizer) {
+        public DFA55(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            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;
+            this.decisionNumber = 55;
+            this.eot = DFA55_eot;
+            this.eof = DFA55_eof;
+            this.min = DFA55_min;
+            this.max = DFA55_max;
+            this.accept = DFA55_accept;
+            this.special = DFA55_special;
+            this.transition = DFA55_transition;
         }
         public String getDescription() {
-            return "882:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "883: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 LA54_4 = input.LA(1);
+                        int LA55_26 = input.LA(1);
 
                          
-                        int index54_4 = input.index();
+                        int index55_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index54_4);
+                        input.seek(index55_26);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA54_32 = input.LA(1);
+                        int LA55_44 = input.LA(1);
 
                          
-                        int index54_32 = input.index();
+                        int index55_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 81;}
 
                          
-                        input.seek(index54_32);
+                        input.seek(index55_44);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA54_6 = input.LA(1);
+                        int LA55_2 = input.LA(1);
 
                          
-                        int index54_6 = input.index();
+                        int index55_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 7;}
+                        if ( (LA55_2==COLON) ) {s = 5;}
 
-                        else if ( (true) ) {s = 14;}
+                        else if ( (LA55_2==ID) && (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||((synpred7()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred!
 7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))))) {s = 6;}
 
+                        else if ( (LA55_2==DOT) ) {s = 7;}
+
+                        else if ( (LA55_2==LEFT_SQUARE) ) {s = 8;}
+
+                        else if ( (LA55_2==LEFT_PAREN) ) {s = 9;}
+
                          
-                        input.seek(index54_6);
+                        input.seek(index55_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA54_63 = input.LA(1);
+                        int LA55_32 = input.LA(1);
 
                          
-                        int index54_63 = input.index();
+                        int index55_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 114;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index54_63);
+                        input.seek(index55_32);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA54_2 = input.LA(1);
+                        int LA55_4 = input.LA(1);
 
                          
-                        int index54_2 = input.index();
+                        int index55_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_2==COLON) ) {s = 5;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (LA54_2==LEFT_PAREN) ) {s = 6;}
+                        else if ( (true) ) {s = 11;}
 
-                        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(index54_2);
+                        input.seek(index55_4);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA54_50 = input.LA(1);
+                        int LA55_31 = input.LA(1);
 
                          
-                        int index54_50 = input.index();
+                        int index55_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 94;}
+                        else if ( (true) ) {s = 64;}
 
                          
-                        input.seek(index54_50);
+                        input.seek(index55_31);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA54_31 = input.LA(1);
+                        int LA55_25 = input.LA(1);
 
                          
-                        int index54_31 = input.index();
+                        int index55_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index54_31);
+                        input.seek(index55_25);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA54_25 = input.LA(1);
+                        int LA55_50 = input.LA(1);
 
                          
-                        int index54_25 = input.index();
+                        int index55_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 94;}
 
                          
-                        input.seek(index54_25);
+                        input.seek(index55_50);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA54_3 = input.LA(1);
+                        int LA55_53 = input.LA(1);
 
                          
-                        int index54_3 = input.index();
+                        int index55_53 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 10;}
+                        else if ( (true) ) {s = 99;}
 
                          
-                        input.seek(index54_3);
+                        input.seek(index55_53);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA54_44 = input.LA(1);
+                        int LA55_3 = input.LA(1);
 
                          
-                        int index54_44 = input.index();
+                        int index55_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 81;}
+                        else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index54_44);
+                        input.seek(index55_3);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA54_26 = input.LA(1);
+                        int LA55_9 = input.LA(1);
 
                          
-                        int index54_26 = input.index();
+                        int index55_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) ) {s = 6;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 16;}
 
                          
-                        input.seek(index54_26);
+                        input.seek(index55_9);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 54, _s, input);
+                new NoViableAltException(getDescription(), 55, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA65_eotS =
+    static final String DFA66_eotS =
         "\13\uffff";
-    static final String DFA65_eofS =
+    static final String DFA66_eofS =
         "\13\uffff";
-    static final String DFA65_minS =
-        "\1\123\1\130\2\4\1\0\1\123\1\0\4\uffff";
-    static final String DFA65_maxS =
-        "\1\123\1\130\2\u0080\1\0\1\132\1\0\4\uffff";
-    static final String DFA65_acceptS =
+    static final String DFA66_minS =
+        "\1\124\1\131\2\4\1\0\1\124\1\0\4\uffff";
+    static final String DFA66_maxS =
+        "\1\124\1\131\2\u0081\1\0\1\133\1\0\4\uffff";
+    static final String DFA66_acceptS =
         "\7\uffff\1\1\1\2\1\1\1\2";
-    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 = {
+    static final String DFA66_specialS =
+        "\1\2\1\6\1\5\1\3\1\4\1\0\1\1\4\uffff}>";
+    static final String[] DFA66_transitionS = {
             "\1\1",
             "\1\2",
-            "\124\3\1\4\1\3\1\5\46\3",
-            "\124\3\1\6\1\3\1\5\46\3",
+            "\125\3\1\4\1\3\1\5\46\3",
+            "\125\3\1\6\1\3\1\5\46\3",
             "\1\uffff",
             "\1\11\5\uffff\1\11\1\12",
             "\1\uffff",
@@ -18315,480 +18449,480 @@
             ""
     };
 
-    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 final short[] DFA66_eot = DFA.unpackEncodedString(DFA66_eotS);
+    static final short[] DFA66_eof = DFA.unpackEncodedString(DFA66_eofS);
+    static final char[] DFA66_min = DFA.unpackEncodedStringToUnsignedChars(DFA66_minS);
+    static final char[] DFA66_max = DFA.unpackEncodedStringToUnsignedChars(DFA66_maxS);
+    static final short[] DFA66_accept = DFA.unpackEncodedString(DFA66_acceptS);
+    static final short[] DFA66_special = DFA.unpackEncodedString(DFA66_specialS);
+    static final short[][] DFA66_transition;
 
     static {
-        int numStates = DFA65_transitionS.length;
-        DFA65_transition = new short[numStates][];
+        int numStates = DFA66_transitionS.length;
+        DFA66_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
+            DFA66_transition[i] = DFA.unpackEncodedString(DFA66_transitionS[i]);
         }
     }
 
-    class DFA65 extends DFA {
+    class DFA66 extends DFA {
 
-        public DFA65(BaseRecognizer recognizer) {
+        public DFA66(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            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;
+            this.decisionNumber = 66;
+            this.eot = DFA66_eot;
+            this.eof = DFA66_eof;
+            this.min = DFA66_min;
+            this.max = DFA66_max;
+            this.accept = DFA66_accept;
+            this.special = DFA66_special;
+            this.transition = DFA66_transition;
         }
         public String getDescription() {
-            return "976:2: ( reverse_key pc3= accumulate_paren_chunk[Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE] (cm3= COMMA )? )?";
+            return "977: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 LA65_0 = input.LA(1);
+                        int LA66_5 = input.LA(1);
 
                          
-                        int index65_0 = input.index();
+                        int index66_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 1;}
+                        if ( (LA66_5==ID||LA66_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {s = 9;}
 
+                        else if ( (LA66_5==RIGHT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.RESULT)))) {s = 10;}
+
                          
-                        input.seek(index65_0);
+                        input.seek(index66_5);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA65_5 = input.LA(1);
+                        int LA66_6 = input.LA(1);
 
                          
-                        int index65_5 = input.index();
+                        int index66_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_5==ID||LA65_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {s = 9;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 9;}
 
-                        else if ( (LA65_5==RIGHT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.RESULT)))) {s = 10;}
+                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 10;}
 
                          
-                        input.seek(index65_5);
+                        input.seek(index66_6);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA65_6 = input.LA(1);
+                        int LA66_0 = input.LA(1);
 
                          
-                        int index65_6 = input.index();
+                        int index66_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 9;}
+                        if ( (LA66_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 1;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 10;}
-
                          
-                        input.seek(index65_6);
+                        input.seek(index66_0);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA65_2 = input.LA(1);
+                        int LA66_3 = input.LA(1);
 
                          
-                        int index65_2 = input.index();
+                        int index66_3 = input.index();
                         input.rewind();
                         s = -1;
-                        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;}
+                        if ( (LA66_3==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
 
-                        else if ( (LA65_2==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 4;}
+                        else if ( ((LA66_3>=VT_COMPILATION_UNIT && LA66_3<=STRING)||LA66_3==COMMA||(LA66_3>=AT && LA66_3<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
 
-                        else if ( (LA65_2==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+                        else if ( (LA66_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 6;}
 
                          
-                        input.seek(index65_2);
+                        input.seek(index66_3);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA65_3 = input.LA(1);
+                        int LA66_4 = input.LA(1);
 
                          
-                        int index65_3 = input.index();
+                        int index66_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_3==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 7;}
 
-                        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 ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 8;}
 
-                        else if ( (LA65_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 6;}
-
                          
-                        input.seek(index65_3);
+                        input.seek(index66_4);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA65_4 = input.LA(1);
+                        int LA66_2 = input.LA(1);
 
                          
-                        int index65_4 = input.index();
+                        int index66_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 7;}
+                        if ( ((LA66_2>=VT_COMPILATION_UNIT && LA66_2<=STRING)||LA66_2==COMMA||(LA66_2>=AT && LA66_2<=MULTI_LINE_COMMENT)) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 3;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 8;}
+                        else if ( (LA66_2==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 4;}
 
+                        else if ( (LA66_2==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+
                          
-                        input.seek(index65_4);
+                        input.seek(index66_2);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA65_1 = input.LA(1);
+                        int LA66_1 = input.LA(1);
 
                          
-                        int index65_1 = input.index();
+                        int index66_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 2;}
+                        if ( (LA66_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 2;}
 
                          
-                        input.seek(index65_1);
+                        input.seek(index66_1);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 65, _s, input);
+                new NoViableAltException(getDescription(), 66, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA68_eotS =
+    static final String DFA69_eotS =
         "\25\uffff";
-    static final String DFA68_eofS =
+    static final String DFA69_eofS =
         "\25\uffff";
-    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 =
+    static final String DFA69_minS =
+        "\1\123\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 DFA69_maxS =
+        "\1\165\1\u0081\1\uffff\1\u0081\1\0\2\uffff\1\u0081\2\0\3\u0081"+
+        "\1\0\1\u0081\1\uffff\1\u0081\4\0";
+    static final String DFA69_acceptS =
         "\2\uffff\1\2\2\uffff\2\1\10\uffff\1\1\5\uffff";
-    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 = {
+    static final String DFA69_specialS =
+        "\1\uffff\1\10\1\uffff\1\1\1\0\2\uffff\1\4\1\7\1\5\1\2\1\6\1\13"+
+        "\1\3\1\12\1\uffff\1\11\4\uffff}>";
+    static final String[] DFA69_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\6\1\3\4\6\1\4\1\6\1\5\46\6",
+            "\120\5\1\3\4\5\1\4\1\5\1\6\46\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",
+            "\120\5\1\11\1\12\3\5\1\10\1\5\1\6\1\5\1\7\25\5\1\13\16\5",
             "\1\uffff",
             "",
             "",
-            "\117\6\1\14\4\6\1\15\1\6\1\5\46\6",
+            "\120\5\1\14\4\5\1\15\1\5\1\6\46\5",
             "\1\uffff",
             "\1\uffff",
-            "\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",
+            "\120\5\1\16\4\5\1\17\1\5\1\6\46\5",
+            "\125\5\1\17\1\5\1\6\30\5\1\20\15\5",
+            "\121\5\1\21\3\5\1\23\1\5\1\6\27\5\1\22\16\5",
             "\1\uffff",
-            "\120\6\1\12\3\6\1\24\1\6\1\5\27\6\1\13\16\6",
+            "\121\5\1\12\3\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",
+            "\125\5\1\24\1\5\1\6\27\5\1\13\16\5",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff"
     };
 
-    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 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 = DFA68_transitionS.length;
-        DFA68_transition = new short[numStates][];
+        int numStates = DFA69_transitionS.length;
+        DFA69_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA68_transition[i] = DFA.unpackEncodedString(DFA68_transitionS[i]);
+            DFA69_transition[i] = DFA.unpackEncodedString(DFA69_transitionS[i]);
         }
     }
 
-    class DFA68 extends DFA {
+    class DFA69 extends DFA {
 
-        public DFA68(BaseRecognizer recognizer) {
+        public DFA69(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            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;
+            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 "1051:3: ( ( LEFT_PAREN )=>args= paren_chunk )?";
+            return "1052:3: ( ( LEFT_PAREN )=>args= paren_chunk )?";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA68_3 = input.LA(1);
+                        int LA69_4 = input.LA(1);
 
                          
-                        int index68_3 = input.index();
+                        int index69_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_3==COLON) ) {s = 7;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (LA68_3==LEFT_PAREN) ) {s = 8;}
+                        else if ( (true) ) {s = 2;}
 
-                        else if ( (LA68_3==ID) ) {s = 9;}
-
-                        else if ( (LA68_3==DOT) ) {s = 10;}
-
-                        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(index68_3);
+                        input.seek(index69_4);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA68_12 = input.LA(1);
+                        int LA69_3 = input.LA(1);
 
                          
-                        int index68_12 = input.index();
+                        int index69_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_12==DOT) ) {s = 17;}
+                        if ( (LA69_3==COLON) ) {s = 7;}
 
-                        else if ( (LA68_12==LEFT_SQUARE) ) {s = 18;}
+                        else if ( (LA69_3==LEFT_PAREN) ) {s = 8;}
 
-                        else if ( (LA68_12==LEFT_PAREN) ) {s = 19;}
+                        else if ( (LA69_3==ID) ) {s = 9;}
 
-                        else if ( (LA68_12==RIGHT_PAREN) && (synpred8())) {s = 5;}
+                        else if ( (LA69_3==DOT) ) {s = 10;}
 
-                        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;}
+                        else if ( (LA69_3==LEFT_SQUARE) ) {s = 11;}
 
+                        else if ( (LA69_3==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( ((LA69_3>=VT_COMPILATION_UNIT && LA69_3<=SEMICOLON)||(LA69_3>=DOT_STAR && LA69_3<=STRING)||LA69_3==COMMA||LA69_3==AT||(LA69_3>=EQUALS && LA69_3<=NULL)||(LA69_3>=RIGHT_SQUARE && LA69_3<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+
                          
-                        input.seek(index68_12);
+                        input.seek(index69_3);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA68_13 = input.LA(1);
+                        int LA69_10 = input.LA(1);
 
                          
-                        int index68_13 = input.index();
+                        int index69_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 15;}
+                        if ( (LA69_10==ID) ) {s = 14;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA69_10==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
+                        else if ( ((LA69_10>=VT_COMPILATION_UNIT && LA69_10<=SEMICOLON)||(LA69_10>=DOT && LA69_10<=STRING)||LA69_10==COMMA||(LA69_10>=AT && LA69_10<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+
+                        else if ( (LA69_10==LEFT_PAREN) && (synpred8())) {s = 15;}
+
                          
-                        input.seek(index68_13);
+                        input.seek(index69_10);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA68_8 = input.LA(1);
+                        int LA69_13 = input.LA(1);
 
                          
-                        int index68_8 = input.index();
+                        int index69_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (synpred8()) ) {s = 15;}
 
                         else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index68_8);
+                        input.seek(index69_13);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA68_10 = input.LA(1);
+                        int LA69_7 = input.LA(1);
 
                          
-                        int index68_10 = input.index();
+                        int index69_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_10==ID) ) {s = 14;}
+                        if ( (LA69_7==ID) ) {s = 12;}
 
-                        else if ( (LA68_10==RIGHT_PAREN) && (synpred8())) {s = 5;}
+                        else if ( (LA69_7==LEFT_PAREN) ) {s = 13;}
 
-                        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 ( (LA69_7==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                        else if ( (LA68_10==LEFT_PAREN) && (synpred8())) {s = 15;}
+                        else if ( ((LA69_7>=VT_COMPILATION_UNIT && LA69_7<=SEMICOLON)||(LA69_7>=DOT && LA69_7<=STRING)||LA69_7==COMMA||(LA69_7>=AT && LA69_7<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
 
                          
-                        input.seek(index68_10);
+                        input.seek(index69_7);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA68_1 = input.LA(1);
+                        int LA69_9 = input.LA(1);
 
                          
-                        int index68_1 = input.index();
+                        int index69_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_1==ID) ) {s = 3;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (LA68_1==LEFT_PAREN) ) {s = 4;}
+                        else if ( (true) ) {s = 2;}
 
-                        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(index68_1);
+                        input.seek(index69_9);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA68_11 = input.LA(1);
+                        int LA69_11 = input.LA(1);
 
                          
-                        int index68_11 = input.index();
+                        int index69_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_11==RIGHT_SQUARE) ) {s = 16;}
+                        if ( (LA69_11==RIGHT_SQUARE) ) {s = 16;}
 
-                        else if ( (LA68_11==RIGHT_PAREN) && (synpred8())) {s = 5;}
+                        else if ( (LA69_11==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                        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 ( ((LA69_11>=VT_COMPILATION_UNIT && LA69_11<=STRING)||LA69_11==COMMA||(LA69_11>=AT && LA69_11<=LEFT_SQUARE)||(LA69_11>=THEN && LA69_11<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
 
-                        else if ( (LA68_11==LEFT_PAREN) && (synpred8())) {s = 15;}
+                        else if ( (LA69_11==LEFT_PAREN) && (synpred8())) {s = 15;}
 
                          
-                        input.seek(index68_11);
+                        input.seek(index69_11);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA68_16 = input.LA(1);
+                        int LA69_8 = input.LA(1);
 
                          
-                        int index68_16 = input.index();
+                        int index69_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_16==LEFT_PAREN) ) {s = 20;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (LA68_16==LEFT_SQUARE) ) {s = 11;}
+                        else if ( (true) ) {s = 2;}
 
-                        else if ( (LA68_16==RIGHT_PAREN) && (synpred8())) {s = 5;}
-
-                        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(index68_16);
+                        input.seek(index69_8);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA68_4 = input.LA(1);
+                        int LA69_1 = input.LA(1);
 
                          
-                        int index68_4 = input.index();
+                        int index69_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (LA69_1==ID) ) {s = 3;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA69_1==LEFT_PAREN) ) {s = 4;}
 
+                        else if ( ((LA69_1>=VT_COMPILATION_UNIT && LA69_1<=SEMICOLON)||(LA69_1>=DOT && LA69_1<=STRING)||LA69_1==COMMA||(LA69_1>=AT && LA69_1<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+
+                        else if ( (LA69_1==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
                          
-                        input.seek(index68_4);
+                        input.seek(index69_1);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA68_9 = input.LA(1);
+                        int LA69_16 = input.LA(1);
 
                          
-                        int index68_9 = input.index();
+                        int index69_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (LA69_16==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (true) ) {s = 2;}
+                        else if ( (LA69_16==LEFT_SQUARE) ) {s = 11;}
 
+                        else if ( (LA69_16==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( ((LA69_16>=VT_COMPILATION_UNIT && LA69_16<=STRING)||LA69_16==COMMA||(LA69_16>=AT && LA69_16<=NULL)||(LA69_16>=RIGHT_SQUARE && LA69_16<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+
                          
-                        input.seek(index68_9);
+                        input.seek(index69_16);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA68_7 = input.LA(1);
+                        int LA69_14 = input.LA(1);
 
                          
-                        int index68_7 = input.index();
+                        int index69_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_7==ID) ) {s = 12;}
+                        if ( (LA69_14==LEFT_SQUARE) ) {s = 11;}
 
-                        else if ( (LA68_7==LEFT_PAREN) ) {s = 13;}
+                        else if ( (LA69_14==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (LA68_7==RIGHT_PAREN) && (synpred8())) {s = 5;}
+                        else if ( (LA69_14==DOT) ) {s = 10;}
 
-                        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;}
+                        else if ( (LA69_14==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
+                        else if ( ((LA69_14>=VT_COMPILATION_UNIT && LA69_14<=ID)||(LA69_14>=DOT_STAR && LA69_14<=STRING)||LA69_14==COMMA||(LA69_14>=AT && LA69_14<=NULL)||(LA69_14>=RIGHT_SQUARE && LA69_14<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
+
                          
-                        input.seek(index68_7);
+                        input.seek(index69_14);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA68_14 = input.LA(1);
+                        int LA69_12 = input.LA(1);
 
                          
-                        int index68_14 = input.index();
+                        int index69_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA68_14==LEFT_SQUARE) ) {s = 11;}
+                        if ( (LA69_12==DOT) ) {s = 17;}
 
-                        else if ( (LA68_14==LEFT_PAREN) ) {s = 20;}
+                        else if ( (LA69_12==LEFT_SQUARE) ) {s = 18;}
 
-                        else if ( (LA68_14==DOT) ) {s = 10;}
+                        else if ( (LA69_12==LEFT_PAREN) ) {s = 19;}
 
-                        else if ( (LA68_14==RIGHT_PAREN) && (synpred8())) {s = 5;}
+                        else if ( (LA69_12==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                        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 ( ((LA69_12>=VT_COMPILATION_UNIT && LA69_12<=ID)||(LA69_12>=DOT_STAR && LA69_12<=STRING)||LA69_12==COMMA||(LA69_12>=AT && LA69_12<=NULL)||(LA69_12>=RIGHT_SQUARE && LA69_12<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 5;}
 
                          
-                        input.seek(index68_14);
+                        input.seek(index69_12);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 68, _s, input);
+                new NoViableAltException(getDescription(), 69, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA83_eotS =
+    static final String DFA84_eotS =
         "\40\uffff";
-    static final String DFA83_eofS =
+    static final String DFA84_eofS =
         "\40\uffff";
-    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 =
+    static final String DFA84_minS =
+        "\1\132\1\uffff\2\124\1\uffff\1\0\1\124\1\0\1\124\6\0\1\4\1\163"+
+        "\2\4\15\0";
+    static final String DFA84_maxS =
+        "\1\143\1\uffff\1\160\1\163\1\uffff\1\0\1\163\1\0\1\124\6\0\1\u0081"+
+        "\1\163\2\u0081\15\0";
+    static final String DFA84_acceptS =
         "\1\uffff\1\2\2\uffff\1\1\33\uffff";
-    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 = {
+    static final String DFA84_specialS =
+        "\2\uffff\1\3\1\5\1\uffff\1\4\1\2\1\12\1\uffff\1\10\1\0\1\1\1\11"+
+        "\1\7\1\6\21\uffff}>";
+    static final String[] DFA84_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\11\1\4\2\uffff\1\12\1\17\2\4\4\uffff\1\15\1\13\2\4\14\uffff"+
@@ -18801,13 +18935,13 @@
             "\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",
+            "\120\30\1\21\3\30\1\22\1\27\1\30\1\31\4\30\1\25\1\23\17\30"+
+            "\1\24\1\26\17\30",
             "\1\32",
-            "\120\31\1\36\3\31\1\35\1\37\1\33\27\31\1\34\16\31",
+            "\121\30\1\36\3\30\1\35\1\37\1\33\27\30\1\34\16\30",
+            "\125\30\1\35\1\37\1\33\46\30",
             "\1\uffff",
             "\1\uffff",
-            "\124\31\1\35\1\37\1\33\46\31",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18821,46 +18955,46 @@
             "\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 1175:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
+            return "()* loopback of 1176:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA83_18 = input.LA(1);
+                        int LA84_10 = input.LA(1);
 
                          
-                        int index83_18 = input.index();
+                        int index84_10 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18868,97 +19002,111 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_18);
+                        input.seek(index84_10);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA83_2 = input.LA(1);
+                        int LA84_11 = input.LA(1);
 
                          
-                        int index83_2 = input.index();
+                        int index84_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_2==ID) ) {s = 3;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( ((LA83_2>=EQUAL && LA83_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_2==LEFT_PAREN) ) {s = 5;}
-
                          
-                        input.seek(index83_2);
+                        input.seek(index84_11);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA83_11 = input.LA(1);
+                        int LA84_6 = input.LA(1);
 
                          
-                        int index83_11 = input.index();
+                        int index84_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA84_6==ID) ) {s = 9;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA84_6==STRING) ) {s = 10;}
 
+                        else if ( (LA84_6==INT) ) {s = 11;}
+
+                        else if ( (LA84_6==FLOAT) ) {s = 12;}
+
+                        else if ( (LA84_6==BOOL) ) {s = 13;}
+
+                        else if ( (LA84_6==NULL) ) {s = 14;}
+
+                        else if ( (LA84_6==LEFT_PAREN) ) {s = 15;}
+
+                        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_11);
+                        input.seek(index84_6);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA83_9 = input.LA(1);
+                        int LA84_2 = input.LA(1);
 
                          
-                        int index83_9 = input.index();
+                        int index84_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        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_9);
+                        input.seek(index84_2);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA83_3 = input.LA(1);
+                        int LA84_5 = input.LA(1);
 
                          
-                        int index83_3 = input.index();
+                        int index84_5 = 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==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(index83_3);
+                        input.seek(index84_5);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA83_13 = input.LA(1);
+                        int LA84_3 = input.LA(1);
 
                          
-                        int index83_13 = input.index();
+                        int index84_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        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==STRING||(LA84_3>=BOOL && LA84_3<=INT)||(LA84_3>=FLOAT && LA84_3<=NULL)) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA84_3==LEFT_PAREN) ) {s = 7;}
+
+                        else if ( (LA84_3==GRAVE_ACCENT) ) {s = 8;}
+
                          
-                        input.seek(index83_13);
+                        input.seek(index84_3);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA83_7 = input.LA(1);
+                        int LA84_14 = input.LA(1);
 
                          
-                        int index83_7 = input.index();
+                        int index84_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18966,14 +19114,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_7);
+                        input.seek(index84_14);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA83_5 = input.LA(1);
+                        int LA84_13 = input.LA(1);
 
                          
-                        int index83_5 = input.index();
+                        int index84_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18981,14 +19129,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_5);
+                        input.seek(index84_13);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA83_14 = input.LA(1);
+                        int LA84_9 = input.LA(1);
 
                          
-                        int index83_14 = input.index();
+                        int index84_9 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18996,14 +19144,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_14);
+                        input.seek(index84_9);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA83_10 = input.LA(1);
+                        int LA84_12 = input.LA(1);
 
                          
-                        int index83_10 = input.index();
+                        int index84_12 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -19011,14 +19159,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_10);
+                        input.seek(index84_12);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA83_19 = input.LA(1);
+                        int LA84_7 = input.LA(1);
 
                          
-                        int index83_19 = input.index();
+                        int index84_7 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -19026,107 +19174,63 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_19);
+                        input.seek(index84_7);
                         if ( s>=0 ) return s;
                         break;
-                    case 11 : 
-                        int LA83_6 = input.LA(1);
-
-                         
-                        int index83_6 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA83_6==ID) ) {s = 9;}
-
-                        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(index83_6);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA83_12 = input.LA(1);
-
-                         
-                        int index83_12 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
-
-                        else if ( (true) ) {s = 1;}
-
-                         
-                        input.seek(index83_12);
-                        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;
         }
     }
-    static final String DFA84_eotS =
+    static final String DFA85_eotS =
         "\75\uffff";
-    static final String DFA84_eofS =
+    static final String DFA85_eofS =
         "\75\uffff";
-    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 = {
+    static final String DFA85_minS =
+        "\1\132\1\uffff\3\124\1\uffff\2\124\1\4\1\124\7\0\1\4\1\163\1\4"+
+        "\2\0\2\4\45\0";
+    static final String DFA85_maxS =
+        "\1\143\1\uffff\1\160\1\163\1\160\1\uffff\1\163\1\124\1\u0081\1"+
+        "\163\7\0\1\u0081\1\163\1\u0081\2\0\2\u0081\45\0";
+    static final String DFA85_acceptS =
+        "\1\uffff\1\2\3\uffff\1\1\67\uffff";
+    static final String DFA85_specialS =
+        "\2\uffff\1\6\1\12\1\15\1\uffff\1\11\2\uffff\1\13\1\5\1\10\1\3\1"+
+        "\4\1\0\1\1\1\2\3\uffff\1\7\1\14\47\uffff}>";
+    static final String[] DFA85_transitionS = {
             "\2\1\6\uffff\1\1\1\2",
             "",
-            "\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\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\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\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\22",
-            "\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",
+            "\120\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\43\1\1\2\uffff\1\5\1\45\3\uffff\1\1\2\uffff\2\5\10\uffff"+
+            "\6\1\1\44\2\5\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",
+            "\120\56\1\46\3\56\1\51\1\47\1\56\1\50\4\56\1\54\1\52\17\56"+
+            "\1\53\1\55\17\56",
             "\1\57",
-            "\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",
+            "\120\42\1\60\1\70\2\42\1\61\1\66\1\71\1\72\4\42\1\64\1\62"+
+            "\16\42\1\73\1\63\1\65\1\67\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",
+            "\125\42\1\74\1\71\1\72\46\42",
+            "\125\42\1\74\1\71\1\72\46\42",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -19166,733 +19270,736 @@
             "\1\uffff"
     };
 
-    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 final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
+    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
+    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
+    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
+    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
+    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
+    static final short[][] DFA85_transition;
 
     static {
-        int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
+        int numStates = DFA85_transitionS.length;
+        DFA85_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
+            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
         }
     }
 
-    class DFA84 extends DFA {
+    class DFA85 extends DFA {
 
-        public DFA84(BaseRecognizer recognizer) {
+        public DFA85(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            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;
+            this.decisionNumber = 85;
+            this.eot = DFA85_eot;
+            this.eof = DFA85_eof;
+            this.min = DFA85_min;
+            this.max = DFA85_max;
+            this.accept = DFA85_accept;
+            this.special = DFA85_special;
+            this.transition = DFA85_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1180:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
+            return "()* loopback of 1181:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA84_13 = input.LA(1);
+                        int LA85_14 = input.LA(1);
 
                          
-                        int index84_13 = input.index();
+                        int index85_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index84_13);
+                        input.seek(index85_14);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA84_16 = input.LA(1);
+                        int LA85_15 = input.LA(1);
 
                          
-                        int index84_16 = input.index();
+                        int index85_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index84_16);
+                        input.seek(index85_15);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA84_2 = input.LA(1);
+                        int LA85_16 = input.LA(1);
 
                          
-                        int index84_2 = input.index();
+                        int index85_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA84_2==ID) ) {s = 3;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
-                        else if ( ((LA84_2>=EQUAL && LA84_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA84_2==LEFT_PAREN) ) {s = 5;}
-
                          
-                        input.seek(index84_2);
+                        input.seek(index85_16);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA84_14 = input.LA(1);
+                        int LA85_12 = input.LA(1);
 
                          
-                        int index84_14 = input.index();
+                        int index85_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index84_14);
+                        input.seek(index85_12);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA84_10 = input.LA(1);
+                        int LA85_13 = input.LA(1);
 
                          
-                        int index84_10 = input.index();
+                        int index85_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index84_10);
+                        input.seek(index85_13);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA84_5 = input.LA(1);
+                        int LA85_10 = input.LA(1);
 
                          
-                        int index84_5 = input.index();
+                        int index85_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA84_5==ID) ) {s = 9;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
-                        else if ( (LA84_5==LEFT_PAREN) ) {s = 10;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( ((LA84_5>=EQUAL && LA84_5<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
-
                          
-                        input.seek(index84_5);
+                        input.seek(index85_10);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA84_12 = input.LA(1);
+                        int LA85_2 = input.LA(1);
 
                          
-                        int index84_12 = input.index();
+                        int index85_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA85_2==ID) ) {s = 3;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA85_2==LEFT_PAREN) ) {s = 4;}
 
+                        else if ( ((LA85_2>=EQUAL && LA85_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 5;}
+
                          
-                        input.seek(index84_12);
+                        input.seek(index85_2);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA84_3 = input.LA(1);
+                        int LA85_20 = input.LA(1);
 
                          
-                        int index84_3 = input.index();
+                        int index85_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA84_3==DOT||LA84_3==COLON||(LA84_3>=EQUAL && LA84_3<=NOT_EQUAL)||LA84_3==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
-                        else if ( (LA84_3==ID) ) {s = 6;}
+                        else if ( (true) ) {s = 1;}
 
-                        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(index84_3);
+                        input.seek(index85_20);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA84_9 = input.LA(1);
+                        int LA85_11 = input.LA(1);
 
                          
-                        int index84_9 = input.index();
+                        int index85_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA84_9==DOT||LA84_9==COLON||(LA84_9>=EQUAL && LA84_9<=NOT_EQUAL)||LA84_9==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
-                        else if ( (LA84_9==LEFT_PAREN) ) {s = 35;}
+                        else if ( (true) ) {s = 1;}
 
-                        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(index84_9);
+                        input.seek(index85_11);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA84_21 = input.LA(1);
+                        int LA85_6 = input.LA(1);
 
                          
-                        int index84_21 = input.index();
+                        int index85_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA85_6==ID) ) {s = 11;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA85_6==STRING) ) {s = 12;}
 
+                        else if ( (LA85_6==INT) ) {s = 13;}
+
+                        else if ( (LA85_6==FLOAT) ) {s = 14;}
+
+                        else if ( (LA85_6==BOOL) ) {s = 15;}
+
+                        else if ( (LA85_6==NULL) ) {s = 16;}
+
+                        else if ( (LA85_6==LEFT_PAREN) ) {s = 17;}
+
+                        else if ( (LA85_6==DOT||(LA85_6>=COMMA && LA85_6<=RIGHT_PAREN)||(LA85_6>=DOUBLE_PIPE && LA85_6<=DOUBLE_AMPER)||LA85_6==LEFT_SQUARE) && ((validateRestr()))) {s = 5;}
+
+                        else if ( (LA85_6==GRAVE_ACCENT) ) {s = 1;}
+
                          
-                        input.seek(index84_21);
+                        input.seek(index85_6);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA84_6 = input.LA(1);
+                        int LA85_3 = input.LA(1);
 
                          
-                        int index84_6 = input.index();
+                        int index85_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA84_6==LEFT_PAREN) ) {s = 11;}
+                        if ( (LA85_3==DOT||LA85_3==COLON||(LA85_3>=EQUAL && LA85_3<=NOT_EQUAL)||LA85_3==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (LA84_6==ID) ) {s = 12;}
+                        else if ( (LA85_3==ID) ) {s = 6;}
 
-                        else if ( (LA84_6==STRING) ) {s = 13;}
+                        else if ( (LA85_3==GRAVE_ACCENT) ) {s = 7;}
 
-                        else if ( (LA84_6==INT) ) {s = 14;}
+                        else if ( (LA85_3==STRING||(LA85_3>=BOOL && LA85_3<=INT)||(LA85_3>=FLOAT && LA85_3<=NULL)) && ((validateRestr()))) {s = 5;}
 
-                        else if ( (LA84_6==FLOAT) ) {s = 15;}
+                        else if ( (LA85_3==LEFT_PAREN) ) {s = 8;}
 
-                        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(index84_6);
+                        input.seek(index85_3);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA84_17 = input.LA(1);
+                        int LA85_9 = input.LA(1);
 
                          
-                        int index84_17 = input.index();
+                        int index85_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA85_9==DOT||LA85_9==COLON||(LA85_9>=EQUAL && LA85_9<=NOT_EQUAL)||LA85_9==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA85_9==ID) ) {s = 35;}
 
+                        else if ( (LA85_9==GRAVE_ACCENT) ) {s = 36;}
+
+                        else if ( (LA85_9==LEFT_PAREN) ) {s = 37;}
+
+                        else if ( (LA85_9==STRING||(LA85_9>=BOOL && LA85_9<=INT)||(LA85_9>=FLOAT && LA85_9<=NULL)) && ((validateRestr()))) {s = 5;}
+
                          
-                        input.seek(index84_17);
+                        input.seek(index85_9);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA84_15 = input.LA(1);
+                        int LA85_21 = input.LA(1);
 
                          
-                        int index84_15 = input.index();
+                        int index85_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( ((validateRestr())) ) {s = 5;}
 
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index84_15);
+                        input.seek(index85_21);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA84_20 = input.LA(1);
+                        int LA85_4 = input.LA(1);
 
                          
-                        int index84_20 = input.index();
+                        int index85_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA85_4==ID) ) {s = 9;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA85_4==LEFT_PAREN) ) {s = 10;}
 
+                        else if ( ((LA85_4>=EQUAL && LA85_4<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 5;}
+
                          
-                        input.seek(index84_20);
+                        input.seek(index85_4);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 84, _s, input);
+                new NoViableAltException(getDescription(), 85, _s, input);
             error(nvae);
             throw nvae;
         }
     }
  
 
-    public static final BitSet FOLLOW_package_statement_in_compilation_unit388 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit393 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_EOF_in_compilation_unit398 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_package_key_in_package_statement458 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_package_id_in_package_statement462 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_package_statement464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_package_id491 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_DOT_in_package_id497 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_package_id501 = new BitSet(new long[]{0x0000000000000002L,0x0000000000100000L});
-    public static final BitSet FOLLOW_rule_attribute_in_statement545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_import_statement_in_statement552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_statement_in_statement558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_global_in_statement564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_in_statement570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_template_in_statement578 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_type_declaration_in_statement586 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule_in_statement591 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_query_in_statement596 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_key_in_import_statement623 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_import_name_in_import_statement625 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_import_statement628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_key_in_function_import_statement671 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_function_key_in_function_import_statement673 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_import_name_in_function_import_statement675 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_function_import_statement678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_name712 = new BitSet(new long[]{0x0000000000000002L,0x0000000000300000L});
-    public static final BitSet FOLLOW_DOT_in_import_name718 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_import_name722 = new BitSet(new long[]{0x0000000000000002L,0x0000000000300000L});
-    public static final BitSet FOLLOW_DOT_STAR_in_import_name729 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_global_key_in_global774 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_data_type_in_global776 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_global_id_in_global778 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_global780 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_global_id809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_key_in_function846 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_data_type_in_function848 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_function_id_in_function851 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_parameters_in_function853 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_curly_chunk_in_function855 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_function_id885 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_query_key_in_query922 = new BitSet(new long[]{0x0000000000000000L,0x0000000000880000L});
-    public static final BitSet FOLLOW_query_id_in_query924 = new BitSet(new long[]{0x0000000000000000L,0x0000000001480000L});
-    public static final BitSet FOLLOW_parameters_in_query932 = new BitSet(new long[]{0x0000000000000000L,0x0000000001480000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query941 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
-    public static final BitSet FOLLOW_END_in_query946 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_query948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_query_id983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_query_id999 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_parameters1018 = new BitSet(new long[]{0x0000000000000000L,0x0000000004080000L});
-    public static final BitSet FOLLOW_param_definition_in_parameters1027 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_COMMA_in_parameters1030 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_param_definition_in_parameters1034 = new BitSet(new long[]{0x0000000000000000L,0x0000000006000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_parameters1043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_data_type_in_param_definition1069 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_argument_in_param_definition1072 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_argument1083 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_dimension_definition_in_argument1089 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_declare_key_in_type_declaration1117 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_type_declare_id_in_type_declaration1120 = new BitSet(new long[]{0x0000000000000000L,0x0000000008480000L});
-    public static final BitSet FOLLOW_decl_metadata_in_type_declaration1124 = new BitSet(new long[]{0x0000000000000000L,0x0000000008480000L});
-    public static final BitSet FOLLOW_decl_field_in_type_declaration1129 = new BitSet(new long[]{0x0000000000000000L,0x0000000000480000L});
-    public static final BitSet FOLLOW_END_in_type_declaration1134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_type_declare_id1169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AT_in_decl_metadata1188 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_decl_metadata1196 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_decl_metadata1203 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_decl_field1226 = new BitSet(new long[]{0x0000000000000000L,0x0000000030000000L});
-    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field1232 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_decl_field1238 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_data_type_in_decl_field1244 = new BitSet(new long[]{0x0000000000000002L,0x0000000008000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_decl_field1248 = new BitSet(new long[]{0x0000000000000002L,0x0000000008000000L});
-    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization1276 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_decl_field_initialization1282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_template_key_in_template1319 = new BitSet(new long[]{0x0000000000000000L,0x0000000000880000L});
-    public static final BitSet FOLLOW_template_id_in_template1321 = new BitSet(new long[]{0x0000000000000000L,0x00000000000C0000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template1328 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_template_slot_in_template1336 = new BitSet(new long[]{0x0000000000000000L,0x0000000000480000L});
-    public static final BitSet FOLLOW_END_in_template1341 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template1345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_template_id1378 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_template_id1394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_data_type_in_template_slot1414 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_slot_id_in_template_slot1416 = new BitSet(new long[]{0x0000000000000002L,0x0000000000040000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template_slot1418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_slot_id1447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule_key_in_rule1484 = new BitSet(new long[]{0x0000000000000000L,0x0000000000880000L});
-    public static final BitSet FOLLOW_rule_id_in_rule1486 = new BitSet(new long[]{0x0000000000000000L,0x0010000048080000L});
-    public static final BitSet FOLLOW_decl_metadata_in_rule1494 = new BitSet(new long[]{0x0000000000000000L,0x0010000048080000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule1497 = new BitSet(new long[]{0x0000000000000000L,0x0010000040000000L});
-    public static final BitSet FOLLOW_when_part_in_rule1500 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule1503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_WHEN_in_when_part1536 = new BitSet(new long[]{0x0000000000000002L,0x0000000011080000L});
-    public static final BitSet FOLLOW_COLON_in_when_part1542 = new BitSet(new long[]{0x0000000000000002L,0x0000000001080000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_when_part1552 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_rule_id1573 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_rule_id1589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_attributes_key_in_rule_attributes1610 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_COLON_in_rule_attributes1612 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1622 = new BitSet(new long[]{0x0000000000000002L,0x0000000002080000L});
-    public static final BitSet FOLLOW_COMMA_in_rule_attributes1626 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1633 = new BitSet(new long[]{0x0000000000000002L,0x0000000002080000L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute1672 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute1678 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1683 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1690 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1709 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1715 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1721 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1727 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_in_rule_attribute1738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_key_in_date_effective1754 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
-    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,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});
+    public static final BitSet FOLLOW_package_statement_in_compilation_unit392 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_statement_in_compilation_unit397 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_EOF_in_compilation_unit402 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_package_key_in_package_statement462 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_package_id_in_package_statement466 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_package_statement468 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_package_id495 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_DOT_in_package_id501 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_package_id505 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_rule_attribute_in_statement549 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_import_statement_in_statement556 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_statement_in_statement562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_global_in_statement568 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_in_statement574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_template_in_statement582 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_type_declaration_in_statement590 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule_in_statement595 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_query_in_statement600 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_key_in_import_statement627 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_import_name_in_import_statement629 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_import_statement632 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_key_in_function_import_statement675 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_function_key_in_function_import_statement677 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_import_name_in_function_import_statement679 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_function_import_statement682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_name716 = new BitSet(new long[]{0x0000000000000002L,0x0000000000600000L});
+    public static final BitSet FOLLOW_DOT_in_import_name722 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_import_name726 = new BitSet(new long[]{0x0000000000000002L,0x0000000000600000L});
+    public static final BitSet FOLLOW_DOT_STAR_in_import_name733 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_global_key_in_global778 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_data_type_in_global780 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_global_id_in_global782 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_global784 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_global_id813 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_key_in_function850 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_data_type_in_function852 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_function_id_in_function855 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_parameters_in_function857 = new BitSet(new long[]{0x0000000000000000L,0x0040000000000000L});
+    public static final BitSet FOLLOW_curly_chunk_in_function859 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_function_id889 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_query_key_in_query926 = new BitSet(new long[]{0x0000000000000000L,0x0000000001100000L});
+    public static final BitSet FOLLOW_query_id_in_query928 = new BitSet(new long[]{0x0000000000000000L,0x0000000002900000L});
+    public static final BitSet FOLLOW_parameters_in_query936 = new BitSet(new long[]{0x0000000000000000L,0x0000000002900000L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query945 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_END_in_query950 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_query952 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_query_id987 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_query_id1003 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_parameters1022 = new BitSet(new long[]{0x0000000000000000L,0x0000000008100000L});
+    public static final BitSet FOLLOW_param_definition_in_parameters1031 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
+    public static final BitSet FOLLOW_COMMA_in_parameters1034 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_param_definition_in_parameters1038 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_parameters1047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_data_type_in_param_definition1073 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_argument_in_param_definition1076 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_argument1087 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_dimension_definition_in_argument1093 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_declare_key_in_type_declaration1121 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_type_declare_id_in_type_declaration1124 = new BitSet(new long[]{0x0000000000000000L,0x0000000010900000L});
+    public static final BitSet FOLLOW_decl_metadata_in_type_declaration1128 = new BitSet(new long[]{0x0000000000000000L,0x0000000010900000L});
+    public static final BitSet FOLLOW_decl_field_in_type_declaration1133 = new BitSet(new long[]{0x0000000000000000L,0x0000000000900000L});
+    public static final BitSet FOLLOW_END_in_type_declaration1138 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_type_declare_id1173 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AT_in_decl_metadata1192 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_decl_metadata1200 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_decl_metadata1207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_decl_field1230 = new BitSet(new long[]{0x0000000000000000L,0x0000000060000000L});
+    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field1236 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_COLON_in_decl_field1242 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_data_type_in_decl_field1248 = new BitSet(new long[]{0x0000000000000002L,0x0000000010000000L});
+    public static final BitSet FOLLOW_decl_metadata_in_decl_field1252 = new BitSet(new long[]{0x0000000000000002L,0x0000000010000000L});
+    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization1280 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_decl_field_initialization1286 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_template_key_in_template1323 = new BitSet(new long[]{0x0000000000000000L,0x0000000001100000L});
+    public static final BitSet FOLLOW_template_id_in_template1325 = new BitSet(new long[]{0x0000000000000000L,0x0000000000180000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template1332 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_template_slot_in_template1340 = new BitSet(new long[]{0x0000000000000000L,0x0000000000900000L});
+    public static final BitSet FOLLOW_END_in_template1345 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template1349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_template_id1382 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_template_id1398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_data_type_in_template_slot1418 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_slot_id_in_template_slot1420 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template_slot1422 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_slot_id1451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule_key_in_rule1488 = new BitSet(new long[]{0x0000000000000000L,0x0000000001100000L});
+    public static final BitSet FOLLOW_rule_id_in_rule1490 = new BitSet(new long[]{0x0000000000000000L,0x0020000090100000L});
+    public static final BitSet FOLLOW_extend_key_in_rule1499 = new BitSet(new long[]{0x0000000000000000L,0x0000000001100000L});
+    public static final BitSet FOLLOW_rule_id_in_rule1501 = new BitSet(new long[]{0x0000000000000000L,0x0020000090100000L});
+    public static final BitSet FOLLOW_decl_metadata_in_rule1505 = new BitSet(new long[]{0x0000000000000000L,0x0020000090100000L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule1508 = new BitSet(new long[]{0x0000000000000000L,0x0020000080000000L});
+    public static final BitSet FOLLOW_when_part_in_rule1511 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_in_rule1514 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_WHEN_in_when_part1554 = new BitSet(new long[]{0x0000000000000002L,0x0000000022100000L});
+    public static final BitSet FOLLOW_COLON_in_when_part1560 = new BitSet(new long[]{0x0000000000000002L,0x0000000002100000L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_when_part1570 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_rule_id1591 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_rule_id1607 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_attributes_key_in_rule_attributes1628 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_COLON_in_rule_attributes1630 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1640 = new BitSet(new long[]{0x0000000000000002L,0x0000000004100000L});
+    public static final BitSet FOLLOW_COMMA_in_rule_attributes1644 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1651 = new BitSet(new long[]{0x0000000000000002L,0x0000000004100000L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1690 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1696 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1701 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1708 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1715 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1721 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1727 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1733 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1751 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_in_rule_attribute1756 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_key_in_date_effective1772 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_date_effective1777 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_key_in_date_expires1791 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_date_expires1796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_key_in_enabled1811 = new BitSet(new long[]{0x0000000000000000L,0x0000000102000000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_enabled1835 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_salience_key_in_salience1855 = new BitSet(new long[]{0x0000000000000000L,0x0000000202000000L});
+    public static final BitSet FOLLOW_INT_in_salience1864 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1873 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_key_in_no_loop1888 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_key_in_auto_focus1908 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1913 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_key_in_activation_group1930 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1935 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_key_in_ruleflow_group1949 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1954 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_key_in_agenda_group1968 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1973 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_key_in_duration1987 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
+    public static final BitSet FOLLOW_INT_in_duration1992 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_key_in_dialect2008 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_dialect2013 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_key_in_lock_on_active2031 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active2036 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block2051 = new BitSet(new long[]{0x0000000000000002L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs2072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2096 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2106 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2114 = new BitSet(new long[]{0x0000000000000000L,0x000000000A100000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2120 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2143 = new BitSet(new long[]{0x0000000000000002L,0x0000000400100000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2165 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_lhs_or2172 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2183 = new BitSet(new long[]{0x0000000000000002L,0x0000000400100000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2224 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2234 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2242 = new BitSet(new long[]{0x0000000000000000L,0x000000000A100000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2272 = new BitSet(new long[]{0x0000000000000002L,0x0000000800100000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2294 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_lhs_and2301 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2312 = new BitSet(new long[]{0x0000000000000002L,0x0000000800100000L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2343 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_lhs_not_binding_in_lhs_unary2351 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2357 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2363 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2369 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2375 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2386 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2392 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2400 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_lhs_unary2414 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_exists_key_in_lhs_exist2430 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2457 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2464 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2472 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2479 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not_binding2540 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_not_binding2542 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not2565 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2587 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2594 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2603 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2609 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2619 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_eval_key_in_lhs_eval2658 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2667 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_forall_key_in_lhs_forall2694 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2699 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2707 = new BitSet(new long[]{0x0000000000000000L,0x0000000008100000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2713 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2749 = new BitSet(new long[]{0x0000000000000002L,0x0000003000000000L});
+    public static final BitSet FOLLOW_over_clause_in_pattern_source2753 = new BitSet(new long[]{0x0000000000000002L,0x0000001000000000L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2763 = new BitSet(new long[]{0x0000000000000000L,0x0000014000100000L});
+    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2783 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_collect_statement_in_pattern_source2799 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2816 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_pattern_source2832 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OVER_in_over_clause2864 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2869 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_COMMA_in_over_clause2876 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2881 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2896 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_COLON_in_over_elements2903 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2912 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_over_elements2919 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2945 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2954 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2962 = new BitSet(new long[]{0x0000000000000000L,0x0000008004100000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2967 = new BitSet(new long[]{0x0000000000000000L,0x0000008000100000L});
+    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_statement2977 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_statement2983 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2991 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause3037 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3048 = new BitSet(new long[]{0x0000000000000000L,0x0000000004100000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3053 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_action_key_in_accumulate_init_clause3064 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3068 = new BitSet(new long[]{0x0000000000000000L,0x0000000004100000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3073 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_reverse_key_in_accumulate_init_clause3086 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3090 = new BitSet(new long[]{0x0000000000000000L,0x0000000004100000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3095 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_result_key_in_accumulate_init_clause3110 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_in_accumulate_init_clause3116 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk3174 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_paren_chunk_data3198 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_set_in_accumulate_paren_chunk_data3210 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_accumulate_paren_chunk_data_in_accumulate_paren_chunk_data3226 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_paren_chunk_data3237 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_accumulate_id_clause3253 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_id_clause3259 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement3281 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3290 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_pattern_source_in_collect_statement3297 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entry_point_key_in_entrypoint_statement3329 = new BitSet(new long[]{0x0000000000000000L,0x0000000001100000L});
+    public static final BitSet FOLLOW_entrypoint_id_in_entrypoint_statement3337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entrypoint_id3363 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_entrypoint_id3380 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source3400 = new BitSet(new long[]{0x0000000000000002L,0x0000000002200000L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source3415 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source3422 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOT_in_expression_chain3455 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_expression_chain3462 = new BitSet(new long[]{0x0000000000000002L,0x0008000002200000L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3478 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain3492 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain3503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern3536 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern3549 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_fact_binding3569 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3575 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3582 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_fact_binding_expression_in_fact_binding3590 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3598 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3639 = new BitSet(new long[]{0x0000000000000002L,0x0000000400100000L});
+    public static final BitSet FOLLOW_or_key_in_fact_binding_expression3651 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3657 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3662 = new BitSet(new long[]{0x0000000000000002L,0x0000000400100000L});
+    public static final BitSet FOLLOW_pattern_type_in_fact3702 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3707 = new BitSet(new long[]{0x0000000000000000L,0x000000000A100000L});
+    public static final BitSet FOLLOW_constraints_in_fact3718 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3724 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints3758 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_COMMA_in_constraints3762 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_constraint_in_constraints3769 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_or_constr_in_constraint3783 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3794 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3798 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3805 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3820 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3824 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3831 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_eval_key_in_unary_constr3864 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_unary_constr3867 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr3872 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3878 = new BitSet(new long[]{0x0000000000000000L,0x0000000002100000L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr3888 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_field_constraint3913 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3915 = new BitSet(new long[]{0x0000000000000002L,0x0001FE0002100000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3922 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ARROW_in_field_constraint3928 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_paren_chunk_in_field_constraint3932 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3986 = new BitSet(new long[]{0x0000000000000000L,0x0001FC0002100000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3988 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_label4013 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_COLON_in_label4020 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4041 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective4047 = new BitSet(new long[]{0x0000000000000000L,0x0001FC0002100000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4055 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4070 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective4076 = new BitSet(new long[]{0x0000000000000000L,0x0001FC0002100000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4083 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression4105 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression4110 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression4115 = new BitSet(new long[]{0x0000000000000000L,0x0001FC0002100000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4124 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4129 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EQUAL_in_simple_operator4158 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_GREATER_in_simple_operator4166 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_GREATER_EQUAL_in_simple_operator4174 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_LESS_in_simple_operator4182 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_LESS_EQUAL_in_simple_operator4190 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_NOT_EQUAL_in_simple_operator4198 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_not_key_in_simple_operator4206 = new BitSet(new long[]{0x0000000000000000L,0x0001000000100000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4213 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4220 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4227 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4234 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4243 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4254 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4262 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4268 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4274 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_excludes_key_in_simple_operator4280 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4286 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4292 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4298 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4306 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4316 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4324 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4330 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator4337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4355 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_not_key_in_compound_operator4360 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4362 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4373 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4381 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator4385 = new BitSet(new long[]{0x0000000000000000L,0x0006000303100000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4390 = new BitSet(new long[]{0x0000000000000000L,0x000000000C000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4398 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_expression_value4419 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value4424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_value4430 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint4449 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint4456 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint4470 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint4477 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4492 = new BitSet(new long[]{0x0000000000000002L,0x0008000000200000L});
+    public static final BitSet FOLLOW_DOT_in_pattern_type4498 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4502 = new BitSet(new long[]{0x0000000000000002L,0x0008000000200000L});
+    public static final BitSet FOLLOW_dimension_definition_in_pattern_type4517 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_ID_in_data_type4545 = new BitSet(new long[]{0x0000000000000002L,0x0008000000200000L});
+    public static final BitSet FOLLOW_DOT_in_data_type4551 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_data_type4555 = new BitSet(new long[]{0x0000000000000002L,0x0008000000200000L});
+    public static final BitSet FOLLOW_dimension_definition_in_data_type4560 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dimension_definition4589 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dimension_definition4596 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4610 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_DOT_in_accessor_path4614 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4618 = new BitSet(new long[]{0x0000000000000002L,0x0000000000200000L});
+    public static final BitSet FOLLOW_ID_in_accessor_element4642 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_accessor_element4648 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_data_in_rhs_chunk4677 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk_data4696 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_set_in_rhs_chunk_data4709 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_END_in_rhs_chunk_data4722 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_rhs_chunk_data4728 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk4747 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk_data4770 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_set_in_curly_chunk_data4782 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk_data4798 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk_data4809 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk4830 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk_data4854 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_set_in_paren_chunk_data4866 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk_data4882 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk_data4893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk4914 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk_data4937 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_set_in_square_chunk_data4949 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk_data4964 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000003L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk_data4975 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4999 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key5003 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key5007 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key5011 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key5015 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key5047 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_effective_key5051 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key5055 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key5087 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_expires_key5091 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key5095 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key5127 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_no_loop_key5131 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key5135 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key5167 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_auto_focus_key5171 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key5175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5207 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_activation_group_key5211 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5215 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5247 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_agenda_group_key5251 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5255 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5287 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_ruleflow_group_key5291 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5295 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5327 = new BitSet(new long[]{0x0000000000000000L,0x0100000000000000L});
+    public static final BitSet FOLLOW_MISC_in_entry_point_key5331 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5335 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_duration_key5364 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_package_key5391 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_key5418 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_dialect_key5445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_salience_key5472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_enabled_key5499 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_attributes_key5526 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_rule_key5553 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_extend_key5580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_template_key5607 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_query_key5634 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_declare_key5661 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_function_key5688 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_global_key5715 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_eval_key5742 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_contains_key5769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_matches_key5796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_excludes_key5823 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_soundslike_key5850 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_memberof_key5877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_not_key5904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_in_key5931 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_or_key5958 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_and_key5985 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_exists_key6012 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_forall_key6039 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_action_key6066 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_reverse_key6093 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_result_key6120 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred12087 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_or_key_in_synpred12089 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_or_key_in_synpred22156 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred22158 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred32215 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_and_key_in_synpred32217 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred42285 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred42287 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SEMICOLON_in_synpred52410 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred62447 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_or_key_in_synpred62450 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred62452 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred72575 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_or_key_in_synpred72578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred72580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred83409 = 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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-10-17 17:15:55
+// $ANTLR 3.0.1 src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-10-18 17:54:42
 
 	package org.drools.lang;
 
@@ -36,134 +36,135 @@
 
 public class DescrBuilderTree extends TreeParser {
     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"
+        "<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_EXTEND", "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 COMMA=89;
+    public static final int VT_ACCESSOR_ELEMENT=37;
+    public static final int ACCUMULATE=102;
+    public static final int VT_DATA_TYPE=38;
+    public static final int DOT_STAR=86;
+    public static final int VK_FUNCTION=65;
+    public static final int VK_GLOBAL=66;
+    public static final int VK_AND=77;
+    public static final int EQUALS=94;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=127;
+    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_ACCUMULATE_ID_CLAUSE=28;
-    public static final int VK_DIALECT=54;
-    public static final int VK_FUNCTION=64;
-    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_FUNCTION_IMPORT=5;
+    public static final int VT_OR_INFIX=26;
+    public static final int DOUBLE_AMPER=99;
+    public static final int EOL=121;
+    public static final int GREATER=107;
+    public static final int VK_IMPORT=60;
+    public static final int NOT_EQUAL=111;
+    public static final int VK_ACTION=80;
+    public static final int VK_RULE=58;
+    public static final int VK_MEMBEROF=72;
+    public static final int LESS=109;
+    public static final int GRAVE_ACCENT=112;
+    public static final int VT_SLOT=15;
+    public static final int VK_OR=76;
     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 DOT=84;
-    public static final int VK_IMPORT=59;
-    public static final int VT_SLOT=15;
+    public static final int NULL=114;
+    public static final int BOOL=96;
+    public static final int VK_QUERY=63;
+    public static final int SEMICOLON=83;
+    public static final int INT=97;
+    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=73;
+    public static final int VK_RULEFLOW_GROUP=52;
+    public static final int VK_RESULT=82;
     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_LABEL=8;
+    public static final int WS=122;
+    public static final int VK_NO_LOOP=48;
+    public static final int LEFT_CURLY=118;
     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_PATTERN=31;
+    public static final int VK_IN=75;
+    public static final int LEFT_PAREN=89;
+    public static final int LESS_EQUAL=110;
+    public static final int VT_IMPORT_ID=41;
+    public static final int VT_RULE_ID=12;
+    public static final int MISC=120;
+    public static final int FROM=100;
+    public static final int END=87;
+    public static final int COLLECT=104;
+    public static final int INIT=103;
+    public static final int EscapeSequence=123;
+    public static final int VK_ACTIVATION_GROUP=50;
+    public static final int VK_ENABLED=56;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=128;
+    public static final int VK_PACKAGE=61;
+    public static final int OVER=101;
+    public static final int VK_EXTEND=59;
+    public static final int RIGHT_SQUARE=116;
+    public static final int RIGHT_CURLY=119;
+    public static final int VK_MATCHES=69;
+    public static final int VT_FACT_OR=33;
+    public static final int VT_FIELD=35;
+    public static final int FLOAT=113;
+    public static final int VT_ACCUMULATE_ID_CLAUSE=28;
+    public static final int VK_EXISTS=78;
+    public static final int VK_DATE_EXPIRES=46;
+    public static final int ID=84;
+    public static final int HexDigit=124;
+    public static final int VT_OR_PREFIX=24;
+    public static final int VK_EVAL=67;
+    public static final int DOUBLE_PIPE=98;
+    public static final int AT=92;
+    public static final int RIGHT_PAREN=91;
+    public static final int THEN=117;
+    public static final int VT_COMPILATION_UNIT=4;
+    public static final int VT_EXPRESSION_CHAIN=30;
+    public static final int COMMA=90;
+    public static final int EQUAL=106;
+    public static final int VT_BEHAVIOR=21;
     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 VK_DIALECT=54;
+    public static final int DOT=85;
+    public static final int VT_GLOBAL_ID=42;
+    public static final int VK_NOT=74;
+    public static final int VT_FROM_SOURCE=29;
+    public static final int VK_DECLARE=64;
     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 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 VT_PAREN_CHUNK=20;
+    public static final int VK_CONTAINS=68;
+    public static final int VT_TYPE_DECLARE_ID=11;
+    public static final int VK_REVERSE=81;
+    public static final int VK_LOCK_ON_ACTIVE=47;
+    public static final int VK_TEMPLATE=62;
     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 VK_ENABLED=56;
-    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 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_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=129;
+    public static final int VK_FORALL=79;
+    public static final int COLON=93;
+    public static final int VK_EXCLUDES=70;
+    public static final int VK_SOUNDSLIKE=71;
     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 VK_AGENDA_GROUP=51;
-    public static final int VT_FACT_OR=33;
-    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 INIT=102;
+    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 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_ATTRIBUTES=57;
+    public static final int WHEN=95;
+    public static final int UnicodeEscape=125;
+    public static final int VT_SQUARE_CHUNK=19;
     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_TEMPLATE_ID=10;
+    public static final int VT_PARAM_LIST=44;
+    public static final int ARROW=105;
     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 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_CONTAINS=67;
-    public static final int VK_LOCK_ON_ACTIVE=47;
-    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 VK_AGENDA_GROUP=51;
     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 RIGHT_PAREN=90;
-    public static final int VT_TEMPLATE_ID=10;
-    public static final int VK_DECLARE=63;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
+    public static final int LEFT_SQUARE=115;
+    public static final int GREATER_EQUAL=108;
+    public static final int OctalEscape=126;
+    public static final int STRING=88;
 
         public DescrBuilderTree(TreeNodeStream input) {
             super(input);
@@ -204,7 +205,7 @@
                     int alt1=2;
                     int LA1_0 = input.LA(1);
 
-                    if ( (LA1_0==VT_FUNCTION_IMPORT||(LA1_0>=VK_DATE_EFFECTIVE && LA1_0<=VK_ENABLED)||(LA1_0>=VK_RULE && LA1_0<=VK_IMPORT)||(LA1_0>=VK_TEMPLATE && LA1_0<=VK_GLOBAL)) ) {
+                    if ( (LA1_0==VT_FUNCTION_IMPORT||(LA1_0>=VK_DATE_EFFECTIVE && LA1_0<=VK_ENABLED)||LA1_0==VK_RULE||LA1_0==VK_IMPORT||(LA1_0>=VK_TEMPLATE && LA1_0<=VK_GLOBAL)) ) {
                         alt1=1;
                     }
 
@@ -260,7 +261,7 @@
             if ( (LA2_0==VK_PACKAGE) ) {
                 alt2=1;
             }
-            else if ( (LA2_0==UP||LA2_0==VT_FUNCTION_IMPORT||(LA2_0>=VK_DATE_EFFECTIVE && LA2_0<=VK_ENABLED)||(LA2_0>=VK_RULE && LA2_0<=VK_IMPORT)||(LA2_0>=VK_TEMPLATE && LA2_0<=VK_GLOBAL)) ) {
+            else if ( (LA2_0==UP||LA2_0==VT_FUNCTION_IMPORT||(LA2_0>=VK_DATE_EFFECTIVE && LA2_0<=VK_ENABLED)||LA2_0==VK_RULE||LA2_0==VK_IMPORT||(LA2_0>=VK_TEMPLATE && LA2_0<=VK_GLOBAL)) ) {
                 alt2=2;
             }
             else {
@@ -1067,13 +1068,14 @@
     };
 
     // $ANTLR start rule
-    // src/main/resources/org/drools/lang/DescrBuilderTree.g:131:1: rule returns [RuleDescr ruleDescr] : ^(start= VK_RULE id= VT_RULE_ID (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK ) ;
+    // src/main/resources/org/drools/lang/DescrBuilderTree.g:131:1: rule returns [RuleDescr ruleDescr] : ^(start= VK_RULE id= VT_RULE_ID ( ^( VK_EXTEND parent_id= VT_RULE_ID ) )? (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK ) ;
     public final rule_return rule() throws RecognitionException {
         rule_return retval = new rule_return();
         retval.start = input.LT(1);
 
         DroolsTree start=null;
         DroolsTree id=null;
+        DroolsTree parent_id=null;
         DroolsTree content=null;
         Map dm = null;
 
@@ -1084,8 +1086,8 @@
 
         	List<Map> declMetadaList = new LinkedList<Map>();
         try {
-            // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:2: ( ^(start= VK_RULE id= VT_RULE_ID (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK ) )
-            // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:4: ^(start= VK_RULE id= VT_RULE_ID (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK )
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:2: ( ^(start= VK_RULE id= VT_RULE_ID ( ^( VK_EXTEND parent_id= VT_RULE_ID ) )? (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK ) )
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:4: ^(start= VK_RULE id= VT_RULE_ID ( ^( VK_EXTEND parent_id= VT_RULE_ID ) )? (dm= decl_metadata )* (ra= rule_attributes )? (wn= when_part )? content= VT_RHS_CHUNK )
             {
             start=(DroolsTree)input.LT(1);
             match(input,VK_RULE,FOLLOW_VK_RULE_in_rule496); 
@@ -1093,22 +1095,46 @@
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
             match(input,VT_RULE_ID,FOLLOW_VT_RULE_ID_in_rule500); 
+            // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:35: ( ^( VK_EXTEND parent_id= VT_RULE_ID ) )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( (LA10_0==VK_EXTEND) ) {
+                alt10=1;
+            }
+            switch (alt10) {
+                case 1 :
+                    // src/main/resources/org/drools/lang/DescrBuilderTree.g:133:36: ^( VK_EXTEND parent_id= VT_RULE_ID )
+                    {
+                    match(input,VK_EXTEND,FOLLOW_VK_EXTEND_in_rule505); 
+
+                    match(input, Token.DOWN, null); 
+                    parent_id=(DroolsTree)input.LT(1);
+                    match(input,VT_RULE_ID,FOLLOW_VT_RULE_ID_in_rule509); 
+
+                    match(input, Token.UP, null); 
+
+                    }
+                    break;
+
+            }
+
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:134:3: (dm= decl_metadata )*
-            loop10:
+            loop11:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt11=2;
+                int LA11_0 = input.LA(1);
 
-                if ( (LA10_0==AT) ) {
-                    alt10=1;
+                if ( (LA11_0==AT) ) {
+                    alt11=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt11) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:134:4: dm= decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_rule509);
+            	    pushFollow(FOLLOW_decl_metadata_in_rule519);
             	    dm=decl_metadata();
             	    _fsp--;
 
@@ -1118,22 +1144,22 @@
             	    break;
 
             	default :
-            	    break loop10;
+            	    break loop11;
                 }
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:135:6: (ra= rule_attributes )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA11_0==VT_RULE_ATTRIBUTES) ) {
-                alt11=1;
+            if ( (LA12_0==VT_RULE_ATTRIBUTES) ) {
+                alt12=1;
             }
-            switch (alt11) {
+            switch (alt12) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:135:6: ra= rule_attributes
                     {
-                    pushFollow(FOLLOW_rule_attributes_in_rule520);
+                    pushFollow(FOLLOW_rule_attributes_in_rule530);
                     ra=rule_attributes();
                     _fsp--;
 
@@ -1144,17 +1170,17 @@
             }
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:136:6: (wn= when_part )?
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            int alt13=2;
+            int LA13_0 = input.LA(1);
 
-            if ( (LA12_0==WHEN) ) {
-                alt12=1;
+            if ( (LA13_0==WHEN) ) {
+                alt13=1;
             }
-            switch (alt12) {
+            switch (alt13) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:136:6: wn= when_part
                     {
-                    pushFollow(FOLLOW_when_part_in_rule529);
+                    pushFollow(FOLLOW_when_part_in_rule539);
                     wn=when_part();
                     _fsp--;
 
@@ -1165,10 +1191,10 @@
             }
 
             content=(DroolsTree)input.LT(1);
-            match(input,VT_RHS_CHUNK,FOLLOW_VT_RHS_CHUNK_in_rule534); 
+            match(input,VT_RHS_CHUNK,FOLLOW_VT_RHS_CHUNK_in_rule544); 
 
             match(input, Token.UP, null); 
-            	retval.ruleDescr = factory.createRule(start, id, ra, wn, content, declMetadaList);	
+            	retval.ruleDescr = factory.createRule(start, id, parent_id, ra, wn, content, declMetadaList);	
 
             }
 
@@ -1196,8 +1222,8 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:141:2: ( WHEN lh= lhs_block )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:141:4: WHEN lh= lhs_block
             {
-            match(input,WHEN,FOLLOW_WHEN_in_when_part553); 
-            pushFollow(FOLLOW_lhs_block_in_when_part557);
+            match(input,WHEN,FOLLOW_WHEN_in_when_part563); 
+            pushFollow(FOLLOW_lhs_block_in_when_part567);
             lh=lhs_block();
             _fsp--;
 
@@ -1232,21 +1258,21 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:3: ( ^( VT_RULE_ATTRIBUTES ( VK_ATTRIBUTES )? (rl= rule_attribute )+ ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:5: ^( VT_RULE_ATTRIBUTES ( VK_ATTRIBUTES )? (rl= rule_attribute )+ )
             {
-            match(input,VT_RULE_ATTRIBUTES,FOLLOW_VT_RULE_ATTRIBUTES_in_rule_attributes579); 
+            match(input,VT_RULE_ATTRIBUTES,FOLLOW_VT_RULE_ATTRIBUTES_in_rule_attributes589); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:26: ( VK_ATTRIBUTES )?
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA13_0==VK_ATTRIBUTES) ) {
-                alt13=1;
+            if ( (LA14_0==VK_ATTRIBUTES) ) {
+                alt14=1;
             }
-            switch (alt13) {
+            switch (alt14) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:26: VK_ATTRIBUTES
                     {
-                    match(input,VK_ATTRIBUTES,FOLLOW_VK_ATTRIBUTES_in_rule_attributes581); 
+                    match(input,VK_ATTRIBUTES,FOLLOW_VK_ATTRIBUTES_in_rule_attributes591); 
 
                     }
                     break;
@@ -1254,22 +1280,22 @@
             }
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:41: (rl= rule_attribute )+
-            int cnt14=0;
-            loop14:
+            int cnt15=0;
+            loop15:
             do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                int alt15=2;
+                int LA15_0 = input.LA(1);
 
-                if ( ((LA14_0>=VK_DATE_EFFECTIVE && LA14_0<=VK_ENABLED)) ) {
-                    alt14=1;
+                if ( ((LA15_0>=VK_DATE_EFFECTIVE && LA15_0<=VK_ENABLED)) ) {
+                    alt15=1;
                 }
 
 
-                switch (alt14) {
+                switch (alt15) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:148:42: rl= rule_attribute
             	    {
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes587);
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes597);
             	    rl=rule_attribute();
             	    _fsp--;
 
@@ -1279,12 +1305,12 @@
             	    break;
 
             	default :
-            	    if ( cnt14 >= 1 ) break loop14;
+            	    if ( cnt15 >= 1 ) break loop15;
                         EarlyExitException eee =
-                            new EarlyExitException(14, input);
+                            new EarlyExitException(15, input);
                         throw eee;
                 }
-                cnt14++;
+                cnt15++;
             } while (true);
 
 
@@ -1319,26 +1345,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:154:3: ( ^( VT_PARAM_LIST (p= param_definition )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:154:5: ^( VT_PARAM_LIST (p= param_definition )* )
             {
-            match(input,VT_PARAM_LIST,FOLLOW_VT_PARAM_LIST_in_parameters611); 
+            match(input,VT_PARAM_LIST,FOLLOW_VT_PARAM_LIST_in_parameters621); 
 
             if ( input.LA(1)==Token.DOWN ) {
                 match(input, Token.DOWN, null); 
                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:154:21: (p= param_definition )*
-                loop15:
+                loop16:
                 do {
-                    int alt15=2;
-                    int LA15_0 = input.LA(1);
+                    int alt16=2;
+                    int LA16_0 = input.LA(1);
 
-                    if ( (LA15_0==VT_DATA_TYPE||LA15_0==ID) ) {
-                        alt15=1;
+                    if ( (LA16_0==VT_DATA_TYPE||LA16_0==ID) ) {
+                        alt16=1;
                     }
 
 
-                    switch (alt15) {
+                    switch (alt16) {
                 	case 1 :
                 	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:154:22: p= param_definition
                 	    {
-                	    pushFollow(FOLLOW_param_definition_in_parameters616);
+                	    pushFollow(FOLLOW_param_definition_in_parameters626);
                 	    p=param_definition();
                 	    _fsp--;
 
@@ -1348,7 +1374,7 @@
                 	    break;
 
                 	default :
-                	    break loop15;
+                	    break loop16;
                     }
                 } while (true);
 
@@ -1385,17 +1411,17 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:158:4: (dt= data_type )? a= argument
             {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:158:6: (dt= data_type )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA16_0==VT_DATA_TYPE) ) {
-                alt16=1;
+            if ( (LA17_0==VT_DATA_TYPE) ) {
+                alt17=1;
             }
-            switch (alt16) {
+            switch (alt17) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:158:6: dt= data_type
                     {
-                    pushFollow(FOLLOW_data_type_in_param_definition638);
+                    pushFollow(FOLLOW_data_type_in_param_definition648);
                     dt=data_type();
                     _fsp--;
 
@@ -1405,7 +1431,7 @@
 
             }
 
-            pushFollow(FOLLOW_argument_in_param_definition643);
+            pushFollow(FOLLOW_argument_in_param_definition653);
             a=argument();
             _fsp--;
 
@@ -1440,25 +1466,25 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:164:4: id= ID ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
             {
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_argument663); 
+            match(input,ID,FOLLOW_ID_in_argument673); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:164:10: ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
-            loop17:
+            loop18:
             do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
+                int alt18=2;
+                int LA18_0 = input.LA(1);
 
-                if ( (LA17_0==LEFT_SQUARE) ) {
-                    alt17=1;
+                if ( (LA18_0==LEFT_SQUARE) ) {
+                    alt18=1;
                 }
 
 
-                switch (alt17) {
+                switch (alt18) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:164:11: LEFT_SQUARE rightList+= RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument666); 
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument676); 
             	    rightList=(DroolsTree)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument670); 
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument680); 
             	    if (list_rightList==null) list_rightList=new ArrayList();
             	    list_rightList.add(rightList);
 
@@ -1467,7 +1493,7 @@
             	    break;
 
             	default :
-            	    break loop17;
+            	    break loop18;
                 }
             } while (true);
 
@@ -1504,27 +1530,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:171:2: ( ^( VK_DECLARE id= VT_TYPE_DECLARE_ID (dm= decl_metadata )* (df= decl_field )* END ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:171:4: ^( VK_DECLARE id= VT_TYPE_DECLARE_ID (dm= decl_metadata )* (df= decl_field )* END )
             {
-            match(input,VK_DECLARE,FOLLOW_VK_DECLARE_in_type_declaration696); 
+            match(input,VK_DECLARE,FOLLOW_VK_DECLARE_in_type_declaration706); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,VT_TYPE_DECLARE_ID,FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration700); 
+            match(input,VT_TYPE_DECLARE_ID,FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration710); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:172:4: (dm= decl_metadata )*
-            loop18:
+            loop19:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA18_0==AT) ) {
-                    alt18=1;
+                if ( (LA19_0==AT) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt19) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:172:5: dm= decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration709);
+            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration719);
             	    dm=decl_metadata();
             	    _fsp--;
 
@@ -1534,26 +1560,26 @@
             	    break;
 
             	default :
-            	    break loop18;
+            	    break loop19;
                 }
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:173:4: (df= decl_field )*
-            loop19:
+            loop20:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt20=2;
+                int LA20_0 = input.LA(1);
 
-                if ( (LA19_0==ID) ) {
-                    alt19=1;
+                if ( (LA20_0==ID) ) {
+                    alt20=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt20) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:173:5: df= decl_field
             	    {
-            	    pushFollow(FOLLOW_decl_field_in_type_declaration722);
+            	    pushFollow(FOLLOW_decl_field_in_type_declaration732);
             	    df=decl_field();
             	    _fsp--;
 
@@ -1563,11 +1589,11 @@
             	    break;
 
             	default :
-            	    break loop19;
+            	    break loop20;
                 }
             } while (true);
 
-            match(input,END,FOLLOW_END_in_type_declaration728); 
+            match(input,END,FOLLOW_END_in_type_declaration738); 
 
             match(input, Token.UP, null); 
             	declaration = factory.createTypeDeclr(id, declMetadaList, declFieldList);	
@@ -1599,13 +1625,13 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:179:2: ( ^( AT att= ID pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:179:4: ^( AT att= ID pc= VT_PAREN_CHUNK )
             {
-            match(input,AT,FOLLOW_AT_in_decl_metadata753); 
+            match(input,AT,FOLLOW_AT_in_decl_metadata763); 
 
             match(input, Token.DOWN, null); 
             att=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_decl_metadata757); 
+            match(input,ID,FOLLOW_ID_in_decl_metadata767); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_decl_metadata761); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_decl_metadata771); 
 
             match(input, Token.UP, null); 
             	attData.put(att, pc);	
@@ -1643,21 +1669,21 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:185:4: ^(id= ID (init= decl_field_initialization )? dt= data_type (dm= decl_metadata )* )
             {
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_decl_field788); 
+            match(input,ID,FOLLOW_ID_in_decl_field798); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:185:16: (init= decl_field_initialization )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( (LA20_0==EQUALS) ) {
-                alt20=1;
+            if ( (LA21_0==EQUALS) ) {
+                alt21=1;
             }
-            switch (alt20) {
+            switch (alt21) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:185:16: init= decl_field_initialization
                     {
-                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field792);
+                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field802);
                     init=decl_field_initialization();
                     _fsp--;
 
@@ -1667,26 +1693,26 @@
 
             }
 
-            pushFollow(FOLLOW_data_type_in_decl_field797);
+            pushFollow(FOLLOW_data_type_in_decl_field807);
             dt=data_type();
             _fsp--;
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:185:57: (dm= decl_metadata )*
-            loop21:
+            loop22:
             do {
-                int alt21=2;
-                int LA21_0 = input.LA(1);
+                int alt22=2;
+                int LA22_0 = input.LA(1);
 
-                if ( (LA21_0==AT) ) {
-                    alt21=1;
+                if ( (LA22_0==AT) ) {
+                    alt22=1;
                 }
 
 
-                switch (alt21) {
+                switch (alt22) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:185:58: dm= decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_decl_field802);
+            	    pushFollow(FOLLOW_decl_metadata_in_decl_field812);
             	    dm=decl_metadata();
             	    _fsp--;
 
@@ -1696,7 +1722,7 @@
             	    break;
 
             	default :
-            	    break loop21;
+            	    break loop22;
                 }
             } while (true);
 
@@ -1729,11 +1755,11 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:190:2: ( ^( EQUALS pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:190:4: ^( EQUALS pc= VT_PAREN_CHUNK )
             {
-            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization829); 
+            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization839); 
 
             match(input, Token.DOWN, null); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_decl_field_initialization833); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_decl_field_initialization843); 
 
             match(input, Token.UP, null); 
             	expr = pc.getText().substring(1, pc.getText().length() -1 ).trim();	
@@ -1765,105 +1791,105 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:195: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:195: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;
+            int alt28=12;
             switch ( input.LA(1) ) {
             case VK_SALIENCE:
                 {
-                alt27=1;
+                alt28=1;
                 }
                 break;
             case VK_NO_LOOP:
                 {
-                alt27=2;
+                alt28=2;
                 }
                 break;
             case VK_AGENDA_GROUP:
                 {
-                alt27=3;
+                alt28=3;
                 }
                 break;
             case VK_DURATION:
                 {
-                alt27=4;
+                alt28=4;
                 }
                 break;
             case VK_ACTIVATION_GROUP:
                 {
-                alt27=5;
+                alt28=5;
                 }
                 break;
             case VK_AUTO_FOCUS:
                 {
-                alt27=6;
+                alt28=6;
                 }
                 break;
             case VK_DATE_EFFECTIVE:
                 {
-                alt27=7;
+                alt28=7;
                 }
                 break;
             case VK_DATE_EXPIRES:
                 {
-                alt27=8;
+                alt28=8;
                 }
                 break;
             case VK_ENABLED:
                 {
-                alt27=9;
+                alt28=9;
                 }
                 break;
             case VK_RULEFLOW_GROUP:
                 {
-                alt27=10;
+                alt28=10;
                 }
                 break;
             case VK_LOCK_ON_ACTIVE:
                 {
-                alt27=11;
+                alt28=11;
                 }
                 break;
             case VK_DIALECT:
                 {
-                alt27=12;
+                alt28=12;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("195: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);
+                    new NoViableAltException("195: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 ) )", 28, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt27) {
+            switch (alt28) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:195:5: ^(attrName= VK_SALIENCE (value= INT | value= VT_PAREN_CHUNK ) )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_SALIENCE,FOLLOW_VK_SALIENCE_in_rule_attribute856); 
+                    match(input,VK_SALIENCE,FOLLOW_VK_SALIENCE_in_rule_attribute866); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:195:28: (value= INT | value= VT_PAREN_CHUNK )
-                    int alt22=2;
-                    int LA22_0 = input.LA(1);
+                    int alt23=2;
+                    int LA23_0 = input.LA(1);
 
-                    if ( (LA22_0==INT) ) {
-                        alt22=1;
+                    if ( (LA23_0==INT) ) {
+                        alt23=1;
                     }
-                    else if ( (LA22_0==VT_PAREN_CHUNK) ) {
-                        alt22=2;
+                    else if ( (LA23_0==VT_PAREN_CHUNK) ) {
+                        alt23=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("195:28: (value= INT | value= VT_PAREN_CHUNK )", 22, 0, input);
+                            new NoViableAltException("195:28: (value= INT | value= VT_PAREN_CHUNK )", 23, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt22) {
+                    switch (alt23) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:195:29: value= INT
                             {
                             value=(DroolsTree)input.LT(1);
-                            match(input,INT,FOLLOW_INT_in_rule_attribute861); 
+                            match(input,INT,FOLLOW_INT_in_rule_attribute871); 
 
                             }
                             break;
@@ -1871,7 +1897,7 @@
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:195:39: value= VT_PAREN_CHUNK
                             {
                             value=(DroolsTree)input.LT(1);
-                            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_rule_attribute865); 
+                            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_rule_attribute875); 
 
                             }
                             break;
@@ -1887,23 +1913,23 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:196:4: ^(attrName= VK_NO_LOOP (value= BOOL )? )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_NO_LOOP,FOLLOW_VK_NO_LOOP_in_rule_attribute876); 
+                    match(input,VK_NO_LOOP,FOLLOW_VK_NO_LOOP_in_rule_attribute886); 
 
                     if ( input.LA(1)==Token.DOWN ) {
                         match(input, Token.DOWN, null); 
                         // src/main/resources/org/drools/lang/DescrBuilderTree.g:196:31: (value= BOOL )?
-                        int alt23=2;
-                        int LA23_0 = input.LA(1);
+                        int alt24=2;
+                        int LA24_0 = input.LA(1);
 
-                        if ( (LA23_0==BOOL) ) {
-                            alt23=1;
+                        if ( (LA24_0==BOOL) ) {
+                            alt24=1;
                         }
-                        switch (alt23) {
+                        switch (alt24) {
                             case 1 :
                                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:196:31: value= BOOL
                                 {
                                 value=(DroolsTree)input.LT(1);
-                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute880); 
+                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute890); 
 
                                 }
                                 break;
@@ -1920,11 +1946,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:197:4: ^(attrName= VK_AGENDA_GROUP value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_AGENDA_GROUP,FOLLOW_VK_AGENDA_GROUP_in_rule_attribute892); 
+                    match(input,VK_AGENDA_GROUP,FOLLOW_VK_AGENDA_GROUP_in_rule_attribute902); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute896); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute906); 
 
                     match(input, Token.UP, null); 
 
@@ -1934,11 +1960,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:198:4: ^(attrName= VK_DURATION value= INT )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_DURATION,FOLLOW_VK_DURATION_in_rule_attribute907); 
+                    match(input,VK_DURATION,FOLLOW_VK_DURATION_in_rule_attribute917); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_rule_attribute911); 
+                    match(input,INT,FOLLOW_INT_in_rule_attribute921); 
 
                     match(input, Token.UP, null); 
 
@@ -1948,11 +1974,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:199:4: ^(attrName= VK_ACTIVATION_GROUP value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_ACTIVATION_GROUP,FOLLOW_VK_ACTIVATION_GROUP_in_rule_attribute923); 
+                    match(input,VK_ACTIVATION_GROUP,FOLLOW_VK_ACTIVATION_GROUP_in_rule_attribute933); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute927); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute937); 
 
                     match(input, Token.UP, null); 
 
@@ -1962,23 +1988,23 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:200:4: ^(attrName= VK_AUTO_FOCUS (value= BOOL )? )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_AUTO_FOCUS,FOLLOW_VK_AUTO_FOCUS_in_rule_attribute937); 
+                    match(input,VK_AUTO_FOCUS,FOLLOW_VK_AUTO_FOCUS_in_rule_attribute947); 
 
                     if ( input.LA(1)==Token.DOWN ) {
                         match(input, Token.DOWN, null); 
                         // src/main/resources/org/drools/lang/DescrBuilderTree.g:200:34: (value= BOOL )?
-                        int alt24=2;
-                        int LA24_0 = input.LA(1);
+                        int alt25=2;
+                        int LA25_0 = input.LA(1);
 
-                        if ( (LA24_0==BOOL) ) {
-                            alt24=1;
+                        if ( (LA25_0==BOOL) ) {
+                            alt25=1;
                         }
-                        switch (alt24) {
+                        switch (alt25) {
                             case 1 :
                                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:200:34: value= BOOL
                                 {
                                 value=(DroolsTree)input.LT(1);
-                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute941); 
+                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute951); 
 
                                 }
                                 break;
@@ -1995,11 +2021,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:201:4: ^(attrName= VK_DATE_EFFECTIVE value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_DATE_EFFECTIVE,FOLLOW_VK_DATE_EFFECTIVE_in_rule_attribute952); 
+                    match(input,VK_DATE_EFFECTIVE,FOLLOW_VK_DATE_EFFECTIVE_in_rule_attribute962); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute956); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute966); 
 
                     match(input, Token.UP, null); 
 
@@ -2009,11 +2035,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:202:4: ^(attrName= VK_DATE_EXPIRES value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_DATE_EXPIRES,FOLLOW_VK_DATE_EXPIRES_in_rule_attribute966); 
+                    match(input,VK_DATE_EXPIRES,FOLLOW_VK_DATE_EXPIRES_in_rule_attribute976); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute970); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute980); 
 
                     match(input, Token.UP, null); 
 
@@ -2023,31 +2049,31 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:203:4: ^(attrName= VK_ENABLED (value= BOOL | value= VT_PAREN_CHUNK ) )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_ENABLED,FOLLOW_VK_ENABLED_in_rule_attribute980); 
+                    match(input,VK_ENABLED,FOLLOW_VK_ENABLED_in_rule_attribute990); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:203:26: (value= BOOL | value= VT_PAREN_CHUNK )
-                    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;
                     }
-                    else if ( (LA25_0==VT_PAREN_CHUNK) ) {
-                        alt25=2;
+                    else if ( (LA26_0==VT_PAREN_CHUNK) ) {
+                        alt26=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("203:26: (value= BOOL | value= VT_PAREN_CHUNK )", 25, 0, input);
+                            new NoViableAltException("203:26: (value= BOOL | value= VT_PAREN_CHUNK )", 26, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt25) {
+                    switch (alt26) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:203:27: value= BOOL
                             {
                             value=(DroolsTree)input.LT(1);
-                            match(input,BOOL,FOLLOW_BOOL_in_rule_attribute985); 
+                            match(input,BOOL,FOLLOW_BOOL_in_rule_attribute995); 
 
                             }
                             break;
@@ -2055,7 +2081,7 @@
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:203:38: value= VT_PAREN_CHUNK
                             {
                             value=(DroolsTree)input.LT(1);
-                            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_rule_attribute989); 
+                            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_rule_attribute999); 
 
                             }
                             break;
@@ -2071,11 +2097,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:204:4: ^(attrName= VK_RULEFLOW_GROUP value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_RULEFLOW_GROUP,FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute1000); 
+                    match(input,VK_RULEFLOW_GROUP,FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute1010); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1004); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1014); 
 
                     match(input, Token.UP, null); 
 
@@ -2085,23 +2111,23 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:205: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_attribute1014); 
+                    match(input,VK_LOCK_ON_ACTIVE,FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1024); 
 
                     if ( input.LA(1)==Token.DOWN ) {
                         match(input, Token.DOWN, null); 
                         // src/main/resources/org/drools/lang/DescrBuilderTree.g:205:38: (value= BOOL )?
-                        int alt26=2;
-                        int LA26_0 = input.LA(1);
+                        int alt27=2;
+                        int LA27_0 = input.LA(1);
 
-                        if ( (LA26_0==BOOL) ) {
-                            alt26=1;
+                        if ( (LA27_0==BOOL) ) {
+                            alt27=1;
                         }
-                        switch (alt26) {
+                        switch (alt27) {
                             case 1 :
                                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:205:38: value= BOOL
                                 {
                                 value=(DroolsTree)input.LT(1);
-                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute1018); 
+                                match(input,BOOL,FOLLOW_BOOL_in_rule_attribute1028); 
 
                                 }
                                 break;
@@ -2118,11 +2144,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:206:4: ^(attrName= VK_DIALECT value= STRING )
                     {
                     attrName=(DroolsTree)input.LT(1);
-                    match(input,VK_DIALECT,FOLLOW_VK_DIALECT_in_rule_attribute1028); 
+                    match(input,VK_DIALECT,FOLLOW_VK_DIALECT_in_rule_attribute1038); 
 
                     match(input, Token.DOWN, null); 
                     value=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1032); 
+                    match(input,STRING,FOLLOW_STRING_in_rule_attribute1042); 
 
                     match(input, Token.UP, null); 
 
@@ -2162,26 +2188,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:213:3: ( ^( VT_AND_IMPLICIT (dt= lhs )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:213:5: ^( VT_AND_IMPLICIT (dt= lhs )* )
             {
-            match(input,VT_AND_IMPLICIT,FOLLOW_VT_AND_IMPLICIT_in_lhs_block1057); 
+            match(input,VT_AND_IMPLICIT,FOLLOW_VT_AND_IMPLICIT_in_lhs_block1067); 
 
             if ( input.LA(1)==Token.DOWN ) {
                 match(input, Token.DOWN, null); 
                 // src/main/resources/org/drools/lang/DescrBuilderTree.g:213:23: (dt= lhs )*
-                loop28:
+                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:213:24: dt= lhs
                 	    {
-                	    pushFollow(FOLLOW_lhs_in_lhs_block1062);
+                	    pushFollow(FOLLOW_lhs_in_lhs_block1072);
                 	    dt=lhs();
                 	    _fsp--;
 
@@ -2191,7 +2217,7 @@
                 	    break;
 
                 	default :
-                	    break loop28;
+                	    break loop29;
                     }
                 } while (true);
 
@@ -2240,90 +2266,90 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:219: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 alt32=10;
+            int alt33=10;
             switch ( input.LA(1) ) {
             case VT_OR_PREFIX:
                 {
-                alt32=1;
+                alt33=1;
                 }
                 break;
             case VT_OR_INFIX:
                 {
-                alt32=2;
+                alt33=2;
                 }
                 break;
             case VT_AND_PREFIX:
                 {
-                alt32=3;
+                alt33=3;
                 }
                 break;
             case VT_AND_INFIX:
                 {
-                alt32=4;
+                alt33=4;
                 }
                 break;
             case VK_EXISTS:
                 {
-                alt32=5;
+                alt33=5;
                 }
                 break;
             case VK_NOT:
                 {
-                alt32=6;
+                alt33=6;
                 }
                 break;
             case VK_EVAL:
                 {
-                alt32=7;
+                alt33=7;
                 }
                 break;
             case VK_FORALL:
                 {
-                alt32=8;
+                alt33=8;
                 }
                 break;
             case FROM:
                 {
-                alt32=9;
+                alt33=9;
                 }
                 break;
             case VT_PATTERN:
                 {
-                alt32=10;
+                alt33=10;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("216: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);
+                    new NoViableAltException("216: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 );", 33, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt32) {
+            switch (alt33) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:219:5: ^(start= VT_OR_PREFIX (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_OR_PREFIX,FOLLOW_VT_OR_PREFIX_in_lhs1088); 
+                    match(input,VT_OR_PREFIX,FOLLOW_VT_OR_PREFIX_in_lhs1098); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:219: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:219:27: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1093);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1103);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2333,12 +2359,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);
 
 
@@ -2351,14 +2377,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:221:4: ^(start= VT_OR_INFIX dt1= lhs dt2= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_OR_INFIX,FOLLOW_VT_OR_INFIX_in_lhs1109); 
+                    match(input,VT_OR_INFIX,FOLLOW_VT_OR_INFIX_in_lhs1119); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1113);
+                    pushFollow(FOLLOW_lhs_in_lhs1123);
                     dt1=lhs();
                     _fsp--;
 
-                    pushFollow(FOLLOW_lhs_in_lhs1117);
+                    pushFollow(FOLLOW_lhs_in_lhs1127);
                     dt2=lhs();
                     _fsp--;
 
@@ -2374,26 +2400,26 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:225:4: ^(start= VT_AND_PREFIX (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_AND_PREFIX,FOLLOW_VT_AND_PREFIX_in_lhs1129); 
+                    match(input,VT_AND_PREFIX,FOLLOW_VT_AND_PREFIX_in_lhs1139); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:225:26: (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:225:27: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1134);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1144);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2403,12 +2429,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);
 
 
@@ -2421,14 +2447,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:227:4: ^(start= VT_AND_INFIX dt1= lhs dt2= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VT_AND_INFIX,FOLLOW_VT_AND_INFIX_in_lhs1150); 
+                    match(input,VT_AND_INFIX,FOLLOW_VT_AND_INFIX_in_lhs1160); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1154);
+                    pushFollow(FOLLOW_lhs_in_lhs1164);
                     dt1=lhs();
                     _fsp--;
 
-                    pushFollow(FOLLOW_lhs_in_lhs1158);
+                    pushFollow(FOLLOW_lhs_in_lhs1168);
                     dt2=lhs();
                     _fsp--;
 
@@ -2444,10 +2470,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:231:4: ^(start= VK_EXISTS dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_EXISTS,FOLLOW_VK_EXISTS_in_lhs1170); 
+                    match(input,VK_EXISTS,FOLLOW_VK_EXISTS_in_lhs1180); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1174);
+                    pushFollow(FOLLOW_lhs_in_lhs1184);
                     dt=lhs();
                     _fsp--;
 
@@ -2461,10 +2487,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:233:4: ^(start= VK_NOT dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_NOT,FOLLOW_VK_NOT_in_lhs1186); 
+                    match(input,VK_NOT,FOLLOW_VK_NOT_in_lhs1196); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_lhs1190);
+                    pushFollow(FOLLOW_lhs_in_lhs1200);
                     dt=lhs();
                     _fsp--;
 
@@ -2478,11 +2504,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:235:4: ^(start= VK_EVAL pc= VT_PAREN_CHUNK )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_lhs1202); 
+                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_lhs1212); 
 
                     match(input, Token.DOWN, null); 
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_lhs1206); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_lhs1216); 
 
                     match(input, Token.UP, null); 
                     	retval.baseDescr = factory.createEval(start, pc);	
@@ -2493,26 +2519,26 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:237:4: ^(start= VK_FORALL (dt= lhs )+ )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_FORALL,FOLLOW_VK_FORALL_in_lhs1218); 
+                    match(input,VK_FORALL,FOLLOW_VK_FORALL_in_lhs1228); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:237:22: (dt= lhs )+
-                    int cnt31=0;
-                    loop31:
+                    int cnt32=0;
+                    loop32:
                     do {
-                        int alt31=2;
-                        int LA31_0 = input.LA(1);
+                        int alt32=2;
+                        int LA32_0 = input.LA(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;
+                        if ( ((LA32_0>=VT_AND_PREFIX && LA32_0<=VT_OR_INFIX)||LA32_0==VT_PATTERN||LA32_0==VK_EVAL||LA32_0==VK_NOT||(LA32_0>=VK_EXISTS && LA32_0<=VK_FORALL)||LA32_0==FROM) ) {
+                            alt32=1;
                         }
 
 
-                        switch (alt31) {
+                        switch (alt32) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:237:23: dt= lhs
                     	    {
-                    	    pushFollow(FOLLOW_lhs_in_lhs1223);
+                    	    pushFollow(FOLLOW_lhs_in_lhs1233);
                     	    dt=lhs();
                     	    _fsp--;
 
@@ -2522,12 +2548,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt31 >= 1 ) break loop31;
+                    	    if ( cnt32 >= 1 ) break loop32;
                                 EarlyExitException eee =
-                                    new EarlyExitException(31, input);
+                                    new EarlyExitException(32, input);
                                 throw eee;
                         }
-                        cnt31++;
+                        cnt32++;
                     } while (true);
 
 
@@ -2539,14 +2565,14 @@
                 case 9 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:239:4: ^( FROM pn= lhs_pattern fe= from_elements )
                     {
-                    match(input,FROM,FOLLOW_FROM_in_lhs1237); 
+                    match(input,FROM,FOLLOW_FROM_in_lhs1247); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs1241);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs1251);
                     pn=lhs_pattern();
                     _fsp--;
 
-                    pushFollow(FOLLOW_from_elements_in_lhs1245);
+                    pushFollow(FOLLOW_from_elements_in_lhs1255);
                     fe=from_elements();
                     _fsp--;
 
@@ -2559,7 +2585,7 @@
                 case 10 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:241:4: pn= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs1256);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs1266);
                     pn=lhs_pattern();
                     _fsp--;
 
@@ -2601,49 +2627,49 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:246: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 alt33=4;
+            int alt34=4;
             switch ( input.LA(1) ) {
             case ACCUMULATE:
                 {
-                alt33=1;
+                alt34=1;
                 }
                 break;
             case COLLECT:
                 {
-                alt33=2;
+                alt34=2;
                 }
                 break;
             case VK_ENTRY_POINT:
                 {
-                alt33=3;
+                alt34=3;
                 }
                 break;
             case VT_FROM_SOURCE:
                 {
-                alt33=4;
+                alt34=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("245: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);
+                    new NoViableAltException("245: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 );", 34, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt33) {
+            switch (alt34) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:246:4: ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_from_elements1277); 
+                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_from_elements1287); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_from_elements1281);
+                    pushFollow(FOLLOW_lhs_in_from_elements1291);
                     dt=lhs();
                     _fsp--;
 
                     	retval.patternSourceDescr = factory.createAccumulate(start, dt.baseDescr);	
-                    pushFollow(FOLLOW_accumulate_parts_in_from_elements1291);
+                    pushFollow(FOLLOW_accumulate_parts_in_from_elements1301);
                     ret=accumulate_parts(retval.patternSourceDescr);
                     _fsp--;
 
@@ -2657,10 +2683,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:250:4: ^(start= COLLECT dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,COLLECT,FOLLOW_COLLECT_in_from_elements1304); 
+                    match(input,COLLECT,FOLLOW_COLLECT_in_from_elements1314); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_lhs_in_from_elements1308);
+                    pushFollow(FOLLOW_lhs_in_from_elements1318);
                     dt=lhs();
                     _fsp--;
 
@@ -2674,11 +2700,11 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:252: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_elements1320); 
+                    match(input,VK_ENTRY_POINT,FOLLOW_VK_ENTRY_POINT_in_from_elements1330); 
 
                     match(input, Token.DOWN, null); 
                     entryId=(DroolsTree)input.LT(1);
-                    match(input,VT_ENTRYPOINT_ID,FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1324); 
+                    match(input,VT_ENTRYPOINT_ID,FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1334); 
 
                     match(input, Token.UP, null); 
                     	retval.patternSourceDescr = factory.createEntryPoint(start, entryId);	
@@ -2688,7 +2714,7 @@
                 case 4 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:254:4: fs= from_source_clause
                     {
-                    pushFollow(FOLLOW_from_source_clause_in_from_elements1335);
+                    pushFollow(FOLLOW_from_source_clause_in_from_elements1345);
                     fs=from_source_clause();
                     _fsp--;
 
@@ -2722,26 +2748,26 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:259:2: (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] )
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA34_0==VT_ACCUMULATE_INIT_CLAUSE) ) {
-                alt34=1;
+            if ( (LA35_0==VT_ACCUMULATE_INIT_CLAUSE) ) {
+                alt35=1;
             }
-            else if ( (LA34_0==VT_ACCUMULATE_ID_CLAUSE) ) {
-                alt34=2;
+            else if ( (LA35_0==VT_ACCUMULATE_ID_CLAUSE) ) {
+                alt35=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("258:1: accumulate_parts[PatternSourceDescr patternSourceDescr] returns [AccumulateDescr accumulateDescr] : (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] );", 34, 0, input);
+                    new NoViableAltException("258:1: accumulate_parts[PatternSourceDescr patternSourceDescr] returns [AccumulateDescr accumulateDescr] : (ac1= accumulate_init_clause[$patternSourceDescr] | ac2= accumulate_id_clause[$patternSourceDescr] );", 35, 0, input);
 
                 throw nvae;
             }
-            switch (alt34) {
+            switch (alt35) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:259:4: ac1= accumulate_init_clause[$patternSourceDescr]
                     {
-                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_parts1356);
+                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_parts1366);
                     ac1=accumulate_init_clause(patternSourceDescr);
                     _fsp--;
 
@@ -2752,7 +2778,7 @@
                 case 2 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:261:4: ac2= accumulate_id_clause[$patternSourceDescr]
                     {
-                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_parts1367);
+                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_parts1377);
                     ac2=accumulate_id_clause(patternSourceDescr);
                     _fsp--;
 
@@ -2794,36 +2820,36 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:266: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:266: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_clause1390); 
+            match(input,VT_ACCUMULATE_INIT_CLAUSE,FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1400); 
 
             match(input, Token.DOWN, null); 
             start=(DroolsTree)input.LT(1);
-            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause1399); 
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause1409); 
 
             match(input, Token.DOWN, null); 
             pc1=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1403); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1413); 
 
             match(input, Token.UP, null); 
-            match(input,VK_ACTION,FOLLOW_VK_ACTION_in_accumulate_init_clause1411); 
+            match(input,VK_ACTION,FOLLOW_VK_ACTION_in_accumulate_init_clause1421); 
 
             match(input, Token.DOWN, null); 
             pc2=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1415); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1425); 
 
             match(input, Token.UP, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:269:7: (rev= accumulate_init_reverse_clause )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA35_0==VK_REVERSE) ) {
-                alt35=1;
+            if ( (LA36_0==VK_REVERSE) ) {
+                alt36=1;
             }
-            switch (alt35) {
+            switch (alt36) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:269:7: rev= accumulate_init_reverse_clause
                     {
-                    pushFollow(FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1424);
+                    pushFollow(FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1434);
                     rev=accumulate_init_reverse_clause();
                     _fsp--;
 
@@ -2833,11 +2859,11 @@
 
             }
 
-            match(input,VK_RESULT,FOLLOW_VK_RESULT_in_accumulate_init_clause1431); 
+            match(input,VK_RESULT,FOLLOW_VK_RESULT_in_accumulate_init_clause1441); 
 
             match(input, Token.DOWN, null); 
             pc3=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1435); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1445); 
 
             match(input, Token.UP, null); 
 
@@ -2880,11 +2906,11 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:279:4: ^(vk= VK_REVERSE pc= VT_PAREN_CHUNK )
             {
             vk=(DroolsTree)input.LT(1);
-            match(input,VK_REVERSE,FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1458); 
+            match(input,VK_REVERSE,FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1468); 
 
             match(input, Token.DOWN, null); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1462); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1472); 
 
             match(input, Token.UP, null); 
             	retval.vkReverse = vk;
@@ -2916,13 +2942,13 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:285:2: ( ^( VT_ACCUMULATE_ID_CLAUSE id= ID pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:285: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_clause1484); 
+            match(input,VT_ACCUMULATE_ID_CLAUSE,FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1494); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accumulate_id_clause1488); 
+            match(input,ID,FOLLOW_ID_in_accumulate_id_clause1498); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1492); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1502); 
 
             match(input, Token.UP, null); 
             	accumulateDescr = factory.setupAccumulateId(accumulateParam, id, pc);	
@@ -2964,24 +2990,24 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:292:3: ( ^( VT_FROM_SOURCE id= ID (pc= VT_PAREN_CHUNK )? ( expression_chain )? ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:292:5: ^( VT_FROM_SOURCE id= ID (pc= VT_PAREN_CHUNK )? ( expression_chain )? )
             {
-            match(input,VT_FROM_SOURCE,FOLLOW_VT_FROM_SOURCE_in_from_source_clause1514); 
+            match(input,VT_FROM_SOURCE,FOLLOW_VT_FROM_SOURCE_in_from_source_clause1524); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_source_clause1518); 
+            match(input,ID,FOLLOW_ID_in_from_source_clause1528); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:292:30: (pc= VT_PAREN_CHUNK )?
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA36_0==VT_PAREN_CHUNK) ) {
-                alt36=1;
+            if ( (LA37_0==VT_PAREN_CHUNK) ) {
+                alt37=1;
             }
-            switch (alt36) {
+            switch (alt37) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:292:30: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1522); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1532); 
 
                     }
                     break;
@@ -2991,17 +3017,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:295:3: ( expression_chain )?
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA37_0==VT_EXPRESSION_CHAIN) ) {
-                alt37=1;
+            if ( (LA38_0==VT_EXPRESSION_CHAIN) ) {
+                alt38=1;
             }
-            switch (alt37) {
+            switch (alt38) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:295:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source_clause1531);
+                    pushFollow(FOLLOW_expression_chain_in_from_source_clause1541);
                     expression_chain();
                     _fsp--;
 
@@ -3048,24 +3074,24 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:300: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_chain1550); 
+            match(input,VT_EXPRESSION_CHAIN,FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1560); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_expression_chain1554); 
+            match(input,ID,FOLLOW_ID_in_expression_chain1564); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:300:40: (sc= VT_SQUARE_CHUNK )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA38_0==VT_SQUARE_CHUNK) ) {
-                alt38=1;
+            if ( (LA39_0==VT_SQUARE_CHUNK) ) {
+                alt39=1;
             }
-            switch (alt38) {
+            switch (alt39) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:300:40: sc= VT_SQUARE_CHUNK
                     {
                     sc=(DroolsTree)input.LT(1);
-                    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1558); 
+                    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1568); 
 
                     }
                     break;
@@ -3073,18 +3099,18 @@
             }
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:300:60: (pc= VT_PAREN_CHUNK )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA39_0==VT_PAREN_CHUNK) ) {
-                alt39=1;
+            if ( (LA40_0==VT_PAREN_CHUNK) ) {
+                alt40=1;
             }
-            switch (alt39) {
+            switch (alt40) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:300:60: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_expression_chain1563); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_expression_chain1573); 
 
                     }
                     break;
@@ -3094,17 +3120,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:303:3: ( expression_chain )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA40_0==VT_EXPRESSION_CHAIN) ) {
-                alt40=1;
+            if ( (LA41_0==VT_EXPRESSION_CHAIN) ) {
+                alt41=1;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:303:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain1571);
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain1581);
                     expression_chain();
                     _fsp--;
 
@@ -3145,27 +3171,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:307:2: ( ^( VT_PATTERN fe= fact_expression ) (oc= over_clause )? )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:307:4: ^( VT_PATTERN fe= fact_expression ) (oc= over_clause )?
             {
-            match(input,VT_PATTERN,FOLLOW_VT_PATTERN_in_lhs_pattern1589); 
+            match(input,VT_PATTERN,FOLLOW_VT_PATTERN_in_lhs_pattern1599); 
 
             match(input, Token.DOWN, null); 
-            pushFollow(FOLLOW_fact_expression_in_lhs_pattern1593);
+            pushFollow(FOLLOW_fact_expression_in_lhs_pattern1603);
             fe=fact_expression();
             _fsp--;
 
 
             match(input, Token.UP, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:307:39: (oc= over_clause )?
-            int alt41=2;
-            int LA41_0 = input.LA(1);
+            int alt42=2;
+            int LA42_0 = input.LA(1);
 
-            if ( (LA41_0==OVER) ) {
-                alt41=1;
+            if ( (LA42_0==OVER) ) {
+                alt42=1;
             }
-            switch (alt41) {
+            switch (alt42) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:307:39: oc= over_clause
                     {
-                    pushFollow(FOLLOW_over_clause_in_lhs_pattern1598);
+                    pushFollow(FOLLOW_over_clause_in_lhs_pattern1608);
                     oc=over_clause();
                     _fsp--;
 
@@ -3204,26 +3230,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:313:2: ( ^( OVER (oe= over_element )+ ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:313:4: ^( OVER (oe= over_element )+ )
             {
-            match(input,OVER,FOLLOW_OVER_in_over_clause1623); 
+            match(input,OVER,FOLLOW_OVER_in_over_clause1633); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:313:11: (oe= over_element )+
-            int cnt42=0;
-            loop42:
+            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==VT_BEHAVIOR) ) {
-                    alt42=1;
+                if ( (LA43_0==VT_BEHAVIOR) ) {
+                    alt43=1;
                 }
 
 
-                switch (alt42) {
+                switch (alt43) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:313:12: oe= over_element
             	    {
-            	    pushFollow(FOLLOW_over_element_in_over_clause1628);
+            	    pushFollow(FOLLOW_over_element_in_over_clause1638);
             	    oe=over_element();
             	    _fsp--;
 
@@ -3233,12 +3259,12 @@
             	    break;
 
             	default :
-            	    if ( cnt42 >= 1 ) break loop42;
+            	    if ( cnt43 >= 1 ) break loop43;
                         EarlyExitException eee =
-                            new EarlyExitException(42, input);
+                            new EarlyExitException(43, input);
                         throw eee;
                 }
-                cnt42++;
+                cnt43++;
             } while (true);
 
 
@@ -3270,14 +3296,14 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:317:2: ( ^( VT_BEHAVIOR ID id2= ID pc= VT_PAREN_CHUNK ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:317:4: ^( VT_BEHAVIOR ID id2= ID pc= VT_PAREN_CHUNK )
             {
-            match(input,VT_BEHAVIOR,FOLLOW_VT_BEHAVIOR_in_over_element1649); 
+            match(input,VT_BEHAVIOR,FOLLOW_VT_BEHAVIOR_in_over_element1659); 
 
             match(input, Token.DOWN, null); 
-            match(input,ID,FOLLOW_ID_in_over_element1651); 
+            match(input,ID,FOLLOW_ID_in_over_element1661); 
             id2=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_element1655); 
+            match(input,ID,FOLLOW_ID_in_over_element1665); 
             pc=(DroolsTree)input.LT(1);
-            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_over_element1659); 
+            match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_over_element1669); 
 
             match(input, Token.UP, null); 
             	behavior = factory.createBehavior(id2,pc);	
@@ -3336,182 +3362,182 @@
 
         try {
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:324: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 alt55=28;
+            int alt56=28;
             switch ( input.LA(1) ) {
             case VT_FACT:
                 {
-                alt55=1;
+                alt56=1;
                 }
                 break;
             case VT_FACT_BINDING:
                 {
-                alt55=2;
+                alt56=2;
                 }
                 break;
             case VT_FACT_OR:
                 {
-                alt55=3;
+                alt56=3;
                 }
                 break;
             case VT_FIELD:
                 {
-                alt55=4;
+                alt56=4;
                 }
                 break;
             case VT_BIND_FIELD:
                 {
-                alt55=5;
+                alt56=5;
                 }
                 break;
             case VK_EVAL:
                 {
-                alt55=6;
+                alt56=6;
                 }
                 break;
             case EQUAL:
                 {
-                alt55=7;
+                alt56=7;
                 }
                 break;
             case NOT_EQUAL:
                 {
-                alt55=8;
+                alt56=8;
                 }
                 break;
             case GREATER:
                 {
-                alt55=9;
+                alt56=9;
                 }
                 break;
             case GREATER_EQUAL:
                 {
-                alt55=10;
+                alt56=10;
                 }
                 break;
             case LESS:
                 {
-                alt55=11;
+                alt56=11;
                 }
                 break;
             case LESS_EQUAL:
                 {
-                alt55=12;
+                alt56=12;
                 }
                 break;
             case VK_CONTAINS:
                 {
-                alt55=13;
+                alt56=13;
                 }
                 break;
             case VK_EXCLUDES:
                 {
-                alt55=14;
+                alt56=14;
                 }
                 break;
             case VK_MATCHES:
                 {
-                alt55=15;
+                alt56=15;
                 }
                 break;
             case VK_SOUNDSLIKE:
                 {
-                alt55=16;
+                alt56=16;
                 }
                 break;
             case VK_MEMBEROF:
                 {
-                alt55=17;
+                alt56=17;
                 }
                 break;
             case ID:
                 {
-                alt55=18;
+                alt56=18;
                 }
                 break;
             case VK_IN:
                 {
-                alt55=19;
+                alt56=19;
                 }
                 break;
             case DOUBLE_PIPE:
                 {
-                alt55=20;
+                alt56=20;
                 }
                 break;
             case DOUBLE_AMPER:
                 {
-                alt55=21;
+                alt56=21;
                 }
                 break;
             case VT_ACCESSOR_PATH:
                 {
-                alt55=22;
+                alt56=22;
                 }
                 break;
             case STRING:
                 {
-                alt55=23;
+                alt56=23;
                 }
                 break;
             case INT:
                 {
-                alt55=24;
+                alt56=24;
                 }
                 break;
             case FLOAT:
                 {
-                alt55=25;
+                alt56=25;
                 }
                 break;
             case BOOL:
                 {
-                alt55=26;
+                alt56=26;
                 }
                 break;
             case NULL:
                 {
-                alt55=27;
+                alt56=27;
                 }
                 break;
             case VT_PAREN_CHUNK:
                 {
-                alt55=28;
+                alt56=28;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("321: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);
+                    new NoViableAltException("321: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 );", 56, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt55) {
+            switch (alt56) {
                 case 1 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:324:5: ^( VT_FACT pt= pattern_type (fe= fact_expression )* )
                     {
-                    match(input,VT_FACT,FOLLOW_VT_FACT_in_fact_expression1682); 
+                    match(input,VT_FACT,FOLLOW_VT_FACT_in_fact_expression1692); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_pattern_type_in_fact_expression1686);
+                    pushFollow(FOLLOW_pattern_type_in_fact_expression1696);
                     pt=pattern_type();
                     _fsp--;
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:324:31: (fe= fact_expression )*
-                    loop43:
+                    loop44:
                     do {
-                        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:324:32: fe= fact_expression
                     	    {
-                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression1691);
+                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression1701);
                     	    fe=fact_expression();
                     	    _fsp--;
 
@@ -3521,7 +3547,7 @@
                     	    break;
 
                     	default :
-                    	    break loop43;
+                    	    break loop44;
                         }
                     } while (true);
 
@@ -3534,12 +3560,12 @@
                 case 2 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:326:4: ^( VT_FACT_BINDING label= VT_LABEL fact= fact_expression )
                     {
-                    match(input,VT_FACT_BINDING,FOLLOW_VT_FACT_BINDING_in_fact_expression1705); 
+                    match(input,VT_FACT_BINDING,FOLLOW_VT_FACT_BINDING_in_fact_expression1715); 
 
                     match(input, Token.DOWN, null); 
                     label=(DroolsTree)input.LT(1);
-                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1709); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1713);
+                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1719); 
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1723);
                     fact=fact_expression();
                     _fsp--;
 
@@ -3553,14 +3579,14 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:328: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_expression1725); 
+                    match(input,VT_FACT_OR,FOLLOW_VT_FACT_OR_in_fact_expression1735); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1729);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1739);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1733);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1743);
                     right=fact_expression();
                     _fsp--;
 
@@ -3573,25 +3599,25 @@
                 case 4 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:331:4: ^( VT_FIELD field= field_element (fe= fact_expression )? )
                     {
-                    match(input,VT_FIELD,FOLLOW_VT_FIELD_in_fact_expression1744); 
+                    match(input,VT_FIELD,FOLLOW_VT_FIELD_in_fact_expression1754); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_field_element_in_fact_expression1748);
+                    pushFollow(FOLLOW_field_element_in_fact_expression1758);
                     field=field_element();
                     _fsp--;
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:331:37: (fe= fact_expression )?
-                    int alt44=2;
-                    int LA44_0 = input.LA(1);
+                    int alt45=2;
+                    int LA45_0 = input.LA(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;
+                    if ( (LA45_0==VT_FACT||LA45_0==VT_PAREN_CHUNK||(LA45_0>=VT_FACT_BINDING && LA45_0<=VT_ACCESSOR_PATH)||(LA45_0>=VK_EVAL && LA45_0<=VK_MEMBEROF)||LA45_0==VK_IN||LA45_0==ID||LA45_0==STRING||(LA45_0>=BOOL && LA45_0<=DOUBLE_AMPER)||(LA45_0>=EQUAL && LA45_0<=NOT_EQUAL)||(LA45_0>=FLOAT && LA45_0<=NULL)) ) {
+                        alt45=1;
                     }
-                    switch (alt44) {
+                    switch (alt45) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:331:37: fe= fact_expression
                             {
-                            pushFollow(FOLLOW_fact_expression_in_fact_expression1752);
+                            pushFollow(FOLLOW_fact_expression_in_fact_expression1762);
                             fe=fact_expression();
                             _fsp--;
 
@@ -3614,12 +3640,12 @@
                 case 5 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:337:4: ^( VT_BIND_FIELD label= VT_LABEL fe= fact_expression )
                     {
-                    match(input,VT_BIND_FIELD,FOLLOW_VT_BIND_FIELD_in_fact_expression1763); 
+                    match(input,VT_BIND_FIELD,FOLLOW_VT_BIND_FIELD_in_fact_expression1773); 
 
                     match(input, Token.DOWN, null); 
                     label=(DroolsTree)input.LT(1);
-                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1767); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1771);
+                    match(input,VT_LABEL,FOLLOW_VT_LABEL_in_fact_expression1777); 
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1781);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3632,11 +3658,11 @@
                 case 6 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:340:4: ^( VK_EVAL pc= VT_PAREN_CHUNK )
                     {
-                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_fact_expression1782); 
+                    match(input,VK_EVAL,FOLLOW_VK_EVAL_in_fact_expression1792); 
 
                     match(input, Token.DOWN, null); 
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression1786); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression1796); 
 
                     match(input, Token.UP, null); 
                     	retval.descr = factory.createPredicate(pc);	
@@ -3647,10 +3673,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:343:4: ^(op= EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,EQUAL,FOLLOW_EQUAL_in_fact_expression1799); 
+                    match(input,EQUAL,FOLLOW_EQUAL_in_fact_expression1809); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1803);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1813);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3664,10 +3690,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:345:4: ^(op= NOT_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_fact_expression1815); 
+                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_fact_expression1825); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1819);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1829);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3681,10 +3707,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:347:4: ^(op= GREATER fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,GREATER,FOLLOW_GREATER_in_fact_expression1831); 
+                    match(input,GREATER,FOLLOW_GREATER_in_fact_expression1841); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1835);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1845);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3698,10 +3724,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:349:4: ^(op= GREATER_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_fact_expression1847); 
+                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_fact_expression1857); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1851);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1861);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3715,10 +3741,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:351:4: ^(op= LESS fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,LESS,FOLLOW_LESS_in_fact_expression1863); 
+                    match(input,LESS,FOLLOW_LESS_in_fact_expression1873); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1867);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1877);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3732,10 +3758,10 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:353:4: ^(op= LESS_EQUAL fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_fact_expression1879); 
+                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_fact_expression1889); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1883);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1893);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3749,29 +3775,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:355:4: ^(op= VK_CONTAINS (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_CONTAINS,FOLLOW_VK_CONTAINS_in_fact_expression1895); 
+                    match(input,VK_CONTAINS,FOLLOW_VK_CONTAINS_in_fact_expression1905); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:355: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:355:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1899); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1909); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1904);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1914);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3785,29 +3811,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:357:4: ^(op= VK_EXCLUDES (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_EXCLUDES,FOLLOW_VK_EXCLUDES_in_fact_expression1916); 
+                    match(input,VK_EXCLUDES,FOLLOW_VK_EXCLUDES_in_fact_expression1926); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:357:24: (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:357:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1920); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1930); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1925);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1935);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3821,29 +3847,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:359:4: ^(op= VK_MATCHES (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_MATCHES,FOLLOW_VK_MATCHES_in_fact_expression1937); 
+                    match(input,VK_MATCHES,FOLLOW_VK_MATCHES_in_fact_expression1947); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:359:23: (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:359:23: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1941); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1951); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1946);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1956);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3857,29 +3883,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:361:4: ^(op= VK_SOUNDSLIKE (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_SOUNDSLIKE,FOLLOW_VK_SOUNDSLIKE_in_fact_expression1958); 
+                    match(input,VK_SOUNDSLIKE,FOLLOW_VK_SOUNDSLIKE_in_fact_expression1968); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:361:26: (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:361:26: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1962); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1972); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1967);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1977);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3893,29 +3919,29 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:363:4: ^(op= VK_MEMBEROF (not= VK_NOT )? fe= fact_expression )
                     {
                     op=(DroolsTree)input.LT(1);
-                    match(input,VK_MEMBEROF,FOLLOW_VK_MEMBEROF_in_fact_expression1979); 
+                    match(input,VK_MEMBEROF,FOLLOW_VK_MEMBEROF_in_fact_expression1989); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:363:24: (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:363:24: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1983); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression1993); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression1988);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression1998);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3929,22 +3955,22 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:365: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_expression2000); 
+                    match(input,ID,FOLLOW_ID_in_fact_expression2010); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:365:15: (not= VK_NOT )?
-                    int alt50=2;
-                    int LA50_0 = input.LA(1);
+                    int alt51=2;
+                    int LA51_0 = input.LA(1);
 
-                    if ( (LA50_0==VK_NOT) ) {
-                        alt50=1;
+                    if ( (LA51_0==VK_NOT) ) {
+                        alt51=1;
                     }
-                    switch (alt50) {
+                    switch (alt51) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:365:15: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2004); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2014); 
 
                             }
                             break;
@@ -3952,25 +3978,25 @@
                     }
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:365:29: (param= VT_SQUARE_CHUNK )?
-                    int alt51=2;
-                    int LA51_0 = input.LA(1);
+                    int alt52=2;
+                    int LA52_0 = input.LA(1);
 
-                    if ( (LA51_0==VT_SQUARE_CHUNK) ) {
-                        alt51=1;
+                    if ( (LA52_0==VT_SQUARE_CHUNK) ) {
+                        alt52=1;
                     }
-                    switch (alt51) {
+                    switch (alt52) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:365:29: param= VT_SQUARE_CHUNK
                             {
                             param=(DroolsTree)input.LT(1);
-                            match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2009); 
+                            match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2019); 
 
                             }
                             break;
 
                     }
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2014);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2024);
                     fe=fact_expression();
                     _fsp--;
 
@@ -3983,22 +4009,22 @@
                 case 19 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:368:4: ^( VK_IN (not= VK_NOT )? (fe= fact_expression )+ )
                     {
-                    match(input,VK_IN,FOLLOW_VK_IN_in_fact_expression2025); 
+                    match(input,VK_IN,FOLLOW_VK_IN_in_fact_expression2035); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:368:15: (not= VK_NOT )?
-                    int alt52=2;
-                    int LA52_0 = input.LA(1);
+                    int alt53=2;
+                    int LA53_0 = input.LA(1);
 
-                    if ( (LA52_0==VK_NOT) ) {
-                        alt52=1;
+                    if ( (LA53_0==VK_NOT) ) {
+                        alt53=1;
                     }
-                    switch (alt52) {
+                    switch (alt53) {
                         case 1 :
                             // src/main/resources/org/drools/lang/DescrBuilderTree.g:368:15: not= VK_NOT
                             {
                             not=(DroolsTree)input.LT(1);
-                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2029); 
+                            match(input,VK_NOT,FOLLOW_VK_NOT_in_fact_expression2039); 
 
                             }
                             break;
@@ -4006,22 +4032,22 @@
                     }
 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:368:24: (fe= fact_expression )+
-                    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_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;
+                        if ( (LA54_0==VT_FACT||LA54_0==VT_PAREN_CHUNK||(LA54_0>=VT_FACT_BINDING && LA54_0<=VT_ACCESSOR_PATH)||(LA54_0>=VK_EVAL && LA54_0<=VK_MEMBEROF)||LA54_0==VK_IN||LA54_0==ID||LA54_0==STRING||(LA54_0>=BOOL && LA54_0<=DOUBLE_AMPER)||(LA54_0>=EQUAL && LA54_0<=NOT_EQUAL)||(LA54_0>=FLOAT && LA54_0<=NULL)) ) {
+                            alt54=1;
                         }
 
 
-                        switch (alt53) {
+                        switch (alt54) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:368:25: fe= fact_expression
                     	    {
-                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression2035);
+                    	    pushFollow(FOLLOW_fact_expression_in_fact_expression2045);
                     	    fe=fact_expression();
                     	    _fsp--;
 
@@ -4031,12 +4057,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);
 
 
@@ -4048,14 +4074,14 @@
                 case 20 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:371:4: ^( DOUBLE_PIPE left= fact_expression right= fact_expression )
                     {
-                    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_expression2050); 
+                    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_expression2060); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2054);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2064);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2058);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2068);
                     right=fact_expression();
                     _fsp--;
 
@@ -4068,14 +4094,14 @@
                 case 21 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:373:4: ^( DOUBLE_AMPER left= fact_expression right= fact_expression )
                     {
-                    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_fact_expression2068); 
+                    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_fact_expression2078); 
 
                     match(input, Token.DOWN, null); 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2072);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2082);
                     left=fact_expression();
                     _fsp--;
 
-                    pushFollow(FOLLOW_fact_expression_in_fact_expression2076);
+                    pushFollow(FOLLOW_fact_expression_in_fact_expression2086);
                     right=fact_expression();
                     _fsp--;
 
@@ -4088,26 +4114,26 @@
                 case 22 :
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:376:4: ^( VT_ACCESSOR_PATH (ae= accessor_element )+ )
                     {
-                    match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2087); 
+                    match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2097); 
 
                     match(input, Token.DOWN, null); 
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:376:23: (ae= accessor_element )+
-                    int cnt54=0;
-                    loop54:
+                    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==VT_ACCESSOR_ELEMENT) ) {
-                            alt54=1;
+                        if ( (LA55_0==VT_ACCESSOR_ELEMENT) ) {
+                            alt55=1;
                         }
 
 
-                        switch (alt54) {
+                        switch (alt55) {
                     	case 1 :
                     	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:376:24: ae= accessor_element
                     	    {
-                    	    pushFollow(FOLLOW_accessor_element_in_fact_expression2092);
+                    	    pushFollow(FOLLOW_accessor_element_in_fact_expression2102);
                     	    ae=accessor_element();
                     	    _fsp--;
 
@@ -4117,12 +4143,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt54 >= 1 ) break loop54;
+                    	    if ( cnt55 >= 1 ) break loop55;
                                 EarlyExitException eee =
-                                    new EarlyExitException(54, input);
+                                    new EarlyExitException(55, input);
                                 throw eee;
                         }
-                        cnt54++;
+                        cnt55++;
                     } while (true);
 
 
@@ -4135,7 +4161,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:378:4: s= STRING
                     {
                     s=(DroolsTree)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_fact_expression2107); 
+                    match(input,STRING,FOLLOW_STRING_in_fact_expression2117); 
                     	retval.descr = factory.createStringLiteralRestriction(s);	
 
                     }
@@ -4144,7 +4170,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:380:4: i= INT
                     {
                     i=(DroolsTree)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_fact_expression2117); 
+                    match(input,INT,FOLLOW_INT_in_fact_expression2127); 
                     	retval.descr = factory.createIntLiteralRestriction(i);	
 
                     }
@@ -4153,7 +4179,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:382:4: f= FLOAT
                     {
                     f=(DroolsTree)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_fact_expression2127); 
+                    match(input,FLOAT,FOLLOW_FLOAT_in_fact_expression2137); 
                     	retval.descr = factory.createFloatLiteralRestriction(f);	
 
                     }
@@ -4162,7 +4188,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:384:4: b= BOOL
                     {
                     b=(DroolsTree)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_fact_expression2137); 
+                    match(input,BOOL,FOLLOW_BOOL_in_fact_expression2147); 
                     	retval.descr = factory.createBoolLiteralRestriction(b);	
 
                     }
@@ -4171,7 +4197,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:386:4: n= NULL
                     {
                     n=(DroolsTree)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_fact_expression2147); 
+                    match(input,NULL,FOLLOW_NULL_in_fact_expression2157); 
                     	retval.descr = factory.createNullLiteralRestriction(n);	
 
                     }
@@ -4180,7 +4206,7 @@
                     // src/main/resources/org/drools/lang/DescrBuilderTree.g:388:4: pc= VT_PAREN_CHUNK
                     {
                     pc=(DroolsTree)input.LT(1);
-                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression2157); 
+                    match(input,VT_PAREN_CHUNK,FOLLOW_VT_PAREN_CHUNK_in_fact_expression2167); 
                     	retval.descr = factory.createReturnValue(pc);	
 
                     }
@@ -4214,26 +4240,26 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:395:3: ( ^( VT_ACCESSOR_PATH (ae= accessor_element )+ ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:395:5: ^( VT_ACCESSOR_PATH (ae= accessor_element )+ )
             {
-            match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_field_element2179); 
+            match(input,VT_ACCESSOR_PATH,FOLLOW_VT_ACCESSOR_PATH_in_field_element2189); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:395:24: (ae= accessor_element )+
-            int cnt56=0;
-            loop56:
+            int cnt57=0;
+            loop57:
             do {
-                int alt56=2;
-                int LA56_0 = input.LA(1);
+                int alt57=2;
+                int LA57_0 = input.LA(1);
 
-                if ( (LA56_0==VT_ACCESSOR_ELEMENT) ) {
-                    alt56=1;
+                if ( (LA57_0==VT_ACCESSOR_ELEMENT) ) {
+                    alt57=1;
                 }
 
 
-                switch (alt56) {
+                switch (alt57) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:395:25: ae= accessor_element
             	    {
-            	    pushFollow(FOLLOW_accessor_element_in_field_element2184);
+            	    pushFollow(FOLLOW_accessor_element_in_field_element2194);
             	    ae=accessor_element();
             	    _fsp--;
 
@@ -4243,12 +4269,12 @@
             	    break;
 
             	default :
-            	    if ( cnt56 >= 1 ) break loop56;
+            	    if ( cnt57 >= 1 ) break loop57;
                         EarlyExitException eee =
-                            new EarlyExitException(56, input);
+                            new EarlyExitException(57, input);
                         throw eee;
                 }
-                cnt56++;
+                cnt57++;
             } while (true);
 
 
@@ -4282,28 +4308,28 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:400:2: ( ^( VT_ACCESSOR_ELEMENT id= ID (sc+= VT_SQUARE_CHUNK )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:400:4: ^( VT_ACCESSOR_ELEMENT id= ID (sc+= VT_SQUARE_CHUNK )* )
             {
-            match(input,VT_ACCESSOR_ELEMENT,FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2208); 
+            match(input,VT_ACCESSOR_ELEMENT,FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2218); 
 
             match(input, Token.DOWN, null); 
             id=(DroolsTree)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accessor_element2212); 
+            match(input,ID,FOLLOW_ID_in_accessor_element2222); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:400:34: (sc+= VT_SQUARE_CHUNK )*
-            loop57:
+            loop58:
             do {
-                int alt57=2;
-                int LA57_0 = input.LA(1);
+                int alt58=2;
+                int LA58_0 = input.LA(1);
 
-                if ( (LA57_0==VT_SQUARE_CHUNK) ) {
-                    alt57=1;
+                if ( (LA58_0==VT_SQUARE_CHUNK) ) {
+                    alt58=1;
                 }
 
 
-                switch (alt57) {
+                switch (alt58) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:400:34: sc+= VT_SQUARE_CHUNK
             	    {
             	    sc=(DroolsTree)input.LT(1);
-            	    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2216); 
+            	    match(input,VT_SQUARE_CHUNK,FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2226); 
             	    if (list_sc==null) list_sc=new ArrayList();
             	    list_sc.add(sc);
 
@@ -4312,7 +4338,7 @@
             	    break;
 
             	default :
-            	    break loop57;
+            	    break loop58;
                 }
             } while (true);
 
@@ -4348,27 +4374,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:2: ( ^( VT_PATTERN_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:4: ^( VT_PATTERN_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* )
             {
-            match(input,VT_PATTERN_TYPE,FOLLOW_VT_PATTERN_TYPE_in_pattern_type2237); 
+            match(input,VT_PATTERN_TYPE,FOLLOW_VT_PATTERN_TYPE_in_pattern_type2247); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:28: (idList+= ID )+
-            int cnt58=0;
-            loop58:
+            int cnt59=0;
+            loop59:
             do {
-                int alt58=2;
-                int LA58_0 = input.LA(1);
+                int alt59=2;
+                int LA59_0 = input.LA(1);
 
-                if ( (LA58_0==ID) ) {
-                    alt58=1;
+                if ( (LA59_0==ID) ) {
+                    alt59=1;
                 }
 
 
-                switch (alt58) {
+                switch (alt59) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:28: idList+= ID
             	    {
             	    idList=(DroolsTree)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_pattern_type2241); 
+            	    match(input,ID,FOLLOW_ID_in_pattern_type2251); 
             	    if (list_idList==null) list_idList=new ArrayList();
             	    list_idList.add(idList);
 
@@ -4377,32 +4403,32 @@
             	    break;
 
             	default :
-            	    if ( cnt58 >= 1 ) break loop58;
+            	    if ( cnt59 >= 1 ) break loop59;
                         EarlyExitException eee =
-                            new EarlyExitException(58, input);
+                            new EarlyExitException(59, input);
                         throw eee;
                 }
-                cnt58++;
+                cnt59++;
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:34: ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
-            loop59:
+            loop60:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt60=2;
+                int LA60_0 = input.LA(1);
 
-                if ( (LA59_0==LEFT_SQUARE) ) {
-                    alt59=1;
+                if ( (LA60_0==LEFT_SQUARE) ) {
+                    alt60=1;
                 }
 
 
-                switch (alt59) {
+                switch (alt60) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:405:35: LEFT_SQUARE rightList+= RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern_type2245); 
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern_type2255); 
             	    rightList=(DroolsTree)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern_type2249); 
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern_type2259); 
             	    if (list_rightList==null) list_rightList=new ArrayList();
             	    list_rightList.add(rightList);
 
@@ -4411,7 +4437,7 @@
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop60;
                 }
             } while (true);
 
@@ -4447,27 +4473,27 @@
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:2: ( ^( VT_DATA_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* ) )
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:4: ^( VT_DATA_TYPE (idList+= ID )+ ( LEFT_SQUARE rightList+= RIGHT_SQUARE )* )
             {
-            match(input,VT_DATA_TYPE,FOLLOW_VT_DATA_TYPE_in_data_type2271); 
+            match(input,VT_DATA_TYPE,FOLLOW_VT_DATA_TYPE_in_data_type2281); 
 
             match(input, Token.DOWN, null); 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:25: (idList+= ID )+
-            int cnt60=0;
-            loop60:
+            int cnt61=0;
+            loop61:
             do {
-                int alt60=2;
-                int LA60_0 = input.LA(1);
+                int alt61=2;
+                int LA61_0 = input.LA(1);
 
-                if ( (LA60_0==ID) ) {
-                    alt60=1;
+                if ( (LA61_0==ID) ) {
+                    alt61=1;
                 }
 
 
-                switch (alt60) {
+                switch (alt61) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:25: idList+= ID
             	    {
             	    idList=(DroolsTree)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_data_type2275); 
+            	    match(input,ID,FOLLOW_ID_in_data_type2285); 
             	    if (list_idList==null) list_idList=new ArrayList();
             	    list_idList.add(idList);
 
@@ -4476,32 +4502,32 @@
             	    break;
 
             	default :
-            	    if ( cnt60 >= 1 ) break loop60;
+            	    if ( cnt61 >= 1 ) break loop61;
                         EarlyExitException eee =
-                            new EarlyExitException(60, input);
+                            new EarlyExitException(61, input);
                         throw eee;
                 }
-                cnt60++;
+                cnt61++;
             } while (true);
 
             // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:31: ( LEFT_SQUARE rightList+= RIGHT_SQUARE )*
-            loop61:
+            loop62:
             do {
-                int alt61=2;
-                int LA61_0 = input.LA(1);
+                int alt62=2;
+                int LA62_0 = input.LA(1);
 
-                if ( (LA61_0==LEFT_SQUARE) ) {
-                    alt61=1;
+                if ( (LA62_0==LEFT_SQUARE) ) {
+                    alt62=1;
                 }
 
 
-                switch (alt61) {
+                switch (alt62) {
             	case 1 :
             	    // src/main/resources/org/drools/lang/DescrBuilderTree.g:410:32: LEFT_SQUARE rightList+= RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_data_type2279); 
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_data_type2289); 
             	    rightList=(DroolsTree)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_data_type2283); 
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_data_type2293); 
             	    if (list_rightList==null) list_rightList=new ArrayList();
             	    list_rightList.add(rightList);
 
@@ -4510,7 +4536,7 @@
             	    break;
 
             	default :
-            	    break loop61;
+            	    break loop62;
                 }
             } while (true);
 
@@ -4535,12 +4561,12 @@
  
 
     public static final BitSet FOLLOW_VT_COMPILATION_UNIT_in_compilation_unit49 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_package_statement_in_compilation_unit51 = new BitSet(new long[]{0xEDFFE00000000028L,0x0000000000000003L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit53 = new BitSet(new long[]{0xEDFFE00000000028L,0x0000000000000003L});
+    public static final BitSet FOLLOW_package_statement_in_compilation_unit51 = new BitSet(new long[]{0xD5FFE00000000028L,0x0000000000000007L});
+    public static final BitSet FOLLOW_statement_in_compilation_unit53 = new BitSet(new long[]{0xD5FFE00000000028L,0x0000000000000007L});
     public static final BitSet FOLLOW_VK_PACKAGE_in_package_statement71 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_package_id_in_package_statement75 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_PACKAGE_ID_in_package_id102 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_package_id106 = new BitSet(new long[]{0x0000000000000008L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_package_id106 = new BitSet(new long[]{0x0000000000000008L,0x0000000000100000L});
     public static final BitSet FOLLOW_rule_attribute_in_statement124 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_function_import_statement_in_statement134 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_import_statement_in_statement144 = new BitSet(new long[]{0x0000000000000002L});
@@ -4556,7 +4582,7 @@
     public static final BitSet FOLLOW_VK_FUNCTION_in_function_import_statement254 = new BitSet(new long[]{0x0000020000000000L});
     public static final BitSet FOLLOW_import_name_in_function_import_statement258 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_IMPORT_ID_in_import_name277 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_import_name281 = new BitSet(new long[]{0x0000000000000008L,0x0000000000280000L});
+    public static final BitSet FOLLOW_ID_in_import_name281 = new BitSet(new long[]{0x0000000000000008L,0x0000000000500000L});
     public static final BitSet FOLLOW_DOT_STAR_in_import_name286 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_GLOBAL_in_global309 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_data_type_in_global313 = new BitSet(new long[]{0x0000040000000000L});
@@ -4568,7 +4594,7 @@
     public static final BitSet FOLLOW_VT_CURLY_CHUNK_in_function356 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_TEMPLATE_in_template381 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_TEMPLATE_ID_in_template385 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_template_slot_in_template394 = new BitSet(new long[]{0x0000000000008000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_template_slot_in_template394 = new BitSet(new long[]{0x0000000000008000L,0x0000000000800000L});
     public static final BitSet FOLLOW_END_in_template402 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_SLOT_in_template_slot422 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_data_type_in_template_slot426 = new BitSet(new long[]{0x0000000000004000L});
@@ -4576,208 +4602,210 @@
     public static final BitSet FOLLOW_VK_QUERY_in_query452 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_QUERY_ID_in_query456 = new BitSet(new long[]{0x0000100000400000L});
     public static final BitSet FOLLOW_parameters_in_query460 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_lhs_block_in_query465 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_lhs_block_in_query465 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
     public static final BitSet FOLLOW_END_in_query469 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_RULE_in_rule496 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_RULE_ID_in_rule500 = new BitSet(new long[]{0x0000000000030000L,0x0000000048000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_rule509 = new BitSet(new long[]{0x0000000000030000L,0x0000000048000000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule520 = new BitSet(new long[]{0x0000000000020000L,0x0000000040000000L});
-    public static final BitSet FOLLOW_when_part_in_rule529 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_VT_RHS_CHUNK_in_rule534 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_WHEN_in_when_part553 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_lhs_block_in_when_part557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_RULE_ATTRIBUTES_in_rule_attributes579 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_ATTRIBUTES_in_rule_attributes581 = new BitSet(new long[]{0x01FFE00000000000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes587 = new BitSet(new long[]{0x01FFE00000000008L});
-    public static final BitSet FOLLOW_VT_PARAM_LIST_in_parameters611 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_param_definition_in_parameters616 = new BitSet(new long[]{0x0000004000000008L,0x0000000000080000L});
-    public static final BitSet FOLLOW_data_type_in_param_definition638 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_argument_in_param_definition643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_argument663 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument666 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument670 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_VK_DECLARE_in_type_declaration696 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration700 = new BitSet(new long[]{0x0000000000000000L,0x0000000008480000L});
-    public static final BitSet FOLLOW_decl_metadata_in_type_declaration709 = new BitSet(new long[]{0x0000000000000000L,0x0000000008480000L});
-    public static final BitSet FOLLOW_decl_field_in_type_declaration722 = new BitSet(new long[]{0x0000000000000000L,0x0000000000480000L});
-    public static final BitSet FOLLOW_END_in_type_declaration728 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_AT_in_decl_metadata753 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_decl_metadata757 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_metadata761 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_ID_in_decl_field788 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field792 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_data_type_in_decl_field797 = new BitSet(new long[]{0x0000000000000008L,0x0000000008000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_decl_field802 = new BitSet(new long[]{0x0000000000000008L,0x0000000008000000L});
-    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization829 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_field_initialization833 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_SALIENCE_in_rule_attribute856 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_INT_in_rule_attribute861 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_rule_attribute865 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_NO_LOOP_in_rule_attribute876 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute880 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_AGENDA_GROUP_in_rule_attribute892 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute896 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_DURATION_in_rule_attribute907 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_INT_in_rule_attribute911 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ACTIVATION_GROUP_in_rule_attribute923 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute927 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_AUTO_FOCUS_in_rule_attribute937 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute941 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_DATE_EFFECTIVE_in_rule_attribute952 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute956 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_DATE_EXPIRES_in_rule_attribute966 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute970 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ENABLED_in_rule_attribute980 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute985 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_rule_attribute989 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute1000 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute1004 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1014 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_BOOL_in_rule_attribute1018 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_DIALECT_in_rule_attribute1028 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_STRING_in_rule_attribute1032 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_AND_IMPLICIT_in_lhs_block1057 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs_block1062 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_OR_PREFIX_in_lhs1088 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1093 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_OR_INFIX_in_lhs1109 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1113 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
-    public static final BitSet FOLLOW_lhs_in_lhs1117 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_AND_PREFIX_in_lhs1129 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1134 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_VT_AND_INFIX_in_lhs1150 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1154 = new BitSet(new long[]{0x0000000087800000L,0x0000000800006204L});
-    public static final BitSet FOLLOW_lhs_in_lhs1158 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EXISTS_in_lhs1170 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1174 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_NOT_in_lhs1186 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1190 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EVAL_in_lhs1202 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_lhs1206 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_FORALL_in_lhs1218 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1223 = new BitSet(new long[]{0x0000000087800008L,0x0000000800006204L});
-    public static final BitSet FOLLOW_FROM_in_lhs1237 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs1241 = new BitSet(new long[]{0x0000000020000000L,0x000000A000000100L});
-    public static final BitSet FOLLOW_from_elements_in_lhs1245 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs1256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_from_elements1277 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_from_elements1281 = new BitSet(new long[]{0x0000000018000000L});
-    public static final BitSet FOLLOW_accumulate_parts_in_from_elements1291 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_COLLECT_in_from_elements1304 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_from_elements1308 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ENTRY_POINT_in_from_elements1320 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1324 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_from_source_clause_in_from_elements1335 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_parts1356 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_parts1367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1390 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause1399 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1403 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_ACTION_in_accumulate_init_clause1411 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1415 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1424 = new BitSet(new long[]{0x0000000000000000L,0x0000000000020000L});
-    public static final BitSet FOLLOW_VK_RESULT_in_accumulate_init_clause1431 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1435 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1458 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1462 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1484 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_accumulate_id_clause1488 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1492 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FROM_SOURCE_in_from_source_clause1514 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_from_source_clause1518 = new BitSet(new long[]{0x0000000040100008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1522 = new BitSet(new long[]{0x0000000040000008L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source_clause1531 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1550 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_expression_chain1554 = new BitSet(new long[]{0x0000000040180008L});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1558 = new BitSet(new long[]{0x0000000040100008L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_expression_chain1563 = new BitSet(new long[]{0x0000000040000008L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain1571 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_PATTERN_in_lhs_pattern1589 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_lhs_pattern1593 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_over_clause_in_lhs_pattern1598 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OVER_in_over_clause1623 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_over_element_in_over_clause1628 = new BitSet(new long[]{0x0000000000200008L});
-    public static final BitSet FOLLOW_VT_BEHAVIOR_in_over_element1649 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_over_element1651 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L});
-    public static final BitSet FOLLOW_ID_in_over_element1655 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_over_element1659 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FACT_in_fact_expression1682 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_pattern_type_in_fact_expression1686 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1691 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_VT_FACT_BINDING_in_fact_expression1705 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1709 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1713 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FACT_OR_in_fact_expression1725 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1729 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1733 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_FIELD_in_fact_expression1744 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_field_element_in_fact_expression1748 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1752 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_BIND_FIELD_in_fact_expression1763 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1767 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1771 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EVAL_in_fact_expression1782 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression1786 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_EQUAL_in_fact_expression1799 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1803 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_NOT_EQUAL_in_fact_expression1815 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1819 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_GREATER_in_fact_expression1831 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1835 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_GREATER_EQUAL_in_fact_expression1847 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1851 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_LESS_in_fact_expression1863 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1867 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_LESS_EQUAL_in_fact_expression1879 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1883 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_CONTAINS_in_fact_expression1895 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1899 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1904 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_EXCLUDES_in_fact_expression1916 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1920 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1925 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_MATCHES_in_fact_expression1937 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1941 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1946 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_SOUNDSLIKE_in_fact_expression1958 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1962 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1967 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_MEMBEROF_in_fact_expression1979 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1983 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1988 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_ID_in_fact_expression2000 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2004 = new BitSet(new long[]{0x0000001F00180040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2009 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2014 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_IN_in_fact_expression2025 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2029 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2035 = new BitSet(new long[]{0x0000001F00100048L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_expression2050 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2054 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2058 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_fact_expression2068 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2072 = new BitSet(new long[]{0x0000001F00100040L,0x00037E07808804FCL});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2076 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2087 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_accessor_element_in_fact_expression2092 = new BitSet(new long[]{0x0000002000000008L});
-    public static final BitSet FOLLOW_STRING_in_fact_expression2107 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_fact_expression2117 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_fact_expression2127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_fact_expression2137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_fact_expression2147 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression2157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_field_element2179 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_accessor_element_in_field_element2184 = new BitSet(new long[]{0x0000002000000008L});
-    public static final BitSet FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2208 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_accessor_element2212 = new BitSet(new long[]{0x0000000000080008L});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2216 = new BitSet(new long[]{0x0000000000080008L});
-    public static final BitSet FOLLOW_VT_PATTERN_TYPE_in_pattern_type2237 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_pattern_type2241 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern_type2245 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern_type2249 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
-    public static final BitSet FOLLOW_VT_DATA_TYPE_in_data_type2271 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_data_type2275 = new BitSet(new long[]{0x0000000000000008L,0x0004000000080000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_data_type2279 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_data_type2283 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
+    public static final BitSet FOLLOW_VT_RULE_ID_in_rule500 = new BitSet(new long[]{0x0800000000030000L,0x0000000090000000L});
+    public static final BitSet FOLLOW_VK_EXTEND_in_rule505 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_RULE_ID_in_rule509 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_decl_metadata_in_rule519 = new BitSet(new long[]{0x0000000000030000L,0x0000000090000000L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule530 = new BitSet(new long[]{0x0000000000020000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_when_part_in_rule539 = new BitSet(new long[]{0x0000000000020000L});
+    public static final BitSet FOLLOW_VT_RHS_CHUNK_in_rule544 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_WHEN_in_when_part563 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_lhs_block_in_when_part567 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_RULE_ATTRIBUTES_in_rule_attributes589 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_ATTRIBUTES_in_rule_attributes591 = new BitSet(new long[]{0x01FFE00000000000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes597 = new BitSet(new long[]{0x01FFE00000000008L});
+    public static final BitSet FOLLOW_VT_PARAM_LIST_in_parameters621 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_param_definition_in_parameters626 = new BitSet(new long[]{0x0000004000000008L,0x0000000000100000L});
+    public static final BitSet FOLLOW_data_type_in_param_definition648 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_argument_in_param_definition653 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_argument673 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument676 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument680 = new BitSet(new long[]{0x0000000000000002L,0x0008000000000000L});
+    public static final BitSet FOLLOW_VK_DECLARE_in_type_declaration706 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration710 = new BitSet(new long[]{0x0000000000000000L,0x0000000010900000L});
+    public static final BitSet FOLLOW_decl_metadata_in_type_declaration719 = new BitSet(new long[]{0x0000000000000000L,0x0000000010900000L});
+    public static final BitSet FOLLOW_decl_field_in_type_declaration732 = new BitSet(new long[]{0x0000000000000000L,0x0000000000900000L});
+    public static final BitSet FOLLOW_END_in_type_declaration738 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_AT_in_decl_metadata763 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_decl_metadata767 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_metadata771 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_ID_in_decl_field798 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field802 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_data_type_in_decl_field807 = new BitSet(new long[]{0x0000000000000008L,0x0000000010000000L});
+    public static final BitSet FOLLOW_decl_metadata_in_decl_field812 = new BitSet(new long[]{0x0000000000000008L,0x0000000010000000L});
+    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization839 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_field_initialization843 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_SALIENCE_in_rule_attribute866 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_INT_in_rule_attribute871 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_rule_attribute875 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_NO_LOOP_in_rule_attribute886 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute890 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_AGENDA_GROUP_in_rule_attribute902 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute906 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_DURATION_in_rule_attribute917 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_INT_in_rule_attribute921 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ACTIVATION_GROUP_in_rule_attribute933 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute937 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_AUTO_FOCUS_in_rule_attribute947 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute951 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_DATE_EFFECTIVE_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_DATE_EXPIRES_in_rule_attribute976 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute980 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ENABLED_in_rule_attribute990 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute995 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_rule_attribute999 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_RULEFLOW_GROUP_in_rule_attribute1010 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute1014 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_LOCK_ON_ACTIVE_in_rule_attribute1024 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_BOOL_in_rule_attribute1028 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_DIALECT_in_rule_attribute1038 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_STRING_in_rule_attribute1042 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_AND_IMPLICIT_in_lhs_block1067 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs_block1072 = new BitSet(new long[]{0x0000000087800008L,0x000000100000C408L});
+    public static final BitSet FOLLOW_VT_OR_PREFIX_in_lhs1098 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1103 = new BitSet(new long[]{0x0000000087800008L,0x000000100000C408L});
+    public static final BitSet FOLLOW_VT_OR_INFIX_in_lhs1119 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1123 = new BitSet(new long[]{0x0000000087800000L,0x000000100000C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1127 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_AND_PREFIX_in_lhs1139 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1144 = new BitSet(new long[]{0x0000000087800008L,0x000000100000C408L});
+    public static final BitSet FOLLOW_VT_AND_INFIX_in_lhs1160 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1164 = new BitSet(new long[]{0x0000000087800000L,0x000000100000C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1168 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EXISTS_in_lhs1180 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1184 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_NOT_in_lhs1196 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1200 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EVAL_in_lhs1212 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_lhs1216 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_FORALL_in_lhs1228 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_lhs1233 = new BitSet(new long[]{0x0000000087800008L,0x000000100000C408L});
+    public static final BitSet FOLLOW_FROM_in_lhs1247 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs1251 = new BitSet(new long[]{0x0000000020000000L,0x0000014000000200L});
+    public static final BitSet FOLLOW_from_elements_in_lhs1255 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs1266 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_from_elements1287 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_from_elements1291 = new BitSet(new long[]{0x0000000018000000L});
+    public static final BitSet FOLLOW_accumulate_parts_in_from_elements1301 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_COLLECT_in_from_elements1314 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_in_from_elements1318 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ENTRY_POINT_in_from_elements1330 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1334 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_from_source_clause_in_from_elements1345 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_parts1366 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_parts1377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1400 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause1409 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1413 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_ACTION_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_accumulate_init_reverse_clause_in_accumulate_init_clause1434 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_VK_RESULT_in_accumulate_init_clause1441 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1445 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1468 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1472 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_ACCUMULATE_ID_CLAUSE_in_accumulate_id_clause1494 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_accumulate_id_clause1498 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_id_clause1502 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FROM_SOURCE_in_from_source_clause1524 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_from_source_clause1528 = new BitSet(new long[]{0x0000000040100008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_from_source_clause1532 = new BitSet(new long[]{0x0000000040000008L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source_clause1541 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_EXPRESSION_CHAIN_in_expression_chain1560 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_expression_chain1564 = new BitSet(new long[]{0x0000000040180008L});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_expression_chain1568 = new BitSet(new long[]{0x0000000040100008L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_expression_chain1573 = new BitSet(new long[]{0x0000000040000008L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain1581 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_PATTERN_in_lhs_pattern1599 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_lhs_pattern1603 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_over_clause_in_lhs_pattern1608 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OVER_in_over_clause1633 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_over_element_in_over_clause1638 = new BitSet(new long[]{0x0000000000200008L});
+    public static final BitSet FOLLOW_VT_BEHAVIOR_in_over_element1659 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_over_element1661 = new BitSet(new long[]{0x0000000000000000L,0x0000000000100000L});
+    public static final BitSet FOLLOW_ID_in_over_element1665 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_over_element1669 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FACT_in_fact_expression1692 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_pattern_type_in_fact_expression1696 = new BitSet(new long[]{0x0000001F00100048L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1701 = new BitSet(new long[]{0x0000001F00100048L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_VT_FACT_BINDING_in_fact_expression1715 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1719 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1723 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FACT_OR_in_fact_expression1735 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1739 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1743 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_FIELD_in_fact_expression1754 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_field_element_in_fact_expression1758 = new BitSet(new long[]{0x0000001F00100048L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1762 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_BIND_FIELD_in_fact_expression1773 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1777 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1781 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EVAL_in_fact_expression1792 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression1796 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_EQUAL_in_fact_expression1809 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1813 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_NOT_EQUAL_in_fact_expression1825 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1829 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_GREATER_in_fact_expression1841 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1845 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_GREATER_EQUAL_in_fact_expression1857 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1861 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_LESS_in_fact_expression1873 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1877 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_LESS_EQUAL_in_fact_expression1889 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1893 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_CONTAINS_in_fact_expression1905 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1909 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1914 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_EXCLUDES_in_fact_expression1926 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1930 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1935 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_MATCHES_in_fact_expression1947 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1951 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1956 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_SOUNDSLIKE_in_fact_expression1968 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1972 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1977 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_MEMBEROF_in_fact_expression1989 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1993 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1998 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_ID_in_fact_expression2010 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2014 = new BitSet(new long[]{0x0000001F00180040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression2019 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2024 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VK_IN_in_fact_expression2035 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression2039 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2045 = new BitSet(new long[]{0x0000001F00100048L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_expression2060 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2064 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2068 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_fact_expression2078 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2082 = new BitSet(new long[]{0x0000001F00100040L,0x0006FC0F011009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2086 = new BitSet(new long[]{0x0000000000000008L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2097 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_accessor_element_in_fact_expression2102 = new BitSet(new long[]{0x0000002000000008L});
+    public static final BitSet FOLLOW_STRING_in_fact_expression2117 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_fact_expression2127 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_fact_expression2137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_fact_expression2147 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_fact_expression2157 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression2167 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_field_element2189 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_accessor_element_in_field_element2194 = new BitSet(new long[]{0x0000002000000008L});
+    public static final BitSet FOLLOW_VT_ACCESSOR_ELEMENT_in_accessor_element2218 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_accessor_element2222 = new BitSet(new long[]{0x0000000000080008L});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2226 = new BitSet(new long[]{0x0000000000080008L});
+    public static final BitSet FOLLOW_VT_PATTERN_TYPE_in_pattern_type2247 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_pattern_type2251 = new BitSet(new long[]{0x0000000000000008L,0x0008000000100000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern_type2255 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern_type2259 = new BitSet(new long[]{0x0000000000000008L,0x0008000000000000L});
+    public static final BitSet FOLLOW_VT_DATA_TYPE_in_data_type2281 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ID_in_data_type2285 = new BitSet(new long[]{0x0000000000000008L,0x0008000000100000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_data_type2289 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_data_type2293 = new BitSet(new long[]{0x0000000000000008L,0x0008000000000000L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSoftKeywords.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSoftKeywords.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSoftKeywords.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -29,6 +29,7 @@
 	public static final String ENABLED = "enabled";
 	public static final String ATTRIBUTES = "attributes";
 	public static final String RULE = "rule";
+	public static final String EXTEND = "extends";
 	public static final String TEMPLATE = "template";
 	public static final String QUERY = "query";
 	public static final String DECLARE = "declare";

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -421,11 +421,17 @@
 	 * @return RuleDescr filled
 	 * @see RuleDescr
 	 */
-	public RuleDescr createRule(DroolsTree start, DroolsTree id,
+	public RuleDescr createRule(DroolsTree start, DroolsTree id, DroolsTree parentId,
 			List<AttributeDescr> attributeList, AndDescr andDescr,
 			DroolsTree content, List<Map> metadata) {
 
 		RuleDescr ruleDescr = new RuleDescr(getCleanId(id), null);
+		
+		//Add parentId, the rule you are extending to the ruleDescr 
+		if (null != parentId){
+			ruleDescr.setParentName(getCleanId(parentId));
+		}
+		
 
 		if (null != attributeList && attributeList.size() > 0) {
 			for (AttributeDescr attributeDescr : attributeList) {

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -36,6 +36,7 @@
     private static final long    serialVersionUID = 400L;
     private String               namespace;
     private String               name;
+    private String 				 parentName;
     private String               dialect;
     private String               documentation;
     private Map<String, String>  metaAttributes;
@@ -70,6 +71,7 @@
         super.readExternal( in );
         namespace = (String) in.readObject();
         name = (String) in.readObject();
+        parentName = (String) in.readObject();
         dialect = (String) in.readObject();
         documentation = (String) in.readObject();
         consequence = in.readObject();
@@ -86,6 +88,7 @@
         super.writeExternal( out );
         out.writeObject( namespace );
         out.writeObject( name );
+        out.writeObject( parentName );
         out.writeObject( dialect );
         out.writeObject( documentation );
         out.writeObject( consequence );
@@ -240,4 +243,12 @@
         }
         return enabled;
     }
+
+	public void setParentName(String parentName) {
+		this.parentName = parentName;
+	}
+
+	public String getParentName() {
+		return parentName;
+	}
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -151,7 +151,7 @@
         Pattern pattern;
         if ( patternDescr.getIdentifier() != null && !patternDescr.getIdentifier().equals( "" ) ) {
 
-            if ( context.getDeclarationResolver().isDuplicated( patternDescr.getIdentifier() ) ) {
+            if ( context.getDeclarationResolver().isDuplicated(context.getRule(), patternDescr.getIdentifier() ) ) {
                 // This declaration already  exists, so throw an Exception
                 context.getErrors().add( new DescrBuildError( context.getParentDescr(),
                                                               patternDescr,
@@ -538,7 +538,7 @@
                        final Pattern pattern,
                        final FieldBindingDescr fieldBindingDescr) {
 
-        if ( context.getDeclarationResolver().isDuplicated( fieldBindingDescr.getIdentifier() ) ) {
+        if ( context.getDeclarationResolver().isDuplicated(context.getRule(), fieldBindingDescr.getIdentifier() ) ) {
             // This declaration already  exists, so throw an Exception
             context.getErrors().add( new DescrBuildError( context.getParentDescr(),
                                                           fieldBindingDescr,
@@ -565,7 +565,7 @@
         final Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                         predicateDescr,
                                                                                         predicateDescr.getContent(),
-                                                                                        new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                        new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
         if ( analysis == null ) {
             // something bad happened
@@ -580,7 +580,7 @@
         final List tupleDeclarations = new ArrayList();
         final List factDeclarations = new ArrayList();
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            final Declaration decl = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            final Declaration decl = context.getDeclarationResolver().getDeclaration(context.getRule(), (String) usedIdentifiers[0].get( i ) );
             if ( decl.getPattern() == pattern ) {
                 factDeclarations.add( decl );
             } else {
@@ -725,7 +725,7 @@
             return null;
         }
 
-        Declaration declaration = context.getDeclarationResolver().getDeclaration( variableRestrictionDescr.getIdentifier() );
+        Declaration declaration = context.getDeclarationResolver().getDeclaration(context.getRule(), variableRestrictionDescr.getIdentifier() );
 
         if ( declaration == null ) {
             // trying to create implicit declaration
@@ -808,7 +808,7 @@
                                                          parts[1],
                                                          (Pattern) context.getBuildStack().peek() );
             } else {
-                final Declaration decl = context.getDeclarationResolver().getDeclaration( parts[0] );
+                final Declaration decl = context.getDeclarationResolver().getDeclaration(context.getRule(), parts[0] );
                 // if a declaration exists, then it may be a variable direct property access, not an enum
                 if ( decl != null ) {
                     if ( decl.isPatternDeclaration() ) {
@@ -892,13 +892,13 @@
         Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                   returnValueRestrictionDescr,
                                                                                   returnValueRestrictionDescr.getContent(),
-                                                                                  new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                  new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
         final List[] usedIdentifiers = analysis.getBoundIdentifiers();
 
         final List tupleDeclarations = new ArrayList();
         final List factDeclarations = new ArrayList();
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            final Declaration declaration = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            final Declaration declaration = context.getDeclarationResolver().getDeclaration(context.getRule(), (String) usedIdentifiers[0].get( i ) );
             if ( declaration.getPattern() == pattern ) {
                 factDeclarations.add( declaration );
             } else {

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -84,6 +84,8 @@
             this.rule = new Rule( ruleDescr.getName() );
         }        
         this.rule.setPackage( pkg.getName() );
+        
+      
 
         // Assign attributes
         setAttributes( this.rule,
@@ -101,6 +103,7 @@
             dialect.init( ruleDescr );
         } 
         
+      
     }
 
     /**

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -45,6 +45,10 @@
     public void build(final RuleBuildContext context) {
         RuleDescr ruleDescr = context.getRuleDescr();
         
+        //Query and get object instead of using String
+        if(null != ruleDescr.getParentName() && null != context.getPkg().getRule(ruleDescr.getParentName())){
+        	context.getRule().setParent(context.getPkg().getRule(ruleDescr.getParentName()));
+        }
         context.getRule().getMetaAttributes().putAll(ruleDescr.getMetaAttributes());
         
         final RuleConditionBuilder builder = (RuleConditionBuilder) context.getDialect().getBuilder( ruleDescr.getLhs().getClass() );
@@ -83,6 +87,8 @@
             context.getDialect().getSalienceBuilder().build( context );    
         }     
         
+       
+        
         String enabledText = context.getRuleDescr().getEnabled();
         if( "true".equalsIgnoreCase( enabledText.trim() ) || "false".equalsIgnoreCase( enabledText.trim() ) ) {
             if( Boolean.parseBoolean( enabledText ) ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaAccumulateBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -82,13 +82,13 @@
             final JavaAnalysisResult analysis = (JavaAnalysisResult) context.getDialect().analyzeBlock( context,
                                                                                                         accumDescr,
                                                                                                         accumDescr.getExpression(),
-                                                                                                        new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                        new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
             final List[] usedIdentifiers = analysis.getBoundIdentifiers();
 
             final List tupleDeclarations = new ArrayList();
             for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-                tupleDeclarations.add( context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) ) );
+                tupleDeclarations.add( context.getDeclarationResolver().getDeclaration(context.getRule(), (String) usedIdentifiers[0].get( i ) ) );
             }
 
             final Declaration[] previousDeclarations = (Declaration[]) tupleDeclarations.toArray( new Declaration[tupleDeclarations.size()] );
@@ -129,15 +129,15 @@
             final JavaAnalysisResult initCodeAnalysis = (JavaAnalysisResult) context.getDialect().analyzeBlock( context,
                                                                                                                 accumDescr,
                                                                                                                 accumDescr.getInitCode(),
-                                                                                                                new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                                new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
             final Dialect.AnalysisResult actionCodeAnalysis = context.getDialect().analyzeBlock( context,
                                                                                                  accumDescr,
                                                                                                  accumDescr.getActionCode(),
-                                                                                                 new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                 new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
             final Dialect.AnalysisResult resultCodeAnalysis = context.getDialect().analyzeExpression( context,
                                                                                                       accumDescr,
                                                                                                       accumDescr.getResultCode(),
-                                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
             final Set requiredDeclarations = new HashSet( initCodeAnalysis.getBoundIdentifiers()[0] );
             requiredDeclarations.addAll( actionCodeAnalysis.getBoundIdentifiers()[0] );
@@ -151,7 +151,7 @@
                 final Dialect.AnalysisResult reverseCodeAnalysis = context.getDialect().analyzeBlock( context,
                                                                                                       accumDescr,
                                                                                                       accumDescr.getActionCode(),
-                                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
                 requiredDeclarations.addAll( reverseCodeAnalysis.getBoundIdentifiers()[0] );
                 requiredGlobals.addAll( reverseCodeAnalysis.getBoundIdentifiers()[1] );
             }
@@ -159,7 +159,7 @@
             final Declaration[] declarations = new Declaration[requiredDeclarations.size()];
             int i = 0;
             for( Iterator it = requiredDeclarations.iterator(); it.hasNext(); i++ ) {
-                declarations[i] = context.getDeclarationResolver().getDeclaration( (String) it.next() );
+                declarations[i] = context.getDeclarationResolver().getDeclaration(context.getRule(), (String) it.next() );
             }
             final Declaration[] sourceDeclArr = (Declaration[]) source.getOuterDeclarations().values().toArray( new Declaration[0] );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -30,6 +30,7 @@
 import org.drools.compiler.Dialect;
 import org.drools.lang.descr.RuleDescr;
 import org.drools.rule.Declaration;
+import org.drools.rule.Rule;
 import org.drools.rule.builder.ConsequenceBuilder;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.dialect.java.parser.JavaModifyBlockDescr;
@@ -63,7 +64,7 @@
         Dialect.AnalysisResult analysis = context.getDialect().analyzeBlock( context,
                                                                              ruleDescr,
                                                                              (String) ruleDescr.getConsequence(),
-                                                                             new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                             new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
         if ( analysis == null ) {
             // not possible to get the analysis results
@@ -81,9 +82,9 @@
         final List[] usedIdentifiers = analysis.getBoundIdentifiers();
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
-
-        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            declarations[i] = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+        
+        for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {    	
+            declarations[i] = context.getDeclarationResolver().getDeclaration(context.getRule(), (String) usedIdentifiers[0].get( i ) );
         }
 
         final Map map = createVariableContext( className,
@@ -162,7 +163,7 @@
                                                                      context.getRuleDescr(),
                                                                      mvel.getInterceptors(),
                                                                      d.getModifyExpression(),
-                                                                     new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
+                                                                     new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()},
                                                                      null );
 
             final ExecutableStatement expr = (ExecutableStatement) mvel.compile( d.getModifyExpression(),

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -26,6 +26,7 @@
 import org.drools.rule.Declaration;
 import org.drools.rule.EvalCondition;
 import org.drools.rule.Pattern;
+import org.drools.rule.Rule;
 import org.drools.rule.RuleConditionElement;
 import org.drools.rule.builder.RuleBuildContext;
 import org.drools.rule.builder.RuleConditionBuilder;
@@ -68,12 +69,13 @@
         Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                   evalDescr,
                                                                                   evalDescr.getContent(),
-                                                                                  new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                  new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
         final List[] usedIdentifiers = analysis.getBoundIdentifiers();
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
+        
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
-            declarations[i] = context.getDeclarationResolver().getDeclaration( (String) usedIdentifiers[0].get( i ) );
+            declarations[i] = context.getDeclarationResolver().getDeclaration(context.getRule(), (String) usedIdentifiers[0].get( i ) );
         }
 
         final EvalCondition eval = new EvalCondition( declarations );

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -74,7 +74,7 @@
 
             final RuleConditionBuilder builder = context.getDialect().getBuilder( accumDescr.getInput().getClass() );
 
-            Declaration[] previousDeclarations = (  Declaration[] ) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[ context.getDeclarationResolver().getDeclarations().size() ] );
+            Declaration[] previousDeclarations = (  Declaration[] ) context.getDeclarationResolver().getDeclarations(context.getRule()).values().toArray( new Declaration[ context.getDeclarationResolver().getDeclarations(context.getRule()).size() ] );
             
             // create source CE
             final RuleConditionElement source = builder.build( context,
@@ -96,7 +96,7 @@
                 final Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
                                                                                    accumDescr,
                                                                                    accumDescr.getExpression(),
-                                                                                   new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                   new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
                 //            int size = analysis.getBoundIdentifiers()[0].size();
                 //            declarations = new Declaration[size];
@@ -127,18 +127,18 @@
                 final MVELAnalysisResult initCodeAnalysis = (MVELAnalysisResult) dialect.analyzeBlock( context,
                                                                                                        accumDescr,
                                                                                                        accumDescr.getInitCode(),
-                                                                                                       new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                                       new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
                 final MVELAnalysisResult actionCodeAnalysis = (MVELAnalysisResult) dialect.analyzeBlock( context,
                                                                                                          accumDescr,
                                                                                                          null,
                                                                                                          accumDescr.getActionCode(),
-                                                                                                         new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
+                                                                                                         new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()},
                                                                                                          initCodeAnalysis.getMvelVariables() );
                 final MVELAnalysisResult resultCodeAnalysis = (MVELAnalysisResult) dialect.analyzeExpression( context,
                                                                                                               accumDescr,
                                                                                                               accumDescr.getResultCode(),
-                                                                                                              new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
+                                                                                                              new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()},
                                                                                                               initCodeAnalysis.getMvelVariables() );
 
                 Dialect.AnalysisResult reverseCodeAnalysis = null;
@@ -146,7 +146,7 @@
                     reverseCodeAnalysis = context.getDialect().analyzeBlock( context,
                                                                              accumDescr,
                                                                              accumDescr.getActionCode(),
-                                                                             new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                             new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
                 }
                     
                 MVELCompilationUnit initUnit = dialect.getMVELCompilationUnit( (String) accumDescr.getInitCode(),

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -81,10 +81,10 @@
                                                                     context.getRuleDescr(),
                                                                     dialect.getInterceptors(),
                                                                     text,
-                                                                    new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
+                                                                    new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()},
                                                                     null );
             
-            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations().size()] );
+            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations(context.getRule()).values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations(context.getRule()).size()] );
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit( text,
                                                                        analysis,
                                                                        previousDeclarations,

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -682,7 +682,7 @@
                 DeclarationScopeResolver resolver = ((RuleBuildContext) context).getDeclarationResolver();
                 for ( Iterator it = list[0].iterator(); it.hasNext(); ) {
                     String identifier = (String) it.next();
-                    Class cls = resolver.getDeclaration( identifier ).getExtractor().getExtractToClass();
+                    Class cls = resolver.getDeclaration(null, identifier ).getExtractor().getExtractToClass();
                     parserContext.addInput( identifier,
                                             cls );
                 }

Modified: 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	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,5 +1,7 @@
 package org.drools.rule.builder.dialect.mvel;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.drools.base.mvel.MVELCompilationUnit;
@@ -8,8 +10,10 @@
 import org.drools.compiler.Dialect;
 import org.drools.rule.Declaration;
 import org.drools.rule.MVELDialectRuntimeData;
+import org.drools.rule.Rule;
 import org.drools.rule.builder.EnabledBuilder;
 import org.drools.rule.builder.RuleBuildContext;
+import org.drools.spi.KnowledgeHelper;
 
 public class MVELEnabledBuilder
     implements
@@ -23,13 +27,15 @@
             // This builder is re-usable in other dialects, so specify by name            
             MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
 
+            Map<String, Declaration> declarations = context.getDeclarationResolver().getDeclarations(context.getRule());
             Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
                                                                          context.getRuleDescr(),
-                                                                         (String) context.getRuleDescr().getSalience(),
-                                                                         new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                         (String) context.getRuleDescr().getEnabled(),
+                                                                         new Set[]{declarations.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(),
+            Declaration[] previousDeclarations = (Declaration[]) declarations.values().toArray( new Declaration[declarations.size()] );
+            
+            MVELCompilationUnit unit = dialect.getMVELCompilationUnit( (String) context.getRuleDescr().getEnabled(),
                                                                        analysis,
                                                                        previousDeclarations,
                                                                        null,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -72,9 +72,9 @@
             Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                       evalDescr,
                                                                                       evalDescr.getContent(),
-                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
-            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations().size()] );
+            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations(context.getRule()).values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations(context.getRule()).size()] );
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit( (String) evalDescr.getContent(),
                                                                        analysis,
                                                                        previousDeclarations,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -67,9 +67,9 @@
             Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
                                                                          descr,
                                                                          text,
-                                                                         new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                         new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
-            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations().size()] );
+            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations(context.getRule()).values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations(context.getRule()).size()] );
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit( text,
                                                                        analysis,
                                                                        previousDeclarations,

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -54,7 +54,7 @@
             Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                       predicateDescr,
                                                                                       predicateDescr.getContent(),
-                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit((String) predicateDescr.getContent(), analysis,  previousDeclarations, localDeclarations, null, context);
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -56,7 +56,7 @@
             Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
                                                                                       returnValueRestrictionDescr,
                                                                                       returnValueRestrictionDescr.getContent(),
-                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                                      new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
     
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit((String) returnValueRestrictionDescr.getContent(), analysis,  previousDeclarations, localDeclarations, null, context);
     

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,11 +1,8 @@
 package org.drools.rule.builder.dialect.mvel;
 
-import java.io.Serializable;
 import java.util.Set;
 
-import org.drools.base.mvel.DroolsMVELFactory;
 import org.drools.base.mvel.MVELCompilationUnit;
-import org.drools.base.mvel.MVELReturnValueEvaluator;
 import org.drools.base.mvel.MVELSalienceExpression;
 import org.drools.compiler.DescrBuildError;
 import org.drools.compiler.Dialect;
@@ -29,9 +26,9 @@
             Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
                                                                          context.getRuleDescr(),
                                                                          (String) context.getRuleDescr().getSalience(),
-                                                                         new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
+                                                                         new Set[]{context.getDeclarationResolver().getDeclarations(context.getRule()).keySet(), context.getPkg().getGlobals().keySet()} );
 
-            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations().values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations().size()] );
+            Declaration[] previousDeclarations = (Declaration[]) context.getDeclarationResolver().getDeclarations(context.getRule()).values().toArray( new Declaration[context.getDeclarationResolver().getDeclarations(context.getRule()).size()] );
             MVELCompilationUnit unit = dialect.getMVELCompilationUnit( (String) context.getRuleDescr().getSalience(),
                                                                        analysis,
                                                                        previousDeclarations,

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2008-10-20 22:43:22 UTC (rev 23526)
@@ -70,6 +70,7 @@
 	VK_ENABLED;
 	VK_ATTRIBUTES;
 	VK_RULE;
+	VK_EXTEND;
 	VK_IMPORT;
 	VK_PACKAGE;
 	VK_TEMPLATE;
@@ -654,8 +655,8 @@
 	{	beginSentence(DroolsSentenceType.RULE);	}
 		rule_key rule_id 
 	{	emit(Location.LOCATION_RULE_HEADER);	}
-		decl_metadata* rule_attributes? when_part? rhs_chunk
-		-> ^(rule_key rule_id decl_metadata* rule_attributes? when_part? rhs_chunk)
+		(extend_key rule_id)? decl_metadata* rule_attributes? when_part? rhs_chunk
+		-> ^(rule_key rule_id ^(extend_key rule_id)? decl_metadata* rule_attributes? when_part? rhs_chunk)
 	;
 
 when_part
@@ -1562,6 +1563,12 @@
 		->	VK_RULE[$id]
 	;
 
+extend_key
+	:	{(validateIdentifierKey(DroolsSoftKeywords.EXTEND))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_EXTEND[$id]
+	;
+
 template_key
 	:	{(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE))}?=>  id=ID
 	{	emit($id, DroolsEditorType.KEYWORD);	}

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g	2008-10-20 22:43:22 UTC (rev 23526)
@@ -130,11 +130,11 @@
 
 rule returns [RuleDescr ruleDescr]
 @init {	List<Map> declMetadaList = new LinkedList<Map>();}
-	:	^(start=VK_RULE id=VT_RULE_ID  
+	:	^(start=VK_RULE id=VT_RULE_ID  (^(VK_EXTEND parent_id=VT_RULE_ID))?
 		(dm=decl_metadata {declMetadaList.add($dm.attData);	})*
 		 ra=rule_attributes? 
 		 wn=when_part? content=VT_RHS_CHUNK)
-	{	$ruleDescr = factory.createRule($start, $id, $ra.attrList, $wn.andDescr, $content, declMetadaList);	}
+	{	$ruleDescr = factory.createRule($start, $id, $parent_id, $ra.attrList, $wn.andDescr, $content, declMetadaList);	}
 	;
 
 when_part returns [AndDescr andDescr]

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -247,10 +247,12 @@
 
     }
     
-    public void yyytestEnabledExpression() throws Exception {
+    public void FIXME_testEnabledExpression() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_enabledExpression.drl" ) ) );
         final Package pkg = builder.getPackage();
+        
+        System.out.println(builder.getErrors().toString());
 
         RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
@@ -1071,7 +1073,73 @@
                       ((List) workingMemory.getGlobal( "list" )).get( 0 ) );
 
     }
+    
+    public void testExtends() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "extend_rule_test.drl" ) ) );
+        final Package pkg = builder.getPackage();
+        System.out.println(builder.getErrors());
 
+        RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        //ruleBase = SerializationHelper.serializeObject( ruleBase );
+        StatefulSession session = ruleBase.newStatefulSession();
+
+        //Test 2 levels of inheritance, and basic rule
+        final List list = new ArrayList();
+        session.setGlobal( "list", list );
+        final Cheese mycheese = new Cheese( "cheddar", 4);
+        FactHandle handle = session.insert( mycheese );
+        session.fireAllRules();
+        //System.out.println(((List) session.getGlobal( "list" )).toString());
+        assertEquals( "rule 2b", ((List) session.getGlobal( "list" )).get( 0 ) );
+        assertTrue(((List) session.getGlobal( "list" )).size() == 2);
+        
+        //Test 2nd level (parent) to make sure rule honors the extend rule
+        final List list2 = new ArrayList();
+        session.setGlobal( "list", list2 );
+        session.retract( handle);
+        final Cheese mycheese2 = new Cheese( "notcheddar", 4);
+        FactHandle handle2 = session.insert( mycheese2 );
+        session.fireAllRules();
+        //System.out.println(((List) session.getGlobal( "list" )).toString());
+        assertEquals( "rule 4", ((List) session.getGlobal( "list" )).get( 0 ) );
+        assertTrue(((List) session.getGlobal( "list" )).size() == 1);
+        
+        //Test 3 levels of inheritance, all levels
+        final List list3 = new ArrayList();
+        session.setGlobal( "list", list3 );
+        session.retract( handle2);
+        final Cheese mycheese3 = new Cheese( "stilton", 6);
+        FactHandle handle3 = session.insert( mycheese3 );
+        session.fireAllRules();
+        //System.out.println(((List) session.getGlobal( "list" )).toString());
+        assertEquals( "rule 3", ((List) session.getGlobal( "list" )).get( 0 ) );
+        assertTrue(((List) session.getGlobal( "list" )).size() == 1);
+        
+        //Test 3 levels of inheritance, third only
+        final List list4 = new ArrayList();
+        session.setGlobal( "list", list4 );
+        session.retract( handle3);
+        final Cheese mycheese4 = new Cheese( "notstilton", 6);
+        FactHandle handle4 = session.insert( mycheese4 );
+        session.fireAllRules();
+        //System.out.println(((List) session.getGlobal( "list" )).toString());
+        assertTrue(((List) session.getGlobal( "list" )).size() == 0);
+        
+        //Test 3 levels of inheritance, 2nd only 
+        final List list5 = new ArrayList();
+        session.setGlobal( "list", list5 );
+        session.retract( handle4);
+        final Cheese mycheese5 = new Cheese( "stilton", 7);
+        FactHandle handle5 = session.insert( mycheese5 );
+        session.fireAllRules();
+        //System.out.println(((List) session.getGlobal( "list" )).toString());
+        assertTrue(((List) session.getGlobal( "list" )).size() == 0);
+        
+
+    }
+    
     public void testLiteral() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "literal_rule_test.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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -3001,12 +3001,25 @@
 //		@fooAttribute(barValue)
 //		@fooAtt2(barVal2)
 		RuleDescr rule = pack.getRules().get(0);
-		assertTrue(rule.getMetaAttributes().containsKey("fooAttribute"));
-		assertEquals("barValue",rule.getMetaAttribute("fooAttribute"));
-		assertTrue(rule.getMetaAttributes().containsKey("fooAtt2"));
-		assertEquals("barVal2",rule.getMetaAttribute("fooAtt2"));
+		assertTrue(rule.getMetaAttributes().containsKey("fooMeta1"));
+		assertEquals("barVal1",rule.getMetaAttribute("fooMeta1"));
+		assertTrue(rule.getMetaAttributes().containsKey("fooMeta2"));
+		assertEquals("barVal2",rule.getMetaAttribute("fooMeta2"));
 	}
+	
+	public void testRuleExtends() throws Exception {
+		parseResource("compilation_unit", "compilation_unit",
+				"Rule_with_Extends.drl");
+		final PackageDescr pack = walker.getPackageDescr();
+//		@fooAttribute(barValue)
+//		@fooAtt2(barVal2)
+		RuleDescr rule = pack.getRules().get(0);
+		assertTrue(rule.getParentName() != null);
+		assertEquals("rule1",rule.getParentName());
 
+	}
+	
+
 	public void testTypeDeclarationWithFields() throws Exception {
 		parseResource("compilation_unit", "compilation_unit",
 				"declare_type_with_fields.drl");

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedDeclarationScopeResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedDeclarationScopeResolver.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedDeclarationScopeResolver.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import org.drools.rule.Declaration;
+import org.drools.rule.Rule;
 import org.drools.spi.DeclarationScopeResolver;
 
 public class InstrumentedDeclarationScopeResolver extends DeclarationScopeResolver {
@@ -19,11 +20,13 @@
         this.declarations = map;
     }
 
-    public Map getDeclarations() {
+    @Override
+    public Map getDeclarations( Rule rule ) {
         return this.declarations;
     }
     
-    public Declaration getDeclaration(final String name) {
+    @Override
+    public Declaration getDeclaration( Rule rule, String name) {
         return ( Declaration ) this.declarations.get( name );
     }
 }
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/extend_rule_test.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/extend_rule_test.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/extend_rule_test.drl	2008-10-20 22:43:22 UTC (rev 23526)
@@ -0,0 +1,72 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+import org.drools.Cheesery
+
+global java.util.List list;
+global Cheesery cheesery;
+
+rule "test rule 1"
+    enabled false
+    when
+        c: Cheese( type == "stilton" )
+    then
+		list.add( new String ("rule 1") );        
+end 
+
+rule "test rule 2" extends "test rule 1"
+    enabled false
+    when
+        Cheese( price <= 6.00) from c
+    then
+		list.add( new String ("rule 2") );       
+end 
+
+rule "test rule 3" extends "test rule 2"
+    when
+        Cheese( price > 1.00 ) from c
+    then
+		list.add( new String ("rule 3") );         
+end 
+
+rule "test rule 1b"
+    enabled false
+    when
+        c: Cheese( type == "cheddar" )
+    then
+		list.add( new String ("rule 1b") );        
+end 
+
+rule "test rule 2b" extends "test rule 1b"
+    
+    when
+
+        Cheese( price < 5.00) from return ([c])
+    then
+		list.add( new String ("rule 2b") );       
+end 
+
+   
+
+rule "test rule 4" 
+
+    when
+        Cheese( price > 1.00 , price < 6.00) 
+    then
+		list.add( new String ("rule 4") );         
+end 
+
+rule "test rule 5" 
+	
+    when
+        Cheese( type == "stilton" )
+    then
+	       
+end  
+
+rule "test rule 6" extends "test rule 5"
+    when
+        Cheese( type == "stilton" )
+    then
+		      
+end  
\ No newline at end of file

Modified: 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	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl	2008-10-20 22:43:22 UTC (rev 23526)
@@ -3,9 +3,9 @@
 global java.util.List results;
 
 rule "Test enabled expression 1"
+	@ruleID(1234)
     #arbitrary expression using a rule metadata
-    enabled ( "1234".equals( drools.getRule().getMetaAttribute("ruleID") ) )
-	@ruleID(1234)
+    enabled ( "1234".equals( this.getMetaAttribute("ruleID") ) )
   when
     Person(name == "Michael")
   then
@@ -13,9 +13,9 @@
 end
 
 rule "Test enabled expression 2"
+	@ruleID(1234)
     # using bound variables 
     enabled ( "Michael".equals( $name ) )
-	@ruleID(1234)
   when
     Person( $name : name )
   then
@@ -23,9 +23,9 @@
 end
 
 rule "Test enabled expression 3"
+	@ruleID(1234)
     # using simple expressions 
     enabled ( 1 + 1 == 2 )
-	@ruleID(1234)
   when
     Person( $name : name )
   then
@@ -33,9 +33,9 @@
 end
 
 rule "Test enabled expression 4"
+	@ruleID(1234)
     # using a false expression 
     enabled ( 1 + 1 == 5 )
-	@ruleID(1234)
   when
     Person( $name : name )
   then

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Extends.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Extends.drl	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Extends.drl	2008-10-20 22:43:22 UTC (rev 23526)
@@ -0,0 +1,8 @@
+package org.drools;
+
+rule test_rule extends rule1	
+	when
+		foo()
+	then
+		
+end

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Metadata.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Metadata.drl	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/Rule_with_Metadata.drl	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,8 +1,9 @@
+
 package org.drools;
 
 rule test_rule
-	@fooAttribute(barValue)
-	@fooAtt2(barVal2)
+	@fooMeta1(barVal1)
+	@fooMeta2(barVal2)
 	when
 		foo()
 	then

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -33,6 +33,8 @@
     
     private Serializable      expr;
     private DroolsMVELFactory prototype;
+    
+    private transient Declaration[] requiredDeclarations;
 
     public MVELDataProvider() {
 
@@ -61,11 +63,12 @@
     public void compile(ClassLoader classLoader) {
         expr = unit.getCompiledExpression( classLoader );
         prototype = unit.getFactory( );
+        this.requiredDeclarations = (Declaration[]) this.unit.getFactory().getPreviousDeclarations().values().toArray(new Declaration[this.unit.getFactory().getPreviousDeclarations().size()]);
     }   
     
     public Declaration[] getRequiredDeclarations() {
-        return new Declaration[]{};
-        //return factory.getRequiredDeclarations();
+        //return new Declaration[]{};
+        return this.requiredDeclarations;
     }
 
     public Object createContext() {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -7,9 +7,11 @@
 import java.io.Serializable;
 
 import org.drools.WorkingMemory;
+import org.drools.base.DefaultKnowledgeHelper;
 import org.drools.rule.MVELDialectRuntimeData;
 import org.drools.rule.Package;
 import org.drools.spi.Enabled;
+import org.drools.spi.KnowledgeHelper;
 import org.drools.spi.Tuple;
 import org.mvel.MVEL;
 
@@ -56,9 +58,10 @@
                             final WorkingMemory workingMemory) {
         // it must be cloned for multi-thread safety
         DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
+        KnowledgeHelper knowledgeHelper = new DefaultKnowledgeHelper(workingMemory);
         factory.setContext( tuple,
+        		            knowledgeHelper,
                             null,
-                            null,
                             workingMemory,
                             null );
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -576,12 +576,13 @@
         //Map<LeftTuple, Integer> tuples = context.terminalTupleMap;
         if ( entries.length != 0 ) {
             for ( Entry<LeftTuple, Integer> entry : entries ) {
-                LeftTuple leftTuple = entry.getKey();
-                stream.writeShort( PersisterEnums.ACTIVATION );
-                writeActivation( context,
-                                 leftTuple,
-                                 (AgendaItem) leftTuple.getActivation(),
-                                 (RuleTerminalNode) leftTuple.getLeftTupleSink() );
+                if (entry.getKey().getActivation() != null) {
+					LeftTuple leftTuple = entry.getKey();
+					stream.writeShort(PersisterEnums.ACTIVATION);
+					writeActivation(context, leftTuple, (AgendaItem) leftTuple
+							.getActivation(), (RuleTerminalNode) leftTuple
+							.getLeftTupleSink());
+				}
             }
         }
         stream.writeShort( PersisterEnums.END );
@@ -655,14 +656,15 @@
             Map<Long, PropagationContext> pcMap = new HashMap<Long, PropagationContext>();
             for ( Entry<LeftTuple, Integer> entry : entries ) {
                 LeftTuple leftTuple = entry.getKey();
-                PropagationContext pc = leftTuple.getActivation().getPropagationContext();
-                if ( !pcMap.containsKey( pc.getPropagationNumber() ) ) {
-                    stream.writeShort( PersisterEnums.PROPAGATION_CONTEXT );
-                    writePropagationContext( context,
-                                             pc );
-                    pcMap.put( pc.getPropagationNumber(),
-                               pc );
-                }
+                if (leftTuple.getActivation() != null) {
+					PropagationContext pc = leftTuple.getActivation()
+							.getPropagationContext();
+					if (!pcMap.containsKey(pc.getPropagationNumber())) {
+						stream.writeShort(PersisterEnums.PROPAGATION_CONTEXT);
+						writePropagationContext(context, pc);
+						pcMap.put(pc.getPropagationNumber(), pc);
+					}
+				}
             }
         }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -74,8 +74,10 @@
                                     method );
     }
 
-    public GroupElement[] transform(final GroupElement and) throws InvalidPatternException {
-        final GroupElement cloned = (GroupElement) and.clone();
+    public GroupElement[] transform(final GroupElement cloned) throws InvalidPatternException {
+        //moved cloned to up
+    	//final GroupElement cloned = (GroupElement) and.clone();
+        
 
         processTree( cloned );
         cloned.pack();
@@ -156,7 +158,7 @@
                 Constraint constraint = (Constraint) next;
                 Declaration[] decl = constraint.getRequiredDeclarations();
                 for ( int i = 0; i < decl.length; i++ ) {
-                    Declaration resolved = resolver.getDeclaration( decl[i].getIdentifier() );
+                    Declaration resolved = resolver.getDeclaration(null, decl[i].getIdentifier() );
                     if ( resolved != null && resolved != decl[i] ) {
                         constraint.replaceDeclaration( decl[i],
                                                        resolved );
@@ -176,7 +178,7 @@
         } else if ( element instanceof EvalCondition ) {
             Declaration[] decl = ((EvalCondition) element).getRequiredDeclarations();
             for ( int i = 0; i < decl.length; i++ ) {
-                Declaration resolved = resolver.getDeclaration( decl[i].getIdentifier() );
+                Declaration resolved = resolver.getDeclaration(null, decl[i].getIdentifier() );
                 if ( resolved != null && resolved != decl[i] ) {
                     ((EvalCondition) element).replaceDeclaration( decl[i],
                                                                   resolved );
@@ -310,7 +312,7 @@
                 // create the actual permutations
                 int mod = 1;
                 for ( int j = ors.length - 1; j >= 0; j-- ) {
-                    // we must insert at the beggining to keep the order
+                    // we must insert at the beginning to keep the order
                     and.getChildren().add( 0,
                                            ors[j].getChildren().get( indexes[j] ) );
                     if ( (i % mod) == 0 ) {

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-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,7 +29,6 @@
 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;
@@ -69,6 +69,9 @@
 
     /** Name of the rule. */
     private String      name;
+    
+    /** Parent Rule Name, optional */
+    private Rule 			parent;
 
     /** Salience value. */
     private Salience               salience;
@@ -121,6 +124,7 @@
     public void writeExternal(ObjectOutput out) throws IOException {
         out.writeObject(pkg);
         out.writeObject(name);
+        out.writeObject(parent);
         out.writeObject(salience);
         out.writeBoolean(dirty);
         out.writeObject(declarations);
@@ -152,6 +156,7 @@
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         pkg = (String)in.readObject();
         name = (String)in.readObject();
+        parent = (Rule)in.readObject();
         salience = (Salience)in.readObject();
         dirty = in.readBoolean();
         declarations    = (Map)in.readObject();
@@ -200,6 +205,7 @@
         this.enabled = EnabledBoolean.ENABLED_TRUE;
         this.salience = SalienceInteger.DEFAULT_SALIENCE;
         this.metaAttributes = new HashMap<String,String>();
+     
     }
 
     /**
@@ -486,7 +492,23 @@
         this.dirty = true;
         this.lhsRoot = lhsRoot;
     }
-
+    private GroupElement getExtendedLhs(Rule rule, GroupElement fromChild){
+    	//combine rules LHS with Parent "Extends"
+    	final GroupElement lhs = (GroupElement) rule.lhsRoot.clone();
+    	//use the children passed from prior child rules, and combine with current LHS (at the end)
+    	if(null != fromChild){
+			//Have GroupElement from a child rule, so combine it
+			lhs.getChildren().addAll(fromChild.getChildren());
+		}
+    	//move recursively up the tree
+    	if(rule.parent != null){
+    		return getExtendedLhs(rule.parent, lhs);
+    	}
+    	//at the top of the tree, return combined LHS
+    	//TODO Merge LHS for performace
+    	
+    	return lhs;	
+    }
     /**
      * Uses the LogicTransformer to process the Rule patters - if no ORs are
      * used this will return an array of a single AND element. If there are Ors
@@ -498,7 +520,8 @@
      * @throws InvalidPatternException
      */
     public GroupElement[] getTransformedLhs() throws InvalidPatternException {
-        return LogicTransformer.getInstance().transform( this.lhsRoot );
+    	//Moved to getExtendedLhs --final GroupElement cloned = (GroupElement) this.lhsRoot.clone();
+    	return LogicTransformer.getInstance().transform( getExtendedLhs(this, null) );
     }
 
     public int getSpecifity() {
@@ -532,6 +555,8 @@
     public void wire(Object object) {
         if ( object instanceof Salience ) {
             setSalience( (Salience ) object );
+        } else if( object instanceof Enabled ) {
+        	setEnabled(( Enabled) object);
         } else {
             setConsequence( (Consequence) object );
         }
@@ -650,4 +675,10 @@
     public String getMetaAttribute(final String identifier) {
         return (String) this.metaAttributes.get( identifier );
     }
+	public void setParent(Rule parent) {
+		this.parent = parent;
+	}
+	public Rule getParent() {
+		return parent;
+	}
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java	2008-10-20 22:32:35 UTC (rev 23525)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/DeclarationScopeResolver.java	2008-10-20 22:43:22 UTC (rev 23526)
@@ -1,16 +1,16 @@
 package org.drools.spi;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
 import org.drools.base.ClassObjectType;
-import org.drools.rule.Pattern;
 import org.drools.rule.Declaration;
 import org.drools.rule.GroupElement;
+import org.drools.rule.Package;
+import org.drools.rule.Pattern;
+import org.drools.rule.Rule;
 import org.drools.rule.RuleConditionElement;
-import org.drools.rule.Package;
 
 /**
  * A class capable of resolving a declaration in the current build context
@@ -62,8 +62,26 @@
     //      }
     //      return null;
     //  }
-
-    public Declaration getDeclaration(final String identifier) {
+    private Declaration getExtendedDeclaration(Rule rule, String identifier){
+    	if(rule.getLhs().getInnerDeclarations().containsKey(identifier)){
+    		return (Declaration)rule.getLhs().getInnerDeclarations().get(identifier);
+    	}else if(null != rule.getParent()){
+    		return getExtendedDeclaration(rule.getParent(), identifier);
+    	}
+    	return null;
+    	
+    }
+    private HashMap getAllExtendedDeclaration(Rule rule, HashMap dec){
+    	//declarations.putAll( ((RuleConditionElement) this.buildStack.get( i )).getInnerDeclarations() );
+    	dec.putAll( ((RuleConditionElement)rule.getLhs()).getInnerDeclarations() );
+    	if(null != rule.getParent()){
+    		return getAllExtendedDeclaration(rule.getParent(), dec);
+    	}
+    	return dec;
+    	
+    }
+    
+    public Declaration getDeclaration(final Rule rule, final String identifier) {
         // it may be a local bound variable
         for ( int i = this.buildStack.size() - 1; i >= 0; i-- ) {
             final Declaration declaration = (Declaration) ((RuleConditionElement) this.buildStack.get( i )).getInnerDeclarations().get( identifier );
@@ -71,6 +89,17 @@
                 return declaration;
             }
         }
+        // look at parent rules
+        if(rule != null && rule.getParent() != null){
+        	// recursive algorithm for each parent
+            //     -> lhs.getInnerDeclarations()
+        	Declaration parentDeclaration = getExtendedDeclaration(rule.getParent(), identifier);
+        	if(null != parentDeclaration){
+        		return parentDeclaration;
+        	}
+        }
+        
+        
         // it may be a global or something
         for ( int i = 0, length = this.maps.length; i < length; i++ ) {
             if ( this.maps[i].containsKey( (identifier) ) ) {
@@ -103,7 +132,7 @@
         return null;
     }
 
-    public boolean available(final String name) {
+    public boolean available(Rule rule, final String name) {
         for ( int i = this.buildStack.size() - 1; i >= 0; i-- ) {
             final Declaration declaration = (Declaration) ((RuleConditionElement) this.buildStack.get( i )).getInnerDeclarations().get( name );
             if ( declaration != null ) {
@@ -115,10 +144,19 @@
                 return true;
             }
         }
+        // look at parent rules
+        if(rule != null && rule.getParent() != null){
+        	// recursive algorithm for each parent
+            //     -> lhs.getInnerDeclarations()
+        	Declaration parentDeclaration = getExtendedDeclaration(rule.getParent(), name);
+        	if(null != parentDeclaration){
+        		return true;
+        	}
+        }
         return false;
     }
 
-    public boolean isDuplicated(final String name) {
+    public boolean isDuplicated(Rule rule, final String name) {
         for ( int i = 0, length = this.maps.length; i < length; i++ ) {
             if ( this.maps[i].containsKey( (name) ) ) {
                 return true;
@@ -136,6 +174,15 @@
                 return true;
             }
         }
+        // look at parent rules
+        if(rule != null && rule.getParent() != null){
+        	// recursive algorithm for each parent
+            //     -> lhs.getInnerDeclarations()
+        	Declaration parentDeclaration = getExtendedDeclaration(rule.getParent(), name);
+        	if(null != parentDeclaration){
+        		return true;
+        	}
+        }
         return false;
     }
 
@@ -145,13 +192,16 @@
      * 
      * @return
      */
-    public Map getDeclarations() {
+    public Map getDeclarations(Rule rule) {
         final Map declarations = new HashMap();
         for ( int i = 0; i < this.buildStack.size(); i++ ) {
             // this may be optimized in the future to only re-add elements at 
             // scope breaks, like "NOT" and "EXISTS"
             declarations.putAll( ((RuleConditionElement) this.buildStack.get( i )).getInnerDeclarations() );
         }
+        if(null != rule.getParent()){
+        	return getAllExtendedDeclaration(rule.getParent(), (HashMap)declarations);
+        }
         return declarations;
     }
 




More information about the jboss-svn-commits mailing list