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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Aug 21 15:48:04 EDT 2008


Author: porcelli
Date: 2008-08-21 15:48:02 -0400 (Thu, 21 Aug 2008)
New Revision: 21668

Added:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentence.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentenceType.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsEditorType.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.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/DroolsToken.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTree.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.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/main/resources/org/drools/lang/Tree2TestDRL.g
Log:
JBRULES-1689: added support to IDE integration

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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-08-04 21:40:31
+// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-08-21 09:26:03
 
 	package org.drools.lang;
 
@@ -10,132 +10,132 @@
 import java.util.Map;
 import java.util.HashMap;
 public class DRLLexer extends Lexer {
-    public static final int COMMA=94;
+    public static final int COMMA=88;
     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=65;
-    public static final int END=91;
+    public static final int VK_FUNCTION=64;
+    public static final int END=85;
     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 VK_ACCUMULATE=81;
     public static final int MISC=119;
     public static final int VT_AND_PREFIX=23;
-    public static final int VK_QUERY=63;
+    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=89;
-    public static final int VK_IMPORT=60;
+    public static final int DOT=83;
+    public static final int VK_IMPORT=59;
     public static final int VT_SLOT=15;
     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=69;
+    public static final int VK_MATCHES=68;
     public static final int VT_FACT=6;
     public static final int LEFT_CURLY=117;
-    public static final int AT=96;
-    public static final int LEFT_PAREN=93;
-    public static final int DOUBLE_AMPER=102;
+    public static final int AT=90;
+    public static final int LEFT_PAREN=87;
+    public static final int DOUBLE_AMPER=97;
     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=93;
     public static final int VT_ENTRYPOINT_ID=13;
-    public static final int VK_SOUNDSLIKE=71;
+    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=103;
-    public static final int VK_AND=77;
-    public static final int STRING=92;
+    public static final int OVER=99;
+    public static final int STRING=86;
+    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=66;
-    public static final int VK_REVERSE=84;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
     public static final int VT_BEHAVIOR=21;
     public static final int GRAVE_ACCENT=111;
     public static final int VK_DURATION=53;
     public static final int VT_SQUARE_CHUNK=19;
-    public static final int VK_FORALL=79;
+    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=98;
-    public static final int VK_RESULT=85;
+    public static final int EQUALS=92;
     public static final int UnicodeEscape=124;
-    public static final int VK_PACKAGE=61;
+    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=87;
-    public static final int VK_TEMPLATE=62;
+    public static final int SEMICOLON=81;
+    public static final int VK_TEMPLATE=61;
     public static final int VT_AND_IMPLICIT=22;
     public static final int NULL=113;
-    public static final int COLON=97;
+    public static final int COLON=91;
     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=74;
+    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=101;
     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=101;
+    public static final int DOUBLE_PIPE=96;
     public static final int LESS=108;
     public static final int VT_TYPE_DECLARE_ID=11;
     public static final int VT_PATTERN=31;
     public static final int VK_DATE_EFFECTIVE=45;
     public static final int EscapeSequence=122;
-    public static final int VK_EXISTS=78;
-    public static final int INT=100;
+    public static final int VK_EXISTS=77;
+    public static final int INT=95;
     public static final int VT_BIND_FIELD=34;
-    public static final int VK_RULE=59;
-    public static final int VK_EVAL=67;
-    public static final int VK_COLLECT=86;
+    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=88;
+    public static final int RESULT=102;
+    public static final int ID=82;
+    public static final int FROM=98;
     public static final int NOT_EQUAL=110;
     public static final int RIGHT_CURLY=118;
-    public static final int VK_ENTRY_POINT=73;
+    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=99;
+    public static final int BOOL=94;
     public static final int VT_FROM_SOURCE=29;
-    public static final int VK_CONTAINS=68;
+    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=75;
+    public static final int VK_IN=74;
     public static final int VT_RHS_CHUNK=17;
-    public static final int VK_MEMBEROF=72;
+    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=90;
-    public static final int VK_OR=76;
+    public static final int DOT_STAR=84;
+    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 VK_WHEN=58;
+    public static final int ACCUMULATE=100;
     public static final int VK_RULEFLOW_GROUP=52;
     public static final int VT_FUNCTION_ID=43;
     public static final int EOF=-1;
     public static final int VT_CONSTRAINTS=7;
     public static final int VT_IMPORT_ID=41;
     public static final int EOL=120;
-    public static final int VK_INIT=82;
     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=83;
-    public static final int VK_FROM=80;
-    public static final int VK_EXCLUDES=70;
-    public static final int RIGHT_PAREN=95;
+    public static final int VK_ACTION=79;
+    public static final int VK_EXCLUDES=69;
+    public static final int RIGHT_PAREN=89;
     public static final int VT_TEMPLATE_ID=10;
-    public static final int VK_DECLARE=64;
+    public static final int VK_DECLARE=63;
     public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
 
     	/** The standard method called to automatically emit a token at the
@@ -156,7 +156,7 @@
     public DRLLexer() {;} 
     public DRLLexer(CharStream input) {
         super(input);
-        ruleMemo = new HashMap[44+1];
+        ruleMemo = new HashMap[50+1];
      }
     public String getGrammarFileName() { return "/Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
@@ -164,10 +164,10 @@
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:17: ( ' ' | '\\t' | '\\f' | EOL )+
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -199,28 +199,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:19: ' '
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1106:19: '\\t'
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1107:19: '\\f'
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1539:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:19: EOL
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1540:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -253,10 +253,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1115:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1546:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1547:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1115:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1547:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -275,13 +275,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1115:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1547:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1115:14: ( '\\r\\n' )=> '\\r\\n'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1547:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -289,14 +289,14 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1116:25: '\\r'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1548:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1117:25: '\\n'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1549:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -318,10 +318,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:2: ( ( '-' )? ( '0' .. '9' )+ )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:4: ( '-' )? ( '0' .. '9' )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:2: ( ( '-' )? ( '0' .. '9' )+ )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:4: ( '-' )? ( '0' .. '9' )+
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:4: ( '-' )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -330,7 +330,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:5: '-'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -339,7 +339,7 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:10: ( '0' .. '9' )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -353,7 +353,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:11: '0' .. '9'
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1554:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -384,10 +384,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:4: ( '-' )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -396,7 +396,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:5: '-'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -405,7 +405,7 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:10: ( '0' .. '9' )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -419,7 +419,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:11: '0' .. '9'
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -437,7 +437,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:26: ( '0' .. '9' )+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -451,7 +451,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1126:27: '0' .. '9'
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -482,7 +482,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -495,19 +495,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1129:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1561:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -523,14 +523,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:15: EscapeSequence
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1130:32: ~ ( '\\\\' | '\"' )
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -560,13 +560,13 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -582,14 +582,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:16: EscapeSequence
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1131:33: ~ ( '\\\\' | '\\'' )
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -630,8 +630,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567: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();
@@ -656,7 +656,7 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1139: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 )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571: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);
 
@@ -728,7 +728,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1137: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("1569: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;
                 }
@@ -737,13 +737,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1137: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("1569: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 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1139: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' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571: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)<='}') ) {
@@ -761,14 +761,14 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1143:9: UnicodeEscape
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1575:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1144:9: OctalEscape
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1576:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -785,7 +785,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -819,7 +819,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1147:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1579:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -827,31 +827,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1147:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1579:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
 
                 throw nvae;
             }
             switch (alt12) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:14: ( '0' .. '3' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:15: '0' .. '3'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:14: ( '0' .. '3' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:25: ( '0' .. '7' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:26: '0' .. '7'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:25: ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:36: ( '0' .. '7' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1149:37: '0' .. '7'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:36: ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1581:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -861,18 +861,18 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1582:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:14: ( '0' .. '7' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:15: '0' .. '7'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1582:14: ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1582:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:25: ( '0' .. '7' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:26: '0' .. '7'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1582:25: ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1582:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -882,11 +882,11 @@
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1151:9: '\\\\' ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1583:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1151:14: ( '0' .. '7' )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1151:15: '0' .. '7'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1583:14: ( '0' .. '7' )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1583:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -906,8 +906,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1156:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1156:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1588:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1588:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -928,10 +928,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:2: ( ( 'true' | 'false' ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:4: ( 'true' | 'false' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:2: ( ( 'true' | 'false' ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:4: ( 'true' | 'false' )
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:4: ( 'true' | 'false' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -944,13 +944,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1160:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1592:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:5: 'true'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -958,7 +958,7 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160:12: 'false'
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -978,12 +978,107 @@
     }
     // $ANTLR end BOOL
 
+    // $ANTLR start ACCUMULATE
+    public final void mACCUMULATE() throws RecognitionException {
+        try {
+            int _type = ACCUMULATE;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1596:2: ( 'accumulate' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1596:4: 'accumulate'
+            {
+            match("accumulate"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end ACCUMULATE
+
+    // $ANTLR start COLLECT
+    public final void mCOLLECT() throws RecognitionException {
+        try {
+            int _type = COLLECT;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:2: ( 'collect' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:4: 'collect'
+            {
+            match("collect"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end COLLECT
+
+    // $ANTLR start END
+    public final void mEND() throws RecognitionException {
+        try {
+            int _type = END;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1603:5: ( 'end' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1603:7: 'end'
+            {
+            match("end"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end END
+
+    // $ANTLR start FROM
+    public final void mFROM() throws RecognitionException {
+        try {
+            int _type = FROM;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1607:2: ( 'from' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1607:4: 'from'
+            {
+            match("from"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end FROM
+
+    // $ANTLR start INIT
+    public final void mINIT() throws RecognitionException {
+        try {
+            int _type = INIT;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1611:2: ( 'init' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1611:4: 'init'
+            {
+            match("init"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end INIT
+
     // $ANTLR start NULL
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1163:6: ( 'null' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1163:8: 'null'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1615:2: ( 'null' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1615:4: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1001,8 +1096,8 @@
     public final void mOVER() throws RecognitionException {
         try {
             int _type = OVER;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1166:2: ( 'over' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1166:4: 'over'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:2: ( 'over' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:4: 'over'
             {
             match("over"); if (failed) return ;
 
@@ -1016,12 +1111,31 @@
     }
     // $ANTLR end OVER
 
+    // $ANTLR start RESULT
+    public final void mRESULT() throws RecognitionException {
+        try {
+            int _type = RESULT;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1623:2: ( 'result' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1623:4: 'result'
+            {
+            match("result"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RESULT
+
     // $ANTLR start THEN
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1170:2: ( 'then' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1170:4: 'then'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:2: ( 'then' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:4: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1035,14 +1149,14 @@
     }
     // $ANTLR end THEN
 
-    // $ANTLR start END
-    public final void mEND() throws RecognitionException {
+    // $ANTLR start WHEN
+    public final void mWHEN() throws RecognitionException {
         try {
-            int _type = END;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1173:5: ( 'end' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1173:7: 'end'
+            int _type = WHEN;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1631:2: ( 'when' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1631:4: 'when'
             {
-            match("end"); if (failed) return ;
+            match("when"); if (failed) return ;
 
 
             }
@@ -1052,14 +1166,14 @@
         finally {
         }
     }
-    // $ANTLR end END
+    // $ANTLR end WHEN
 
     // $ANTLR start GRAVE_ACCENT
     public final void mGRAVE_ACCENT() throws RecognitionException {
         try {
             int _type = GRAVE_ACCENT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1177:2: ( '`' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1177:4: '`'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1635:2: ( '`' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1635:4: '`'
             {
             match('`'); if (failed) return ;
 
@@ -1076,8 +1190,8 @@
     public final void mAT() throws RecognitionException {
         try {
             int _type = AT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:4: ( '@' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:6: '@'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1638:4: ( '@' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1638:6: '@'
             {
             match('@'); if (failed) return ;
 
@@ -1094,8 +1208,8 @@
     public final void mEQUALS() throws RecognitionException {
         try {
             int _type = EQUALS;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1184:2: ( '=' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1184:4: '='
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:2: ( '=' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642:4: '='
             {
             match('='); if (failed) return ;
 
@@ -1112,8 +1226,8 @@
     public final void mSEMICOLON() throws RecognitionException {
         try {
             int _type = SEMICOLON;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1188:2: ( ';' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1188:4: ';'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1646:2: ( ';' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1646:4: ';'
             {
             match(';'); if (failed) return ;
 
@@ -1130,8 +1244,8 @@
     public final void mDOT_STAR() throws RecognitionException {
         try {
             int _type = DOT_STAR;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1192:2: ( '.*' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1192:4: '.*'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1650:2: ( '.*' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1650:4: '.*'
             {
             match(".*"); if (failed) return ;
 
@@ -1149,8 +1263,8 @@
     public final void mCOLON() throws RecognitionException {
         try {
             int _type = COLON;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1196:2: ( ':' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1196:4: ':'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:2: ( ':' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:4: ':'
             {
             match(':'); if (failed) return ;
 
@@ -1167,8 +1281,8 @@
     public final void mEQUAL() throws RecognitionException {
         try {
             int _type = EQUAL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1200:2: ( '==' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1200:4: '=='
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1658:2: ( '==' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1658:4: '=='
             {
             match("=="); if (failed) return ;
 
@@ -1186,8 +1300,8 @@
     public final void mNOT_EQUAL() throws RecognitionException {
         try {
             int _type = NOT_EQUAL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1204:2: ( '!=' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1204:4: '!='
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1662:2: ( '!=' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1662:4: '!='
             {
             match("!="); if (failed) return ;
 
@@ -1205,8 +1319,8 @@
     public final void mGREATER() throws RecognitionException {
         try {
             int _type = GREATER;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1208:2: ( '>' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1208:4: '>'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1666:2: ( '>' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1666:4: '>'
             {
             match('>'); if (failed) return ;
 
@@ -1223,8 +1337,8 @@
     public final void mGREATER_EQUAL() throws RecognitionException {
         try {
             int _type = GREATER_EQUAL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1212:2: ( '>=' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1212:4: '>='
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:2: ( '>=' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:4: '>='
             {
             match(">="); if (failed) return ;
 
@@ -1242,8 +1356,8 @@
     public final void mLESS() throws RecognitionException {
         try {
             int _type = LESS;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1216:2: ( '<' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1216:4: '<'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:2: ( '<' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:4: '<'
             {
             match('<'); if (failed) return ;
 
@@ -1260,8 +1374,8 @@
     public final void mLESS_EQUAL() throws RecognitionException {
         try {
             int _type = LESS_EQUAL;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1220:2: ( '<=' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1220:4: '<='
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1678:2: ( '<=' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1678:4: '<='
             {
             match("<="); if (failed) return ;
 
@@ -1279,8 +1393,8 @@
     public final void mARROW() throws RecognitionException {
         try {
             int _type = ARROW;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1224:2: ( '->' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1224:4: '->'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1682:2: ( '->' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1682:4: '->'
             {
             match("->"); if (failed) return ;
 
@@ -1298,58 +1412,141 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228: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();
-            failed=false;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1686: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);
+
+            if ( (LA16_0=='$'||(LA16_0>='A' && LA16_0<='Z')||LA16_0=='_'||(LA16_0>='a' && LA16_0<='z')||(LA16_0>='\u00C0' && LA16_0<='\u00FF')) ) {
+                alt16=1;
             }
+            else if ( (LA16_0=='%') ) {
+                alt16=2;
+            }
             else {
                 if (backtracking>0) {failed=true; return ;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recover(mse);    throw mse;
+                NoViableAltException nvae =
+                    new NoViableAltException("1685: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 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1686: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();
+                    failed=false;
+                    }
+                    else {
+                        if (backtracking>0) {failed=true; return ;}
+                        MismatchedSetException mse =
+                            new MismatchedSetException(null,input);
+                        recover(mse);    throw mse;
+                    }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
-            loop14:
-            do {
-                int alt14=2;
-                int LA14_0 = input.LA(1);
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1686:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+                    loop14:
+                    do {
+                        int alt14=2;
+                        int LA14_0 = input.LA(1);
 
-                if ( ((LA14_0>='0' && LA14_0<='9')||(LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')||(LA14_0>='\u00C0' && LA14_0<='\u00FF')) ) {
-                    alt14=1;
-                }
+                        if ( ((LA14_0>='0' && LA14_0<='9')||(LA14_0>='A' && LA14_0<='Z')||LA14_0=='_'||(LA14_0>='a' && LA14_0<='z')||(LA14_0>='\u00C0' && LA14_0<='\u00FF')) ) {
+                            alt14=1;
+                        }
 
 
-                switch (alt14) {
-            	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
-            	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
-            	        input.consume();
-            	    failed=false;
-            	    }
-            	    else {
-            	        if (backtracking>0) {failed=true; return ;}
-            	        MismatchedSetException mse =
-            	            new MismatchedSetException(null,input);
-            	        recover(mse);    throw mse;
-            	    }
+                        switch (alt14) {
+                    	case 1 :
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+                    	    {
+                    	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
+                    	        input.consume();
+                    	    failed=false;
+                    	    }
+                    	    else {
+                    	        if (backtracking>0) {failed=true; return ;}
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
 
 
-            	    }
-            	    break;
+                    	    }
+                    	    break;
 
-            	default :
-            	    break loop14;
-                }
-            } while (true);
+                    	default :
+                    	    break loop14;
+                        }
+                    } while (true);
 
 
+                    }
+                    break;
+                case 2 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1687: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') ) {
+                        input.consume();
+                    failed=false;
+                    }
+                    else {
+                        if (backtracking>0) {failed=true; return ;}
+                        MismatchedSetException mse =
+                            new MismatchedSetException(null,input);
+                        recover(mse);    throw mse;
+                    }
+
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1687:54: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )+
+                    int cnt15=0;
+                    loop15:
+                    do {
+                        int alt15=2;
+                        int LA15_0 = input.LA(1);
+
+                        if ( ((LA15_0>='0' && LA15_0<='9')||(LA15_0>='A' && LA15_0<='Z')||LA15_0=='_'||(LA15_0>='a' && LA15_0<='z')||(LA15_0>='\u00C0' && LA15_0<='\u00FF')) ) {
+                            alt15=1;
+                        }
+
+
+                        switch (alt15) {
+                    	case 1 :
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+                    	    {
+                    	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
+                    	        input.consume();
+                    	    failed=false;
+                    	    }
+                    	    else {
+                    	        if (backtracking>0) {failed=true; return ;}
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    if ( cnt15 >= 1 ) break loop15;
+                    	    if (backtracking>0) {failed=true; return ;}
+                                EarlyExitException eee =
+                                    new EarlyExitException(15, input);
+                                throw eee;
+                        }
+                        cnt15++;
+                    } while (true);
+
+                    match('%'); if (failed) return ;
+                    if ( backtracking==0 ) {
+                      	text = getText().substring(1, getText().length() - 1);	
+                    }
+
+                    }
+                    break;
+
             }
-
             this.type = _type;
         }
         finally {
@@ -1361,8 +1558,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1232:9: ( '(' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1232:11: '('
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1692:9: ( '(' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1692:11: '('
             {
             match('('); if (failed) return ;
 
@@ -1379,8 +1576,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:9: ( ')' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:11: ')'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1696:9: ( ')' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1696:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -1397,8 +1594,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1240:9: ( '[' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1240:11: '['
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1700:9: ( '[' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1700:11: '['
             {
             match('['); if (failed) return ;
 
@@ -1415,8 +1612,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1244:9: ( ']' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1244:11: ']'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1704:9: ( ']' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1704:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -1433,8 +1630,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1248:9: ( '{' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1248:11: '{'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:9: ( '{' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -1451,8 +1648,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1252:9: ( '}' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1252:11: '}'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1712:9: ( '}' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1712:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -1469,8 +1666,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1255:7: ( ',' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1255:9: ','
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1715:7: ( ',' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1715:9: ','
             {
             match(','); if (failed) return ;
 
@@ -1487,8 +1684,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1258:5: ( '.' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1258:7: '.'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:5: ( '.' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -1505,8 +1702,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1262:2: ( '&&' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1262:4: '&&'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1722:2: ( '&&' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1722:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -1524,8 +1721,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:2: ( '||' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:4: '||'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1726:2: ( '||' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1726:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -1543,30 +1740,30 @@
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1270:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1270:4: '#' ( options {greedy=false; } : . )* EOL
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1730:2: ( '#' ( options {greedy=false; } : . )* EOL )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1730:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1270:8: ( options {greedy=false; } : . )*
-            loop15:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1730:8: ( options {greedy=false; } : . )*
+            loop17:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt17=2;
+                int LA17_0 = input.LA(1);
 
-                if ( (LA15_0=='\r') ) {
-                    alt15=2;
+                if ( (LA17_0=='\r') ) {
+                    alt17=2;
                 }
-                else if ( (LA15_0=='\n') ) {
-                    alt15=2;
+                else if ( (LA17_0=='\n') ) {
+                    alt17=2;
                 }
-                else if ( ((LA15_0>='\u0000' && LA15_0<='\t')||(LA15_0>='\u000B' && LA15_0<='\f')||(LA15_0>='\u000E' && LA15_0<='\uFFFE')) ) {
-                    alt15=1;
+                else if ( ((LA17_0>='\u0000' && LA17_0<='\t')||(LA17_0>='\u000B' && LA17_0<='\f')||(LA17_0>='\u000E' && LA17_0<='\uFFFE')) ) {
+                    alt17=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt17) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1270:35: .
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1730:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1574,7 +1771,7 @@
             	    break;
 
             	default :
-            	    break loop15;
+            	    break loop17;
                 }
             } while (true);
 
@@ -1596,31 +1793,31 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:4: '//' ( options {greedy=false; } : . )* EOL
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:2: ( '//' ( options {greedy=false; } : . )* EOL )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:9: ( options {greedy=false; } : . )*
-            loop16:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:9: ( options {greedy=false; } : . )*
+            loop18:
             do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
+                int alt18=2;
+                int LA18_0 = input.LA(1);
 
-                if ( (LA16_0=='\r') ) {
-                    alt16=2;
+                if ( (LA18_0=='\r') ) {
+                    alt18=2;
                 }
-                else if ( (LA16_0=='\n') ) {
-                    alt16=2;
+                else if ( (LA18_0=='\n') ) {
+                    alt18=2;
                 }
-                else if ( ((LA16_0>='\u0000' && LA16_0<='\t')||(LA16_0>='\u000B' && LA16_0<='\f')||(LA16_0>='\u000E' && LA16_0<='\uFFFE')) ) {
-                    alt16=1;
+                else if ( ((LA18_0>='\u0000' && LA18_0<='\t')||(LA18_0>='\u000B' && LA18_0<='\f')||(LA18_0>='\u000E' && LA18_0<='\uFFFE')) ) {
+                    alt18=1;
                 }
 
 
-                switch (alt16) {
+                switch (alt18) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:36: .
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1628,7 +1825,7 @@
             	    break;
 
             	default :
-            	    break loop16;
+            	    break loop18;
                 }
             } while (true);
 
@@ -1650,37 +1847,37 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1281:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1281:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1281:9: ( options {greedy=false; } : . )*
-            loop17:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:9: ( options {greedy=false; } : . )*
+            loop19:
             do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA17_0=='*') ) {
-                    int LA17_1 = input.LA(2);
+                if ( (LA19_0=='*') ) {
+                    int LA19_1 = input.LA(2);
 
-                    if ( (LA17_1=='/') ) {
-                        alt17=2;
+                    if ( (LA19_1=='/') ) {
+                        alt19=2;
                     }
-                    else if ( ((LA17_1>='\u0000' && LA17_1<='.')||(LA17_1>='0' && LA17_1<='\uFFFE')) ) {
-                        alt17=1;
+                    else if ( ((LA19_1>='\u0000' && LA19_1<='.')||(LA19_1>='0' && LA19_1<='\uFFFE')) ) {
+                        alt19=1;
                     }
 
 
                 }
-                else if ( ((LA17_0>='\u0000' && LA17_0<=')')||(LA17_0>='+' && LA17_0<='\uFFFE')) ) {
-                    alt17=1;
+                else if ( ((LA19_0>='\u0000' && LA19_0<=')')||(LA19_0>='+' && LA19_0<='\uFFFE')) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt17) {
+                switch (alt19) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1281:35: .
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -1688,7 +1885,7 @@
             	    break;
 
             	default :
-            	    break loop17;
+            	    break loop19;
                 }
             } while (true);
 
@@ -1711,7 +1908,7 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1285:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
             // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
             {
             if ( input.LA(1)=='!'||(input.LA(1)>='$' && input.LA(1)<='\'')||(input.LA(1)>='*' && input.LA(1)<='+')||input.LA(1)=='-'||input.LA(1)=='/'||input.LA(1)=='?'||input.LA(1)=='\\'||(input.LA(1)>='^' && input.LA(1)<='_')||input.LA(1)=='|' ) {
@@ -1736,10 +1933,10 @@
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( WS | INT | FLOAT | STRING | BOOL | NULL | OVER | THEN | END | GRAVE_ACCENT | AT | EQUALS | SEMICOLON | DOT_STAR | COLON | EQUAL | NOT_EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | ARROW | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
-        int alt18=37;
-        alt18 = dfa18.predict(input);
-        switch (alt18) {
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( WS | INT | FLOAT | STRING | BOOL | ACCUMULATE | COLLECT | END | FROM | INIT | NULL | OVER | RESULT | THEN | WHEN | GRAVE_ACCENT | AT | EQUALS | SEMICOLON | DOT_STAR | COLON | EQUAL | NOT_EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | ARROW | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
+        int alt20=43;
+        alt20 = dfa20.predict(input);
+        switch (alt20) {
             case 1 :
                 // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: WS
                 {
@@ -1776,225 +1973,267 @@
                 }
                 break;
             case 6 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:35: NULL
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:35: ACCUMULATE
                 {
-                mNULL(); if (failed) return ;
+                mACCUMULATE(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:40: OVER
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: COLLECT
                 {
-                mOVER(); if (failed) return ;
+                mCOLLECT(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:45: THEN
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:54: END
                 {
-                mTHEN(); if (failed) return ;
+                mEND(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:50: END
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:58: FROM
                 {
-                mEND(); if (failed) return ;
+                mFROM(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:54: GRAVE_ACCENT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:63: INIT
                 {
-                mGRAVE_ACCENT(); if (failed) return ;
+                mINIT(); if (failed) return ;
 
                 }
                 break;
             case 11 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:67: AT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:68: NULL
                 {
-                mAT(); if (failed) return ;
+                mNULL(); if (failed) return ;
 
                 }
                 break;
             case 12 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:70: EQUALS
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:73: OVER
                 {
-                mEQUALS(); if (failed) return ;
+                mOVER(); if (failed) return ;
 
                 }
                 break;
             case 13 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:77: SEMICOLON
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:78: RESULT
                 {
-                mSEMICOLON(); if (failed) return ;
+                mRESULT(); if (failed) return ;
 
                 }
                 break;
             case 14 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:87: DOT_STAR
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:85: THEN
                 {
-                mDOT_STAR(); if (failed) return ;
+                mTHEN(); if (failed) return ;
 
                 }
                 break;
             case 15 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:96: COLON
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:90: WHEN
                 {
-                mCOLON(); if (failed) return ;
+                mWHEN(); if (failed) return ;
 
                 }
                 break;
             case 16 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:102: EQUAL
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:95: GRAVE_ACCENT
                 {
-                mEQUAL(); if (failed) return ;
+                mGRAVE_ACCENT(); if (failed) return ;
 
                 }
                 break;
             case 17 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:108: NOT_EQUAL
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:108: AT
                 {
-                mNOT_EQUAL(); if (failed) return ;
+                mAT(); if (failed) return ;
 
                 }
                 break;
             case 18 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:118: GREATER
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:111: EQUALS
                 {
-                mGREATER(); if (failed) return ;
+                mEQUALS(); if (failed) return ;
 
                 }
                 break;
             case 19 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:126: GREATER_EQUAL
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:118: SEMICOLON
                 {
-                mGREATER_EQUAL(); if (failed) return ;
+                mSEMICOLON(); if (failed) return ;
 
                 }
                 break;
             case 20 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:140: LESS
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:128: DOT_STAR
                 {
-                mLESS(); if (failed) return ;
+                mDOT_STAR(); if (failed) return ;
 
                 }
                 break;
             case 21 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:145: LESS_EQUAL
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:137: COLON
                 {
-                mLESS_EQUAL(); if (failed) return ;
+                mCOLON(); if (failed) return ;
 
                 }
                 break;
             case 22 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:156: ARROW
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:143: EQUAL
                 {
-                mARROW(); if (failed) return ;
+                mEQUAL(); if (failed) return ;
 
                 }
                 break;
             case 23 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:162: ID
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:149: NOT_EQUAL
                 {
-                mID(); if (failed) return ;
+                mNOT_EQUAL(); if (failed) return ;
 
                 }
                 break;
             case 24 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:165: LEFT_PAREN
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:159: GREATER
                 {
-                mLEFT_PAREN(); if (failed) return ;
+                mGREATER(); if (failed) return ;
 
                 }
                 break;
             case 25 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:176: RIGHT_PAREN
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:167: GREATER_EQUAL
                 {
-                mRIGHT_PAREN(); if (failed) return ;
+                mGREATER_EQUAL(); if (failed) return ;
 
                 }
                 break;
             case 26 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:188: LEFT_SQUARE
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:181: LESS
                 {
-                mLEFT_SQUARE(); if (failed) return ;
+                mLESS(); if (failed) return ;
 
                 }
                 break;
             case 27 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:200: RIGHT_SQUARE
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:186: LESS_EQUAL
                 {
-                mRIGHT_SQUARE(); if (failed) return ;
+                mLESS_EQUAL(); if (failed) return ;
 
                 }
                 break;
             case 28 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:213: LEFT_CURLY
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:197: ARROW
                 {
-                mLEFT_CURLY(); if (failed) return ;
+                mARROW(); if (failed) return ;
 
                 }
                 break;
             case 29 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:224: RIGHT_CURLY
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:203: ID
                 {
-                mRIGHT_CURLY(); if (failed) return ;
+                mID(); if (failed) return ;
 
                 }
                 break;
             case 30 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:236: COMMA
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:206: LEFT_PAREN
                 {
-                mCOMMA(); if (failed) return ;
+                mLEFT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 31 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:242: DOT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:217: RIGHT_PAREN
                 {
-                mDOT(); if (failed) return ;
+                mRIGHT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 32 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:246: DOUBLE_AMPER
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:229: LEFT_SQUARE
                 {
-                mDOUBLE_AMPER(); if (failed) return ;
+                mLEFT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 33 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:259: DOUBLE_PIPE
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:241: RIGHT_SQUARE
                 {
-                mDOUBLE_PIPE(); if (failed) return ;
+                mRIGHT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 34 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:271: SH_STYLE_SINGLE_LINE_COMMENT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:254: LEFT_CURLY
                 {
-                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mLEFT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 35 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:300: C_STYLE_SINGLE_LINE_COMMENT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:265: RIGHT_CURLY
                 {
-                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mRIGHT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 36 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:328: MULTI_LINE_COMMENT
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:277: COMMA
                 {
-                mMULTI_LINE_COMMENT(); if (failed) return ;
+                mCOMMA(); if (failed) return ;
 
                 }
                 break;
             case 37 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:347: MISC
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:283: DOT
                 {
+                mDOT(); if (failed) return ;
+
+                }
+                break;
+            case 38 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:287: DOUBLE_AMPER
+                {
+                mDOUBLE_AMPER(); if (failed) return ;
+
+                }
+                break;
+            case 39 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:300: DOUBLE_PIPE
+                {
+                mDOUBLE_PIPE(); if (failed) return ;
+
+                }
+                break;
+            case 40 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:312: SH_STYLE_SINGLE_LINE_COMMENT
+                {
+                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 41 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:341: C_STYLE_SINGLE_LINE_COMMENT
+                {
+                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 42 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:369: MULTI_LINE_COMMENT
+                {
+                mMULTI_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 43 :
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:388: MISC
+                {
                 mMISC(); if (failed) return ;
 
                 }
@@ -2006,8 +2245,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1115:14: ( '\\r\\n' )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1115:16: '\\r\\n'
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1547:14: ( '\\r\\n' )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1547:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2032,58 +2271,76 @@
     }
 
 
-    protected DFA18 dfa18 = new DFA18(this);
-    static final String DFA18_eotS =
-        "\2\uffff\1\41\1\43\1\uffff\1\41\5\40\2\uffff\1\54\1\uffff\1\56\1"+
-        "\uffff\1\41\1\61\1\63\10\uffff\2\41\1\uffff\1\41\5\uffff\6\40\15"+
-        "\uffff\5\40\1\103\1\104\1\105\1\40\1\107\1\110\3\uffff\1\104\2\uffff";
-    static final String DFA18_eofS =
-        "\111\uffff";
-    static final String DFA18_minS =
-        "\1\11\1\uffff\1\60\1\56\1\uffff\1\0\1\150\1\141\1\165\1\166\1\156"+
-        "\2\uffff\1\75\1\uffff\1\52\1\uffff\3\75\10\uffff\1\46\1\174\1\uffff"+
-        "\1\52\5\uffff\1\165\1\145\2\154\1\145\1\144\15\uffff\1\145\1\156"+
-        "\1\163\1\154\1\162\3\60\1\145\2\60\3\uffff\1\60\2\uffff";
-    static final String DFA18_maxS =
-        "\1\u00ff\1\uffff\1\76\1\71\1\uffff\1\ufffe\1\162\1\141\1\165\1\166"+
-        "\1\156\2\uffff\1\75\1\uffff\1\52\1\uffff\3\75\10\uffff\1\46\1\174"+
-        "\1\uffff\1\57\5\uffff\1\165\1\145\2\154\1\145\1\144\15\uffff\1\145"+
-        "\1\156\1\163\1\154\1\162\3\u00ff\1\145\2\u00ff\3\uffff\1\u00ff\2"+
-        "\uffff";
-    static final String DFA18_acceptS =
-        "\1\uffff\1\1\2\uffff\1\4\6\uffff\1\12\1\13\1\uffff\1\15\1\uffff"+
-        "\1\17\3\uffff\1\27\1\30\1\31\1\32\1\33\1\34\1\35\1\36\2\uffff\1"+
-        "\42\1\uffff\1\27\1\45\1\26\1\2\1\3\6\uffff\1\20\1\14\1\16\1\37\1"+
-        "\21\1\23\1\22\1\25\1\24\1\40\1\41\1\44\1\43\13\uffff\1\11\1\5\1"+
-        "\10\1\uffff\1\6\1\7";
-    static final String DFA18_specialS =
-        "\111\uffff}>";
-    static final String[] DFA18_transitionS = {
-            "\2\1\1\uffff\2\1\22\uffff\1\1\1\21\1\4\1\36\1\24\1\41\1\34\1"+
-            "\5\1\25\1\26\2\41\1\33\1\2\1\17\1\37\12\3\1\20\1\16\1\23\1\15"+
-            "\1\22\1\41\1\14\32\40\1\27\1\41\1\30\1\41\1\24\1\13\4\40\1\12"+
-            "\1\7\7\40\1\10\1\11\4\40\1\6\6\40\1\31\1\35\1\32\102\uffff\100"+
-            "\40",
+    protected DFA20 dfa20 = new DFA20(this);
+    static final String DFA20_eotS =
+        "\2\uffff\1\47\1\51\1\uffff\1\47\12\46\2\uffff\1\70\1\uffff\1\72"+
+        "\1\uffff\1\47\1\75\1\77\1\uffff\1\47\7\uffff\2\47\1\uffff\1\47\5"+
+        "\uffff\14\46\15\uffff\6\46\1\126\5\46\1\134\1\135\1\136\3\46\1\uffff"+
+        "\1\142\1\143\1\144\1\46\1\146\3\uffff\1\134\2\46\3\uffff\1\46\1"+
+        "\uffff\2\46\1\154\1\46\1\156\1\uffff\1\46\1\uffff\1\46\1\161\1\uffff";
+    static final String DFA20_eofS =
+        "\162\uffff";
+    static final String DFA20_minS =
+        "\1\11\1\uffff\1\60\1\56\1\uffff\1\0\1\150\1\141\1\143\1\157\2\156"+
+        "\1\165\1\166\1\145\1\150\2\uffff\1\75\1\uffff\1\52\1\uffff\3\75"+
+        "\1\uffff\1\44\7\uffff\1\46\1\174\1\uffff\1\52\5\uffff\1\165\1\145"+
+        "\1\157\1\154\1\143\1\154\1\144\1\151\1\154\1\145\1\163\1\145\15"+
+        "\uffff\1\145\1\156\1\155\1\163\1\165\1\154\1\60\1\164\1\154\1\162"+
+        "\1\165\1\156\3\60\1\145\1\155\1\145\1\uffff\3\60\1\154\1\60\3\uffff"+
+        "\1\60\1\165\1\143\3\uffff\1\164\1\uffff\1\154\1\164\1\60\1\141\1"+
+        "\60\1\uffff\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\145\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\157\1\154\1\143\1\154\1\144\1\151\1\154\1\145\1\163\1\145"+
+        "\15\uffff\1\145\1\156\1\155\1\163\1\165\1\154\1\u00ff\1\164\1\154"+
+        "\1\162\1\165\1\156\3\u00ff\1\145\1\155\1\145\1\uffff\3\u00ff\1\154"+
+        "\1\u00ff\3\uffff\1\u00ff\1\165\1\143\3\uffff\1\164\1\uffff\1\154"+
+        "\1\164\1\u00ff\1\141\1\u00ff\1\uffff\1\164\1\uffff\1\145\1\u00ff"+
+        "\1\uffff";
+    static final String DFA20_acceptS =
+        "\1\uffff\1\1\2\uffff\1\4\13\uffff\1\20\1\21\1\uffff\1\23\1\uffff"+
+        "\1\25\3\uffff\1\35\1\uffff\1\36\1\37\1\40\1\41\1\42\1\43\1\44\2"+
+        "\uffff\1\50\1\uffff\1\35\1\53\1\34\1\2\1\3\14\uffff\1\26\1\22\1"+
+        "\24\1\45\1\27\1\31\1\30\1\33\1\32\1\46\1\47\1\52\1\51\22\uffff\1"+
+        "\10\5\uffff\1\5\1\16\1\11\3\uffff\1\12\1\13\1\14\1\uffff\1\17\5"+
+        "\uffff\1\15\1\uffff\1\7\2\uffff\1\6";
+    static final String DFA20_specialS =
+        "\162\uffff}>";
+    static final String[] DFA20_transitionS = {
+            "\2\1\1\uffff\2\1\22\uffff\1\1\1\26\1\4\1\44\1\31\1\32\1\42\1"+
+            "\5\1\33\1\34\2\47\1\41\1\2\1\24\1\45\12\3\1\25\1\23\1\30\1\22"+
+            "\1\27\1\47\1\21\32\46\1\35\1\47\1\36\1\47\1\31\1\20\1\10\1\46"+
+            "\1\11\1\46\1\12\1\7\2\46\1\13\4\46\1\14\1\15\2\46\1\16\1\46"+
+            "\1\6\2\46\1\17\3\46\1\37\1\43\1\40\102\uffff\100\46",
             "",
-            "\12\3\4\uffff\1\42",
-            "\1\44\1\uffff\12\3",
+            "\12\3\4\uffff\1\50",
+            "\1\52\1\uffff\12\3",
             "",
             "\uffff\4",
-            "\1\46\11\uffff\1\45",
-            "\1\47",
-            "\1\50",
-            "\1\51",
-            "\1\52",
+            "\1\54\11\uffff\1\53",
+            "\1\56\20\uffff\1\55",
+            "\1\57",
+            "\1\60",
+            "\1\61",
+            "\1\62",
+            "\1\63",
+            "\1\64",
+            "\1\65",
+            "\1\66",
             "",
             "",
-            "\1\53",
+            "\1\67",
             "",
-            "\1\55",
+            "\1\71",
             "",
-            "\1\57",
-            "\1\60",
-            "\1\62",
+            "\1\73",
+            "\1\74",
+            "\1\76",
             "",
+            "\1\46\34\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
             "",
             "",
             "",
@@ -2091,21 +2348,27 @@
             "",
             "",
             "",
-            "\1\64",
-            "\1\65",
+            "\1\100",
+            "\1\101",
             "",
-            "\1\66\4\uffff\1\67",
+            "\1\102\4\uffff\1\103",
             "",
             "",
             "",
             "",
             "",
-            "\1\70",
-            "\1\71",
-            "\1\72",
-            "\1\73",
-            "\1\74",
-            "\1\75",
+            "\1\104",
+            "\1\105",
+            "\1\106",
+            "\1\107",
+            "\1\110",
+            "\1\111",
+            "\1\112",
+            "\1\113",
+            "\1\114",
+            "\1\115",
+            "\1\116",
+            "\1\117",
             "",
             "",
             "",
@@ -2119,62 +2382,97 @@
             "",
             "",
             "",
-            "\1\76",
-            "\1\77",
-            "\1\100",
-            "\1\101",
-            "\1\102",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
-            "\1\106",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
+            "\1\120",
+            "\1\121",
+            "\1\122",
+            "\1\123",
+            "\1\124",
+            "\1\125",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\1\127",
+            "\1\130",
+            "\1\131",
+            "\1\132",
+            "\1\133",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\1\137",
+            "\1\140",
+            "\1\141",
             "",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\1\145",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
             "",
             "",
-            "\12\40\7\uffff\32\40\4\uffff\1\40\1\uffff\32\40\105\uffff\100"+
-            "\40",
             "",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\1\147",
+            "\1\150",
+            "",
+            "",
+            "",
+            "\1\151",
+            "",
+            "\1\152",
+            "\1\153",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "\1\155",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
+            "",
+            "\1\157",
+            "",
+            "\1\160",
+            "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46\105\uffff\100"+
+            "\46",
             ""
     };
 
-    static final short[] DFA18_eot = DFA.unpackEncodedString(DFA18_eotS);
-    static final short[] DFA18_eof = DFA.unpackEncodedString(DFA18_eofS);
-    static final char[] DFA18_min = DFA.unpackEncodedStringToUnsignedChars(DFA18_minS);
-    static final char[] DFA18_max = DFA.unpackEncodedStringToUnsignedChars(DFA18_maxS);
-    static final short[] DFA18_accept = DFA.unpackEncodedString(DFA18_acceptS);
-    static final short[] DFA18_special = DFA.unpackEncodedString(DFA18_specialS);
-    static final short[][] DFA18_transition;
+    static final short[] DFA20_eot = DFA.unpackEncodedString(DFA20_eotS);
+    static final short[] DFA20_eof = DFA.unpackEncodedString(DFA20_eofS);
+    static final char[] DFA20_min = DFA.unpackEncodedStringToUnsignedChars(DFA20_minS);
+    static final char[] DFA20_max = DFA.unpackEncodedStringToUnsignedChars(DFA20_maxS);
+    static final short[] DFA20_accept = DFA.unpackEncodedString(DFA20_acceptS);
+    static final short[] DFA20_special = DFA.unpackEncodedString(DFA20_specialS);
+    static final short[][] DFA20_transition;
 
     static {
-        int numStates = DFA18_transitionS.length;
-        DFA18_transition = new short[numStates][];
+        int numStates = DFA20_transitionS.length;
+        DFA20_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA18_transition[i] = DFA.unpackEncodedString(DFA18_transitionS[i]);
+            DFA20_transition[i] = DFA.unpackEncodedString(DFA20_transitionS[i]);
         }
     }
 
-    class DFA18 extends DFA {
+    class DFA20 extends DFA {
 
-        public DFA18(BaseRecognizer recognizer) {
+        public DFA20(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 18;
-            this.eot = DFA18_eot;
-            this.eof = DFA18_eof;
-            this.min = DFA18_min;
-            this.max = DFA18_max;
-            this.accept = DFA18_accept;
-            this.special = DFA18_special;
-            this.transition = DFA18_transition;
+            this.decisionNumber = 20;
+            this.eot = DFA20_eot;
+            this.eof = DFA20_eof;
+            this.min = DFA20_min;
+            this.max = DFA20_max;
+            this.accept = DFA20_accept;
+            this.special = DFA20_special;
+            this.transition = DFA20_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( WS | INT | FLOAT | STRING | BOOL | NULL | OVER | THEN | END | GRAVE_ACCENT | AT | EQUALS | SEMICOLON | DOT_STAR | COLON | EQUAL | NOT_EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | ARROW | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC );";
+            return "1:1: Tokens : ( WS | INT | FLOAT | STRING | BOOL | ACCUMULATE | COLLECT | END | FROM | INIT | NULL | OVER | RESULT | THEN | WHEN | GRAVE_ACCENT | AT | EQUALS | SEMICOLON | DOT_STAR | COLON | EQUAL | NOT_EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | ARROW | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC );";
         }
     }
  

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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -1,7 +1,9 @@
-// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-08-04 21:40:30
+// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-08-21 09:26:02
 
 	package org.drools.lang;
 	
+	import java.util.List;
+	import java.util.LinkedList;
 	import org.drools.compiler.DroolsParserException;
 
 
@@ -16,118 +18,120 @@
 
 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_WHEN", "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_FROM", "VK_ACCUMULATE", "VK_INIT", "VK_ACTION", "VK_REVERSE", "VK_RESULT", "VK_COLLECT", "SEMICOLON", "ID", "DOT", "DOT_STAR", "END", "STRING", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "AT", "COLON", "EQUALS", "BOOL", "INT", "DOUBLE_PIPE", "DOUBLE_AMPER", "OVER", "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_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", "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", "RESULT", "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=94;
+    public static final int COMMA=88;
     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=65;
-    public static final int END=91;
+    public static final int VK_FUNCTION=64;
+    public static final int END=85;
     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 VK_ACCUMULATE=81;
     public static final int MISC=119;
     public static final int VT_AND_PREFIX=23;
-    public static final int VK_QUERY=63;
+    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=89;
-    public static final int VK_IMPORT=60;
+    public static final int DOT=83;
+    public static final int VK_IMPORT=59;
     public static final int VT_SLOT=15;
     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 VT_FACT=6;
-    public static final int VK_MATCHES=69;
+    public static final int VK_MATCHES=68;
     public static final int LEFT_CURLY=117;
-    public static final int AT=96;
-    public static final int DOUBLE_AMPER=102;
-    public static final int LEFT_PAREN=93;
+    public static final int AT=90;
+    public static final int DOUBLE_AMPER=97;
+    public static final int LEFT_PAREN=87;
     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=93;
     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=71;
-    public static final int OVER=103;
-    public static final int STRING=92;
-    public static final int VK_AND=77;
+    public static final int VK_SOUNDSLIKE=70;
+    public static final int OVER=99;
+    public static final int VK_AND=76;
+    public static final int STRING=86;
     public static final int VT_ACCESSOR_ELEMENT=37;
     public static final int VT_ACCUMULATE_INIT_CLAUSE=27;
-    public static final int VK_GLOBAL=66;
-    public static final int VK_REVERSE=84;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
     public static final int VT_BEHAVIOR=21;
     public static final int GRAVE_ACCENT=111;
     public static final int VK_DURATION=53;
     public static final int VT_SQUARE_CHUNK=19;
-    public static final int VK_FORALL=79;
+    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=98;
-    public static final int VK_RESULT=85;
+    public static final int EQUALS=92;
     public static final int UnicodeEscape=124;
-    public static final int VK_PACKAGE=61;
+    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=87;
-    public static final int VK_TEMPLATE=62;
+    public static final int SEMICOLON=81;
+    public static final int VK_TEMPLATE=61;
     public static final int VT_AND_IMPLICIT=22;
     public static final int NULL=113;
-    public static final int COLON=97;
+    public static final int COLON=91;
     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=74;
+    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=101;
     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=101;
+    public static final int DOUBLE_PIPE=96;
     public static final int LESS=108;
     public static final int VT_TYPE_DECLARE_ID=11;
     public static final int VT_PATTERN=31;
     public static final int VK_DATE_EFFECTIVE=45;
     public static final int EscapeSequence=122;
-    public static final int VK_EXISTS=78;
-    public static final int INT=100;
+    public static final int VK_EXISTS=77;
+    public static final int INT=95;
     public static final int VT_BIND_FIELD=34;
-    public static final int VK_RULE=59;
-    public static final int VK_EVAL=67;
-    public static final int VK_COLLECT=86;
+    public static final int VK_RULE=58;
+    public static final int VK_EVAL=66;
     public static final int GREATER=106;
+    public static final int RESULT=102;
     public static final int VT_FACT_BINDING=32;
-    public static final int ID=88;
+    public static final int FROM=98;
+    public static final int ID=82;
     public static final int NOT_EQUAL=110;
     public static final int RIGHT_CURLY=118;
-    public static final int BOOL=99;
+    public static final int BOOL=94;
     public static final int VT_AND_INFIX=25;
     public static final int VT_PARAM_LIST=44;
-    public static final int VK_ENTRY_POINT=73;
+    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=68;
+    public static final int VK_CONTAINS=67;
     public static final int VT_FUNCTION_IMPORT=5;
-    public static final int VK_IN=75;
+    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=72;
+    public static final int VK_MEMBEROF=71;
     public static final int VT_OR_INFIX=26;
-    public static final int DOT_STAR=90;
-    public static final int VK_OR=76;
+    public static final int DOT_STAR=84;
+    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 VK_WHEN=58;
+    public static final int ACCUMULATE=100;
     public static final int VK_RULEFLOW_GROUP=52;
     public static final int VT_FUNCTION_ID=43;
     public static final int EOF=-1;
@@ -135,19 +139,17 @@
     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 VK_INIT=82;
     public static final int OctalEscape=125;
-    public static final int VK_ACTION=83;
-    public static final int VK_EXCLUDES=70;
-    public static final int VK_FROM=80;
-    public static final int RIGHT_PAREN=95;
+    public static final int VK_ACTION=79;
+    public static final int VK_EXCLUDES=69;
+    public static final int RIGHT_PAREN=89;
     public static final int VT_TEMPLATE_ID=10;
     public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
-    public static final int VK_DECLARE=64;
+    public static final int VK_DECLARE=63;
 
         public DRLParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[146+1];
+            ruleMemo = new HashMap[140+1];
          }
         
     protected TreeAdaptor adaptor = new CommonTreeAdaptor();
@@ -162,13 +164,97 @@
     public String[] getTokenNames() { return tokenNames; }
     public String getGrammarFileName() { return "/Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
+		private String source = "unknown";
 
-    	private Stack<Map<Integer, String>> paraphrases = new Stack<Map<Integer, String>>();
+		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);
-    	private String source = "unknown";
     	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) {
+    				editorInterface = new LinkedList<DroolsSentence>();
+    			}
+    			DroolsSentence sentence = new DroolsSentence();
+    			sentence.setType(sentenceType);
+    			editorInterface.add(sentence);
+    		}
+    	}
+
+    	private DroolsSentence getActiveSentence(){
+    		return editorInterface.getLast();
+    	}
+
+    	private void emit(List tokens, DroolsEditorType editorType){
+    		if (isEditorInterfaceEnabled && tokens != null) {		
+    			for (Object activeObject : tokens){
+    				emit((Token) activeObject, editorType);
+    			}
+    		}
+    	}
+
+    	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) {
+    			if (!forceEmit && activeContext == Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR){
+    				if (input.LA(1) == EOF && input.get(input.index() - 1).getType() == WS){
+    					getActiveSentence().addContent(activeContext);
+    				}
+    			} else if (!forceEmit && activeContext == Location.LOCATION_LHS_BEGIN_OF_CONDITION && getLastTokenOnList(getActiveSentence().getContent()).getType() == FROM) {
+    				//
+    			} else {
+    				getActiveSentence().addContent(activeContext);
+    			}
+    		}
+    	}
+    	
+    	private void emit(int activeContext){
+    		if (isEditorInterfaceEnabled) {
+    			emit(false, activeContext);
+    		}
+    	}
+
+    	private DroolsToken getLastTokenOnList(LinkedList list){
+    		DroolsToken lastToken = null;
+    		for (Object object : list) {
+    			if (object instanceof DroolsToken) {
+    				lastToken = (DroolsToken) object;
+    			}
+    		}
+    		return lastToken;
+    	}
+
+    	private int getLastIntegerValue(LinkedList list) {
+    		int lastIntergerValue = -1;
+    		for (Object object : list) {
+    			if (object instanceof Integer) {
+    				lastIntergerValue = (Integer) object;
+    			}
+    		}
+    		return lastIntergerValue;
+    	}
+
     	private boolean validateLT(int LTNumber, String text) {
     		if (null == input)
     			return false;
@@ -202,15 +288,6 @@
     		return false;
     	}
 
-    	private boolean validateWhenWithParenthesis(){
-    		if (input.LA(1) == ID && validateIdentifierKey(DroolsSoftKeywords.WHEN) && input.LA(2) == COLON && input.LA(3) == LEFT_PAREN && !(validateLT(4, DroolsSoftKeywords.OR) || validateLT(4, DroolsSoftKeywords.AND))){
-    			return true;
-    		} else if (input.LA(1) == ID && validateIdentifierKey(DroolsSoftKeywords.WHEN) && input.LA(2) == LEFT_PAREN && !(validateLT(3, DroolsSoftKeywords.OR) || validateLT(3, DroolsSoftKeywords.AND))){
-    			return true;
-    		}
-    		return false;
-    	}
-
     	private boolean validateRestr() {
     		int lookahead = 2;
     		int countParen = 1;
@@ -222,6 +299,8 @@
     				countParen++;
     			} else if (input.LA(lookahead) == RIGHT_PAREN) {
     				countParen--;
+    			} else if (input.LA(lookahead) == EOF) {
+    				break;
     			}
     			if (countParen == 0){
     				break;
@@ -288,8 +367,8 @@
     	 * @param type
     	 *            paraphrase type
     	 */
-    	private void pushParaphrases(int type) {
-    		Map<Integer, String> activeMap = new HashMap<Integer, String>();
+    	private void pushParaphrases(DroolsParaphraseTypes type) {
+    		Map<DroolsParaphraseTypes, String> activeMap = new HashMap<DroolsParaphraseTypes, String>();
     		activeMap.put(type, "");
     		paraphrases.push(activeMap);
     	}
@@ -302,7 +381,7 @@
     	 * @param value
     	 *            paraphrase value
     	 */
-    	private void setParaphrasesValue(int type, String value) {
+    	private void setParaphrasesValue(DroolsParaphraseTypes type, String value) {
     		paraphrases.peek().put(type, value);
     	}
 
@@ -332,7 +411,7 @@
     };
 
     // $ANTLR start compilation_unit
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:295:1: compilation_unit : ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:368: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);
@@ -350,17 +429,17 @@
         RewriteRuleSubtreeStream stream_package_statement=new RewriteRuleSubtreeStream(adaptor,"rule package_statement");
         RewriteRuleSubtreeStream stream_statement=new RewriteRuleSubtreeStream(adaptor,"rule statement");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:296:2: ( ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:296:4: ( package_statement )? ( statement )* EOF
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:369:2: ( ( package_statement )? ( statement )* EOF -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:369:4: ( package_statement )? ( statement )* EOF
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:296:4: ( package_statement )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:369:4: ( package_statement )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(D!
 roolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.!
 IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && va
lidateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKe!
 y(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
+            if ( (LA1_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(v!
 alidateIdentifierKey(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)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLAR!
 E)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIde
ntifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSof!
 tKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
                 int LA1_1 = input.LA(2);
 
-                if ( (LA1_1==ID) && ((((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, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywo!
 rds.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||((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)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&!
 (validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1,
 DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsS!
 oftKeywords.IMPORT))||((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, "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)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSo!
 ftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "fun
ction") )&&(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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
+                if ( (LA1_1==ID) && ((((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(Dr!
 oolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, 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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeyword!
 s.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(va
lidateIdentifierKey(DroolsSoftKeywords.QUERY))||((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.FUNCTION))||((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, Droo!
 lsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeyw!
 ords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(valid
ateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))))) {
                     int LA1_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.PACKAGE))) ) {
@@ -370,9 +449,9 @@
             }
             switch (alt1) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:296:4: package_statement
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:369:4: package_statement
                     {
-                    pushFollow(FOLLOW_package_statement_in_compilation_unit408);
+                    pushFollow(FOLLOW_package_statement_in_compilation_unit384);
                     package_statement1=package_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -383,22 +462,22 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:297:3: ( statement )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:3: ( statement )*
             loop2:
             do {
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( (LA2_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdenti!
 fierKey(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))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
+                if ( (LA2_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdenti!
 fierKey(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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
                     alt2=1;
                 }
 
 
                 switch (alt2) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:297:3: statement
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:3: statement
             	    {
-            	    pushFollow(FOLLOW_statement_in_compilation_unit413);
+            	    pushFollow(FOLLOW_statement_in_compilation_unit389);
             	    statement2=statement();
             	    _fsp--;
             	    if (failed) return retval;
@@ -413,7 +492,7 @@
             } while (true);
 
             EOF3=(Token)input.LT(1);
-            match(input,EOF,FOLLOW_EOF_in_compilation_unit418); if (failed) return retval;
+            match(input,EOF,FOLLOW_EOF_in_compilation_unit394); if (failed) return retval;
             if ( backtracking==0 ) stream_EOF.add(EOF3);
 
 
@@ -428,20 +507,20 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 299:3: -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
+            // 372:3: -> ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:299:6: ^( VT_COMPILATION_UNIT ( package_statement )? ( statement )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:372: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:299:28: ( package_statement )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:372:28: ( package_statement )?
                 if ( stream_package_statement.hasNext() ) {
                     adaptor.addChild(root_1, stream_package_statement.next());
 
                 }
                 stream_package_statement.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:299:47: ( statement )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:372:47: ( statement )*
                 while ( stream_statement.hasNext() ) {
                     adaptor.addChild(root_1, stream_statement.next());
 
@@ -485,7 +564,7 @@
     };
 
     // $ANTLR start package_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:307:1: package_statement : package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:380: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);
@@ -502,22 +581,25 @@
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         RewriteRuleSubtreeStream stream_package_key=new RewriteRuleSubtreeStream(adaptor,"rule package_key");
         RewriteRuleSubtreeStream stream_package_id=new RewriteRuleSubtreeStream(adaptor,"rule package_id");
-         pushParaphrases(DroolsParaphareseTypes.PACKAGE); 
+         pushParaphrases(DroolsParaphraseTypes.PACKAGE); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:310:2: ( package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:310:4: package_key package_id ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:2: ( package_key package_id ( SEMICOLON )? -> ^( package_key package_id ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:384:2: package_key package_id ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_package_key_in_package_statement469);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.PACKAGE);	
+            }
+            pushFollow(FOLLOW_package_key_in_package_statement450);
             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_statement471);
+            pushFollow(FOLLOW_package_id_in_package_statement454);
             package_id5=package_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_package_id.add(package_id5.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:310:27: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:14: ( SEMICOLON )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -526,10 +608,10 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:310:27: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:14: SEMICOLON
                     {
                     SEMICOLON6=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_package_statement473); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_package_statement456); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON6);
 
 
@@ -538,6 +620,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON6, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
             // elements: package_id, package_key
@@ -550,9 +635,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 311:3: -> ^( package_key package_id )
+            // 388:3: -> ^( package_key package_id )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:311:6: ^( package_key package_id )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:6: ^( package_key package_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_package_key.nextNode(), root_1);
@@ -594,7 +679,7 @@
     };
 
     // $ANTLR start package_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:314:1: package_id : id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:391: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);
@@ -609,17 +694,17 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:315:2: (id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:315:4: id+= ID (id+= DOT id+= ID )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:392:2: (id+= ID (id+= DOT id+= ID )* -> ^( VT_PACKAGE_ID ( ID )+ ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:392:4: id+= ID (id+= DOT id+= ID )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_package_id497); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_package_id483); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:315:11: (id+= DOT id+= ID )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:392:11: (id+= DOT id+= ID )*
             loop4:
             do {
                 int alt4=2;
@@ -632,17 +717,17 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:315:13: id+= DOT id+= ID
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:392:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_package_id503); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_package_id489); 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_id507); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_package_id493); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -658,7 +743,8 @@
             } while (true);
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(DroolsParaphareseTypes.PACKAGE, buildStringFromTokens(list_id));	
+              	emit(list_id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(DroolsParaphraseTypes.PACKAGE, buildStringFromTokens(list_id));	
             }
 
             // AST REWRITE
@@ -672,9 +758,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 317:3: -> ^( VT_PACKAGE_ID ( ID )+ )
+            // 395:3: -> ^( VT_PACKAGE_ID ( ID )+ )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:317:6: ^( VT_PACKAGE_ID ( ID )+ )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:395: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);
@@ -720,7 +806,7 @@
     };
 
     // $ANTLR start statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:320:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:398: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);
@@ -748,17 +834,17 @@
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:323:3: ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401: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))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(!
 3, DroolsSoftKeywords.EXPIRES))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||((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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validat!
 eIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && v
alidateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsS!
 oftKeywords.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)))||((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, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((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)))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validate!
 LT(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))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.IMPORT))||(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.ACTIV!
 ATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP
))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))||((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)))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(va!
 lidateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))))) {
                 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))))) {
                     alt5=1;
                 }
-                else if ( (LA5_1==ID) && (((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.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)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((validateLT(1, Drool!
 sSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(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.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE!
 ))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||(validateIde
ntifierKey(DroolsSoftKeywords.IMPORT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((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(Drools!
 SoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, 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)))||((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.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
+                else if ( (LA5_1==ID) && (((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.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.DECLARE))&&(validateIdentifierKey!
 (DroolsSoftKeywords.DECLARE)))||(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))||((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)))||(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)))||((validateLT
(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||(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)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(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)))||((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, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, DroolsSoftKeywords.DEC!
 LARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((valida
teLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.DECLARE))&&(validateIdentifierKey(DroolsSoftKeywords.DECLARE)))||((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
                     int LA5_3 = input.LA(3);
 
                     if ( (((validateLT(1, "import") && validateLT(2, "function") )&&(validateIdentifierKey(DroolsSoftKeywords.IMPORT)))) ) {
@@ -788,19 +874,13 @@
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("320:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 3, input);
+                            new NoViableAltException("398: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==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
-                    alt5=1;
-                }
-                else if ( (LA5_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
-                    alt5=1;
-                }
-                else if ( (LA5_1==STRING) && (((validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, Drool!
 sSoftKeywords.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)))))) {
-                    int LA5_6 = input.LA(3);
+                else if ( (LA5_1==STRING) && ((((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.QUERY))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, Drool!
 sSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||(validateIdentifierKey(DroolsSoftKeywords.RULE))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))||((validateLT(1, DroolsSoftKeywords.TEMPLATE))&&(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE)))))) {
+                    int LA5_4 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.DIALECT))) ) {
                         alt5=1;
@@ -817,18 +897,24 @@
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("320:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 6, input);
+                            new NoViableAltException("398:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 4, input);
 
                         throw nvae;
                     }
                 }
+                else if ( (LA5_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+                    alt5=1;
+                }
+                else if ( (LA5_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
+                    alt5=1;
+                }
                 else if ( (LA5_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
                     alt5=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("320:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 1, input);
+                        new NoViableAltException("398:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 1, input);
 
                     throw nvae;
                 }
@@ -836,17 +922,20 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("320:1: statement options {k=2; } : ( rule_attribute | {...}? => function_import_statement | import_statement | global | function | {...}? => template | {...}? => type_declaration | rule | query );", 5, 0, input);
+                    new NoViableAltException("398: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 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:323:5: rule_attribute
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:402:2: rule_attribute
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_rule_attribute_in_statement545);
+                    if ( backtracking==0 ) {
+                      	beginSentence(DroolsSentenceType.RULE_ATTRIBUTE);	
+                    }
+                    pushFollow(FOLLOW_rule_attribute_in_statement537);
                     rule_attribute7=rule_attribute();
                     _fsp--;
                     if (failed) return retval;
@@ -855,7 +944,7 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:324:3: {...}? => function_import_statement
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:404:3: {...}? => function_import_statement
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -863,7 +952,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_statement544);
                     function_import_statement8=function_import_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -872,11 +961,11 @@
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:325:4: import_statement
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:405:4: import_statement
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_import_statement_in_statement558);
+                    pushFollow(FOLLOW_import_statement_in_statement550);
                     import_statement9=import_statement();
                     _fsp--;
                     if (failed) return retval;
@@ -885,11 +974,11 @@
                     }
                     break;
                 case 4 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:4: global
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:406:4: global
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_global_in_statement564);
+                    pushFollow(FOLLOW_global_in_statement556);
                     global10=global();
                     _fsp--;
                     if (failed) return retval;
@@ -898,11 +987,11 @@
                     }
                     break;
                 case 5 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:327:4: function
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:407:4: function
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_function_in_statement570);
+                    pushFollow(FOLLOW_function_in_statement562);
                     function11=function();
                     _fsp--;
                     if (failed) return retval;
@@ -911,7 +1000,7 @@
                     }
                     break;
                 case 6 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:328:4: {...}? => template
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:408:4: {...}? => template
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -919,7 +1008,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_statement570);
                     template12=template();
                     _fsp--;
                     if (failed) return retval;
@@ -928,7 +1017,7 @@
                     }
                     break;
                 case 7 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:329:4: {...}? => type_declaration
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:4: {...}? => type_declaration
                     {
                     root_0 = (Object)adaptor.nil();
 
@@ -936,7 +1025,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_statement578);
                     type_declaration13=type_declaration();
                     _fsp--;
                     if (failed) return retval;
@@ -945,11 +1034,11 @@
                     }
                     break;
                 case 8 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:330:4: rule
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:4: rule
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_rule_in_statement591);
+                    pushFollow(FOLLOW_rule_in_statement583);
                     rule14=rule();
                     _fsp--;
                     if (failed) return retval;
@@ -958,11 +1047,11 @@
                     }
                     break;
                 case 9 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:331:4: query
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:411:4: query
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_query_in_statement596);
+                    pushFollow(FOLLOW_query_in_statement588);
                     query15=query();
                     _fsp--;
                     if (failed) return retval;
@@ -995,7 +1084,7 @@
     };
 
     // $ANTLR start import_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:334:1: import_statement : import_key import_name[DroolsParaphareseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414: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);
@@ -1012,22 +1101,25 @@
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         RewriteRuleSubtreeStream stream_import_key=new RewriteRuleSubtreeStream(adaptor,"rule import_key");
         RewriteRuleSubtreeStream stream_import_name=new RewriteRuleSubtreeStream(adaptor,"rule import_name");
-         pushParaphrases(DroolsParaphareseTypes.IMPORT); 
+         pushParaphrases(DroolsParaphraseTypes.IMPORT); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:337:2: ( import_key import_name[DroolsParaphareseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:337:4: import_key import_name[DroolsParaphareseTypes.IMPORT] ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:417:2: ( import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )? -> ^( import_key import_name ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:418:2: import_key import_name[DroolsParaphraseTypes.IMPORT] ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_import_key_in_import_statement618);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.IMPORT_STATEMENT);	
+            }
+            pushFollow(FOLLOW_import_key_in_import_statement615);
             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_statement620);
-            import_name17=import_name(DroolsParaphareseTypes.IMPORT);
+            pushFollow(FOLLOW_import_name_in_import_statement617);
+            import_name17=import_name(DroolsParaphraseTypes.IMPORT);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_name.add(import_name17.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:337:58: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:56: ( SEMICOLON )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1036,10 +1128,10 @@
             }
             switch (alt6) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:337:58: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:56: SEMICOLON
                     {
                     SEMICOLON18=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_import_statement623); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_import_statement620); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON18);
 
 
@@ -1048,9 +1140,12 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON18, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: import_key, import_name
+            // elements: import_name, import_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1060,9 +1155,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 338:3: -> ^( import_key import_name )
+            // 421:3: -> ^( import_key import_name )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:338:6: ^( import_key import_name )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:421:6: ^( import_key import_name )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_import_key.nextNode(), root_1);
@@ -1104,7 +1199,7 @@
     };
 
     // $ANTLR start function_import_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:341:1: function_import_statement : imp= import_key function_key import_name[DroolsParaphareseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:424: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);
@@ -1124,27 +1219,30 @@
         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(DroolsParaphareseTypes.FUNCTION_IMPORT); 
+         pushParaphrases(DroolsParaphraseTypes.FUNCTION_IMPORT); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:344:2: (imp= import_key function_key import_name[DroolsParaphareseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:344:4: imp= import_key function_key import_name[DroolsParaphareseTypes.FUNCTION_IMPORT] ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:427:2: (imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )? -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:428:2: imp= import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_import_key_in_function_import_statement658);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.FUNCTION_IMPORT_STATEMENT);	
+            }
+            pushFollow(FOLLOW_import_key_in_function_import_statement663);
             imp=import_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_key.add(imp.getTree());
-            pushFollow(FOLLOW_function_key_in_function_import_statement660);
+            pushFollow(FOLLOW_function_key_in_function_import_statement665);
             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_statement662);
-            import_name20=import_name(DroolsParaphareseTypes.FUNCTION_IMPORT);
+            pushFollow(FOLLOW_import_name_in_function_import_statement667);
+            import_name20=import_name(DroolsParaphraseTypes.FUNCTION_IMPORT);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_import_name.add(import_name20.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:344:84: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:429:82: ( SEMICOLON )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1153,10 +1251,10 @@
             }
             switch (alt7) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:344:84: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:429:82: SEMICOLON
                     {
                     SEMICOLON21=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_function_import_statement665); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_function_import_statement670); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON21);
 
 
@@ -1165,9 +1263,12 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON21, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: import_name, function_key
+            // elements: function_key, import_name
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1177,9 +1278,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 345:3: -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
+            // 431:3: -> ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:345:6: ^( VT_FUNCTION_IMPORT[$imp.start] function_key import_name )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431: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);
@@ -1222,8 +1323,8 @@
     };
 
     // $ANTLR start import_name
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:348:1: import_name[int importType] : id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) ;
-    public final import_name_return import_name(int importType) throws RecognitionException {
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:434: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);
 
@@ -1238,17 +1339,17 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:2: (id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:4: id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:2: (id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )? -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:4: id+= ID (id+= DOT id+= ID )* (id+= DOT_STAR )?
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_import_name694); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_import_name704); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:11: (id+= DOT id+= ID )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:11: (id+= DOT id+= ID )*
             loop8:
             do {
                 int alt8=2;
@@ -1261,17 +1362,17 @@
 
                 switch (alt8) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:13: id+= DOT id+= ID
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_import_name700); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_import_name710); 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_name704); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_import_name714); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -1286,7 +1387,7 @@
                 }
             } while (true);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:33: (id+= DOT_STAR )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:33: (id+= DOT_STAR )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1295,10 +1396,10 @@
             }
             switch (alt9) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:33: id+= DOT_STAR
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:33: id+= DOT_STAR
                     {
                     id=(Token)input.LT(1);
-                    match(input,DOT_STAR,FOLLOW_DOT_STAR_in_import_name711); if (failed) return retval;
+                    match(input,DOT_STAR,FOLLOW_DOT_STAR_in_import_name721); if (failed) return retval;
                     if ( backtracking==0 ) stream_DOT_STAR.add(id);
 
                     if (list_id==null) list_id=new ArrayList();
@@ -1311,7 +1412,8 @@
             }
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(importType, buildStringFromTokens(list_id));	
+              	emit(list_id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(importType, buildStringFromTokens(list_id));	
             }
 
             // AST REWRITE
@@ -1325,9 +1427,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 351:3: -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
+            // 438:3: -> ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:351:6: ^( VT_IMPORT_ID ( ID )+ ( DOT_STAR )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:438: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);
@@ -1340,7 +1442,7 @@
 
                 }
                 stream_ID.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:351:25: ( DOT_STAR )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:438:25: ( DOT_STAR )?
                 if ( stream_DOT_STAR.hasNext() ) {
                     adaptor.addChild(root_1, stream_DOT_STAR.next());
 
@@ -1379,7 +1481,7 @@
     };
 
     // $ANTLR start global
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:354:1: global : global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:441: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);
@@ -1399,27 +1501,30 @@
         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(DroolsParaphareseTypes.GLOBAL); 
+         pushParaphrases(DroolsParaphraseTypes.GLOBAL); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:357:2: ( global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:357:4: global_key data_type global_id ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:444:2: ( global_key data_type global_id ( SEMICOLON )? -> ^( global_key data_type global_id ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:445:2: global_key data_type global_id ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_global_key_in_global751);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.GLOBAL);	
+            }
+            pushFollow(FOLLOW_global_key_in_global766);
             global_key22=global_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_global_key.add(global_key22.getTree());
-            pushFollow(FOLLOW_data_type_in_global753);
+            pushFollow(FOLLOW_data_type_in_global768);
             data_type23=data_type();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_data_type.add(data_type23.getTree());
-            pushFollow(FOLLOW_global_id_in_global755);
+            pushFollow(FOLLOW_global_id_in_global770);
             global_id24=global_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_global_id.add(global_id24.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:357:35: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:446:34: ( SEMICOLON )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1428,10 +1533,10 @@
             }
             switch (alt10) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:357:35: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:446:34: SEMICOLON
                     {
                     SEMICOLON25=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_global757); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_global772); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON25);
 
 
@@ -1440,9 +1545,12 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON25, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: data_type, global_id, global_key
+            // elements: global_key, data_type, global_id
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1452,9 +1560,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 358:3: -> ^( global_key data_type global_id )
+            // 448:3: -> ^( global_key data_type global_id )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:358:6: ^( global_key data_type global_id )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:448:6: ^( global_key data_type global_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_global_key.nextNode(), root_1);
@@ -1497,7 +1605,7 @@
     };
 
     // $ANTLR start global_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:1: global_id : id= ID -> VT_GLOBAL_ID[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451: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);
@@ -1510,15 +1618,16 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:362:2: (id= ID -> VT_GLOBAL_ID[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:362:4: id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:2: (id= ID -> VT_GLOBAL_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_global_id783); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_global_id801); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(DroolsParaphareseTypes.GLOBAL, id.getText());	
+              	emit(id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(DroolsParaphraseTypes.GLOBAL, id.getText());	
             }
 
             // AST REWRITE
@@ -1532,7 +1641,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 364:3: -> VT_GLOBAL_ID[$id]
+            // 455:3: -> VT_GLOBAL_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_GLOBAL_ID, id));
 
@@ -1565,7 +1674,7 @@
     };
 
     // $ANTLR start function
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:367:1: function : function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:458: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);
@@ -1588,17 +1697,20 @@
         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(DroolsParaphareseTypes.FUNCTION); 
+         pushParaphrases(DroolsParaphraseTypes.FUNCTION); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:2: ( function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:4: function_key ( data_type )? function_id parameters curly_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:461:2: ( function_key ( data_type )? function_id parameters curly_chunk -> ^( function_key ( data_type )? function_id parameters curly_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:462:2: function_key ( data_type )? function_id parameters curly_chunk
             {
-            pushFollow(FOLLOW_function_key_in_function815);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.FUNCTION);	
+            }
+            pushFollow(FOLLOW_function_key_in_function838);
             function_key26=function_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_function_key.add(function_key26.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:17: ( data_type )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:463:16: ( data_type )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1611,9 +1723,9 @@
             }
             switch (alt11) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:370:17: data_type
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:463:16: data_type
                     {
-                    pushFollow(FOLLOW_data_type_in_function817);
+                    pushFollow(FOLLOW_data_type_in_function840);
                     data_type27=data_type();
                     _fsp--;
                     if (failed) return retval;
@@ -1624,24 +1736,24 @@
 
             }
 
-            pushFollow(FOLLOW_function_id_in_function820);
+            pushFollow(FOLLOW_function_id_in_function843);
             function_id28=function_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_function_id.add(function_id28.getTree());
-            pushFollow(FOLLOW_parameters_in_function822);
+            pushFollow(FOLLOW_parameters_in_function845);
             parameters29=parameters();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_parameters.add(parameters29.getTree());
-            pushFollow(FOLLOW_curly_chunk_in_function824);
+            pushFollow(FOLLOW_curly_chunk_in_function847);
             curly_chunk30=curly_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_curly_chunk.add(curly_chunk30.getTree());
 
             // AST REWRITE
-            // elements: curly_chunk, data_type, function_key, function_id, parameters
+            // elements: data_type, function_id, function_key, parameters, curly_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1651,14 +1763,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 371:3: -> ^( function_key ( data_type )? function_id parameters curly_chunk )
+            // 464:3: -> ^( function_key ( data_type )? function_id parameters curly_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:371:6: ^( function_key ( data_type )? function_id parameters curly_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:464: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:371:21: ( data_type )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:464:21: ( data_type )?
                 if ( stream_data_type.hasNext() ) {
                     adaptor.addChild(root_1, stream_data_type.next());
 
@@ -1703,7 +1815,7 @@
     };
 
     // $ANTLR start function_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:374:1: function_id : id= ID -> VT_FUNCTION_ID[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:467: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);
@@ -1716,15 +1828,16 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:375:2: (id= ID -> VT_FUNCTION_ID[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:375:4: id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:2: (id= ID -> VT_FUNCTION_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_function_id854); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function_id877); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(DroolsParaphareseTypes.FUNCTION, id.getText());	
+              	emit(id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(DroolsParaphraseTypes.FUNCTION, id.getText());	
             }
 
             // AST REWRITE
@@ -1738,7 +1851,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 377:3: -> VT_FUNCTION_ID[$id]
+            // 471:3: -> VT_FUNCTION_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_FUNCTION_ID, id));
 
@@ -1771,7 +1884,7 @@
     };
 
     // $ANTLR start query
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:380:1: query : query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:474: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);
@@ -1797,29 +1910,35 @@
         RewriteRuleSubtreeStream stream_query_key=new RewriteRuleSubtreeStream(adaptor,"rule query_key");
         RewriteRuleSubtreeStream stream_normal_lhs_block=new RewriteRuleSubtreeStream(adaptor,"rule normal_lhs_block");
         RewriteRuleSubtreeStream stream_query_id=new RewriteRuleSubtreeStream(adaptor,"rule query_id");
-         pushParaphrases(DroolsParaphareseTypes.QUERY); 
+         pushParaphrases(DroolsParaphraseTypes.QUERY); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:2: ( query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:4: query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:477:2: ( query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )? -> ^( query_key query_id ( parameters )? normal_lhs_block END ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:478:2: query_key query_id ( parameters )? normal_lhs_block END ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_query_key_in_query886);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.QUERY);	
+            }
+            pushFollow(FOLLOW_query_key_in_query914);
             query_key31=query_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_query_key.add(query_key31.getTree());
-            pushFollow(FOLLOW_query_id_in_query888);
+            pushFollow(FOLLOW_query_id_in_query916);
             query_id32=query_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_query_id.add(query_id32.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:23: ( parameters )?
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_RULE_HEADER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:481:3: ( parameters )?
             int alt12=2;
             alt12 = dfa12.predict(input);
             switch (alt12) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:23: parameters
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:481:3: parameters
                     {
-                    pushFollow(FOLLOW_parameters_in_query890);
+                    pushFollow(FOLLOW_parameters_in_query924);
                     parameters33=parameters();
                     _fsp--;
                     if (failed) return retval;
@@ -1830,16 +1949,19 @@
 
             }
 
-            pushFollow(FOLLOW_normal_lhs_block_in_query893);
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
+            }
+            pushFollow(FOLLOW_normal_lhs_block_in_query933);
             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_query895); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_query938); if (failed) return retval;
             if ( backtracking==0 ) stream_END.add(END35);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:56: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:484:7: ( SEMICOLON )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1848,10 +1970,10 @@
             }
             switch (alt13) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:56: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:484:7: SEMICOLON
                     {
                     SEMICOLON36=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_query897); if (failed) return retval;
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_query940); if (failed) return retval;
                     if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON36);
 
 
@@ -1860,9 +1982,13 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(END35, DroolsEditorType.KEYWORD);
+              		emit(SEMICOLON36, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: normal_lhs_block, query_key, query_id, END, parameters
+            // elements: query_id, END, parameters, query_key, normal_lhs_block
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1872,15 +1998,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 384:3: -> ^( query_key query_id ( parameters )? normal_lhs_block END )
+            // 487:3: -> ^( query_key query_id ( parameters )? normal_lhs_block END )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:384:6: ^( query_key query_id ( parameters )? normal_lhs_block END )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:384:27: ( parameters )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:27: ( parameters )?
                 if ( stream_parameters.hasNext() ) {
                     adaptor.addChild(root_1, stream_parameters.next());
 
@@ -1924,7 +2050,7 @@
     };
 
     // $ANTLR start query_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:490: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);
@@ -1938,7 +2064,7 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:2: (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:2: (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] )
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -1951,20 +2077,21 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("387:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );", 14, 0, input);
+                    new NoViableAltException("490:1: query_id : (id= ID -> VT_QUERY_ID[$id] | id= STRING -> VT_QUERY_ID[$id] );", 14, 0, input);
 
                 throw nvae;
             }
             switch (alt14) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:5: id= ID
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_query_id929); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_query_id975); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.QUERY, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.QUERY, id.getText());	
                     }
 
                     // AST REWRITE
@@ -1978,7 +2105,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 389:67: -> VT_QUERY_ID[$id]
+                    // 493:65: -> VT_QUERY_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_QUERY_ID, id));
 
@@ -1989,14 +2116,15 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:390:5: id= STRING
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:494:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_query_id945); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_query_id991); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.QUERY, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.QUERY, id.getText());	
                     }
 
                     // AST REWRITE
@@ -2010,7 +2138,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 391:67: -> VT_QUERY_ID[$id]
+                    // 496:65: -> VT_QUERY_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_QUERY_ID, id));
 
@@ -2045,7 +2173,7 @@
     };
 
     // $ANTLR start parameters
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:394:1: parameters : LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:499: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);
@@ -2068,14 +2196,17 @@
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_param_definition=new RewriteRuleSubtreeStream(adaptor,"rule param_definition");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:395:2: ( LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:395:4: LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:500:2: ( LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:500:4: LEFT_PAREN ( param_definition ( COMMA param_definition )* )? RIGHT_PAREN
             {
             LEFT_PAREN37=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parameters964); if (failed) return retval;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_parameters1010); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN37);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:396:4: ( param_definition ( COMMA param_definition )* )?
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN37, DroolsEditorType.SYMBOL);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:4: ( param_definition ( COMMA param_definition )* )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -2084,14 +2215,14 @@
             }
             switch (alt16) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:396:6: param_definition ( COMMA param_definition )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:6: param_definition ( COMMA param_definition )*
                     {
-                    pushFollow(FOLLOW_param_definition_in_parameters971);
+                    pushFollow(FOLLOW_param_definition_in_parameters1019);
                     param_definition38=param_definition();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_param_definition.add(param_definition38.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:396:23: ( COMMA param_definition )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:23: ( COMMA param_definition )*
                     loop15:
                     do {
                         int alt15=2;
@@ -2104,13 +2235,16 @@
 
                         switch (alt15) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:396:24: COMMA param_definition
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:24: COMMA param_definition
                     	    {
                     	    COMMA39=(Token)input.LT(1);
-                    	    match(input,COMMA,FOLLOW_COMMA_in_parameters974); if (failed) return retval;
+                    	    match(input,COMMA,FOLLOW_COMMA_in_parameters1022); if (failed) return retval;
                     	    if ( backtracking==0 ) stream_COMMA.add(COMMA39);
 
-                    	    pushFollow(FOLLOW_param_definition_in_parameters976);
+                    	    if ( backtracking==0 ) {
+                    	      	emit(COMMA39, DroolsEditorType.SYMBOL);	
+                    	    }
+                    	    pushFollow(FOLLOW_param_definition_in_parameters1026);
                     	    param_definition40=param_definition();
                     	    _fsp--;
                     	    if (failed) return retval;
@@ -2131,12 +2265,15 @@
             }
 
             RIGHT_PAREN41=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parameters985); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_parameters1035); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN41);
 
+            if ( backtracking==0 ) {
+              	emit(RIGHT_PAREN41, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: RIGHT_PAREN, param_definition
+            // elements: param_definition, RIGHT_PAREN
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2146,14 +2283,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 398:3: -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
+            // 503:3: -> ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:398:6: ^( VT_PARAM_LIST ( param_definition )* RIGHT_PAREN )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:503: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:398:22: ( param_definition )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:503:22: ( param_definition )*
                 while ( stream_param_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_param_definition.next());
 
@@ -2193,7 +2330,7 @@
     };
 
     // $ANTLR start param_definition
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401:1: param_definition : ( data_type )? argument ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:506: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);
@@ -2207,19 +2344,19 @@
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:402:2: ( ( data_type )? argument )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:402:4: ( data_type )? argument
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:507:2: ( ( data_type )? argument )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:507:4: ( data_type )? argument
             {
             root_0 = (Object)adaptor.nil();
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:402:4: ( data_type )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:507:4: ( data_type )?
             int alt17=2;
             alt17 = dfa17.predict(input);
             switch (alt17) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:402:4: data_type
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:507:4: data_type
                     {
-                    pushFollow(FOLLOW_data_type_in_param_definition1009);
+                    pushFollow(FOLLOW_data_type_in_param_definition1061);
                     data_type42=data_type();
                     _fsp--;
                     if (failed) return retval;
@@ -2230,7 +2367,7 @@
 
             }
 
-            pushFollow(FOLLOW_argument_in_param_definition1012);
+            pushFollow(FOLLOW_argument_in_param_definition1064);
             argument43=argument();
             _fsp--;
             if (failed) return retval;
@@ -2261,7 +2398,7 @@
     };
 
     // $ANTLR start argument
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:405:1: argument : ID ( dimension_definition )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:510:1: argument : ID ( dimension_definition )* ;
     public final argument_return argument() throws RecognitionException {
         argument_return retval = new argument_return();
         retval.start = input.LT(1);
@@ -2275,18 +2412,21 @@
         Object ID44_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:406:2: ( ID ( dimension_definition )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:406:4: ID ( dimension_definition )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:2: ( ID ( dimension_definition )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:4: ID ( dimension_definition )*
             {
             root_0 = (Object)adaptor.nil();
 
             ID44=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_argument1023); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_argument1075); if (failed) return retval;
             if ( backtracking==0 ) {
             ID44_tree = (Object)adaptor.create(ID44);
             adaptor.addChild(root_0, ID44_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:406:7: ( dimension_definition )*
+            if ( backtracking==0 ) {
+              	emit(ID44, DroolsEditorType.IDENTIFIER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:512:3: ( dimension_definition )*
             loop18:
             do {
                 int alt18=2;
@@ -2299,9 +2439,9 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:406:7: dimension_definition
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:512:3: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_argument1025);
+            	    pushFollow(FOLLOW_dimension_definition_in_argument1081);
             	    dimension_definition45=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2341,7 +2481,7 @@
     };
 
     // $ANTLR start type_declaration
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:1: type_declaration : declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:515: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);
@@ -2364,22 +2504,25 @@
         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(DroolsParaphareseTypes.TYPE_DECLARE); 
+         pushParaphrases(DroolsParaphraseTypes.TYPE_DECLARE); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:2: ( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:4: declare_key type_declare_id ( decl_metadata )* ( decl_field )* END
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:518:2: ( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:519:2: declare_key type_declare_id ( decl_metadata )* ( decl_field )* END
             {
-            pushFollow(FOLLOW_declare_key_in_type_declaration1048);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.TYPE_DECLARATION);	
+            }
+            pushFollow(FOLLOW_declare_key_in_type_declaration1109);
             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_declaration1051);
+            pushFollow(FOLLOW_type_declare_id_in_type_declaration1112);
             type_declare_id47=type_declare_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_type_declare_id.add(type_declare_id47.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:3: ( decl_metadata )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:3: ( decl_metadata )*
             loop19:
             do {
                 int alt19=2;
@@ -2392,9 +2535,9 @@
 
                 switch (alt19) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:3: decl_metadata
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:3: decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration1055);
+            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration1116);
             	    decl_metadata48=decl_metadata();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2408,7 +2551,7 @@
                 }
             } while (true);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:3: ( decl_field )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:522:3: ( decl_field )*
             loop20:
             do {
                 int alt20=2;
@@ -2421,9 +2564,9 @@
 
                 switch (alt20) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:3: decl_field
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:522:3: decl_field
             	    {
-            	    pushFollow(FOLLOW_decl_field_in_type_declaration1060);
+            	    pushFollow(FOLLOW_decl_field_in_type_declaration1121);
             	    decl_field49=decl_field();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2438,12 +2581,15 @@
             } while (true);
 
             END50=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_type_declaration1065); if (failed) return retval;
+            match(input,END,FOLLOW_END_in_type_declaration1126); if (failed) return retval;
             if ( backtracking==0 ) stream_END.add(END50);
 
+            if ( backtracking==0 ) {
+              	emit(END50, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
-            // elements: decl_metadata, decl_field, END, declare_key, type_declare_id
+            // elements: decl_metadata, type_declare_id, declare_key, END, decl_field
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2453,21 +2599,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 416:3: -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
+            // 525:3: -> ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:416:6: ^( declare_key type_declare_id ( decl_metadata )* ( decl_field )* END )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:416:36: ( decl_metadata )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525:36: ( decl_metadata )*
                 while ( stream_decl_metadata.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_metadata.next());
 
                 }
                 stream_decl_metadata.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:416:51: ( decl_field )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525:51: ( decl_field )*
                 while ( stream_decl_field.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_field.next());
 
@@ -2510,7 +2656,7 @@
     };
 
     // $ANTLR start type_declare_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:1: type_declare_id : id= ID -> VT_TYPE_DECLARE_ID[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528: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);
@@ -2523,15 +2669,16 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:420:2: (id= ID -> VT_TYPE_DECLARE_ID[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:420:5: id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:529:2: (id= ID -> VT_TYPE_DECLARE_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:529:5: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_type_declare_id1097); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_type_declare_id1161); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(DroolsParaphareseTypes.TYPE_DECLARE, id.getText());	
+              	emit(id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(DroolsParaphraseTypes.TYPE_DECLARE, id.getText());	
             }
 
             // AST REWRITE
@@ -2545,7 +2692,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 421:74: -> VT_TYPE_DECLARE_ID[$id]
+            // 531:72: -> VT_TYPE_DECLARE_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_TYPE_DECLARE_ID, id));
 
@@ -2578,7 +2725,7 @@
     };
 
     // $ANTLR start decl_metadata
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:424:1: decl_metadata : AT ID paren_chunk -> ^( AT ID paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:534: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);
@@ -2596,25 +2743,31 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:425:2: ( AT ID paren_chunk -> ^( AT ID paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:425:4: AT ID paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:2: ( AT ID paren_chunk -> ^( AT ID paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:4: AT ID paren_chunk
             {
             AT51=(Token)input.LT(1);
-            match(input,AT,FOLLOW_AT_in_decl_metadata1116); if (failed) return retval;
+            match(input,AT,FOLLOW_AT_in_decl_metadata1180); 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_metadata1118); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_decl_metadata1188); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID52);
 
-            pushFollow(FOLLOW_paren_chunk_in_decl_metadata1120);
+            if ( backtracking==0 ) {
+              	emit(ID52, DroolsEditorType.IDENTIFIER);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_decl_metadata1195);
             paren_chunk53=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk53.getTree());
 
             // AST REWRITE
-            // elements: ID, AT, paren_chunk
+            // elements: AT, ID, paren_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2624,9 +2777,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 426:3: -> ^( AT ID paren_chunk )
+            // 540:3: -> ^( AT ID paren_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:426:6: ^( AT ID paren_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:6: ^( AT ID paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_AT.next(), root_1);
@@ -2666,7 +2819,7 @@
     };
 
     // $ANTLR start decl_field
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:429:1: decl_field : ID ( decl_field_initialization )? COLON data_type ( decl_metadata )* -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:543: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);
@@ -2690,14 +2843,17 @@
         RewriteRuleSubtreeStream stream_decl_field_initialization=new RewriteRuleSubtreeStream(adaptor,"rule decl_field_initialization");
         RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:430:2: ( ID ( decl_field_initialization )? COLON data_type ( decl_metadata )* -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:430:4: ID ( decl_field_initialization )? COLON data_type ( decl_metadata )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:2: ( ID ( decl_field_initialization )? COLON data_type ( decl_metadata )* -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:4: ID ( decl_field_initialization )? COLON data_type ( decl_metadata )*
             {
             ID54=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_decl_field1143); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_decl_field1218); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(ID54);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:430:7: ( decl_field_initialization )?
+            if ( backtracking==0 ) {
+              	emit(ID54, DroolsEditorType.IDENTIFIER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:545:3: ( decl_field_initialization )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -2706,9 +2862,9 @@
             }
             switch (alt21) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:430:7: decl_field_initialization
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:545:3: decl_field_initialization
                     {
-                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field1145);
+                    pushFollow(FOLLOW_decl_field_initialization_in_decl_field1224);
                     decl_field_initialization55=decl_field_initialization();
                     _fsp--;
                     if (failed) return retval;
@@ -2720,15 +2876,18 @@
             }
 
             COLON56=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_decl_field1148); if (failed) return retval;
+            match(input,COLON,FOLLOW_COLON_in_decl_field1230); if (failed) return retval;
             if ( backtracking==0 ) stream_COLON.add(COLON56);
 
-            pushFollow(FOLLOW_data_type_in_decl_field1150);
+            if ( backtracking==0 ) {
+              	emit(COLON56, DroolsEditorType.SYMBOL);	
+            }
+            pushFollow(FOLLOW_data_type_in_decl_field1236);
             data_type57=data_type();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_data_type.add(data_type57.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:3: ( decl_metadata )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:548:3: ( decl_metadata )*
             loop22:
             do {
                 int alt22=2;
@@ -2741,9 +2900,9 @@
 
                 switch (alt22) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:3: decl_metadata
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:548:3: decl_metadata
             	    {
-            	    pushFollow(FOLLOW_decl_metadata_in_decl_field1154);
+            	    pushFollow(FOLLOW_decl_metadata_in_decl_field1240);
             	    decl_metadata58=decl_metadata();
             	    _fsp--;
             	    if (failed) return retval;
@@ -2759,7 +2918,7 @@
 
 
             // AST REWRITE
-            // elements: decl_field_initialization, data_type, ID, decl_metadata
+            // elements: ID, data_type, decl_metadata, decl_field_initialization
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2769,21 +2928,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 432:3: -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
+            // 549:3: -> ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:432:6: ^( ID ( decl_field_initialization )? data_type ( decl_metadata )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:549: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:432:11: ( decl_field_initialization )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:549: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:432:48: ( decl_metadata )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:549:48: ( decl_metadata )*
                 while ( stream_decl_metadata.hasNext() ) {
                     adaptor.addChild(root_1, stream_decl_metadata.next());
 
@@ -2822,7 +2981,7 @@
     };
 
     // $ANTLR start decl_field_initialization
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:1: decl_field_initialization : EQUALS paren_chunk -> ^( EQUALS paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552: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);
@@ -2837,14 +2996,17 @@
         RewriteRuleTokenStream stream_EQUALS=new RewriteRuleTokenStream(adaptor,"token EQUALS");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:436:2: ( EQUALS paren_chunk -> ^( EQUALS paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:436:4: EQUALS paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:553:2: ( EQUALS paren_chunk -> ^( EQUALS paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:553:4: EQUALS paren_chunk
             {
             EQUALS59=(Token)input.LT(1);
-            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization1182); if (failed) return retval;
+            match(input,EQUALS,FOLLOW_EQUALS_in_decl_field_initialization1268); if (failed) return retval;
             if ( backtracking==0 ) stream_EQUALS.add(EQUALS59);
 
-            pushFollow(FOLLOW_paren_chunk_in_decl_field_initialization1184);
+            if ( backtracking==0 ) {
+              	emit(EQUALS59, DroolsEditorType.SYMBOL);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_decl_field_initialization1274);
             paren_chunk60=paren_chunk();
             _fsp--;
             if (failed) return retval;
@@ -2861,9 +3023,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 437:2: -> ^( EQUALS paren_chunk )
+            // 555:2: -> ^( EQUALS paren_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:437:5: ^( EQUALS paren_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:555:5: ^( EQUALS paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_EQUALS.next(), root_1);
@@ -2902,47 +3064,50 @@
     };
 
     // $ANTLR start template
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:1: template : template_key template_id ( SEMICOLON )? ( template_slot )+ END ( SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558: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);
 
         Object root_0 = null;
 
-        Token SEMICOLON63=null;
-        Token END65=null;
-        Token SEMICOLON66=null;
+        Token semi1=null;
+        Token semi2=null;
+        Token END64=null;
         template_key_return template_key61 = null;
 
         template_id_return template_id62 = null;
 
-        template_slot_return template_slot64 = null;
+        template_slot_return template_slot63 = null;
 
 
-        Object SEMICOLON63_tree=null;
-        Object END65_tree=null;
-        Object SEMICOLON66_tree=null;
+        Object semi1_tree=null;
+        Object semi2_tree=null;
+        Object END64_tree=null;
         RewriteRuleTokenStream stream_END=new RewriteRuleTokenStream(adaptor,"token END");
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         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(DroolsParaphareseTypes.TEMPLATE); 
+         pushParaphrases(DroolsParaphraseTypes.TEMPLATE); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:2: ( template_key template_id ( SEMICOLON )? ( template_slot )+ END ( SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:4: template_key template_id ( SEMICOLON )? ( template_slot )+ END ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:561:2: ( template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )? -> ^( template_key template_id ( template_slot )+ END ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:562:2: template_key template_id (semi1= SEMICOLON )? ( template_slot )+ END (semi2= SEMICOLON )?
             {
-            pushFollow(FOLLOW_template_key_in_template1215);
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.TEMPLATE);	
+            }
+            pushFollow(FOLLOW_template_key_in_template1311);
             template_key61=template_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_template_key.add(template_key61.getTree());
-            pushFollow(FOLLOW_template_id_in_template1217);
+            pushFollow(FOLLOW_template_id_in_template1313);
             template_id62=template_id();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_template_id.add(template_id62.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:29: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:564:8: (semi1= SEMICOLON )?
             int alt23=2;
             int LA23_0 = input.LA(1);
 
@@ -2951,11 +3116,11 @@
             }
             switch (alt23) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:29: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:564:8: semi1= SEMICOLON
                     {
-                    SEMICOLON63=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1219); if (failed) return retval;
-                    if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON63);
+                    semi1=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1320); if (failed) return retval;
+                    if ( backtracking==0 ) stream_SEMICOLON.add(semi1);
 
 
                     }
@@ -2963,7 +3128,10 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:444:3: ( template_slot )+
+            if ( backtracking==0 ) {
+              	emit(semi1, DroolsEditorType.SYMBOL);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:566:3: ( template_slot )+
             int cnt24=0;
             loop24:
             do {
@@ -2977,13 +3145,13 @@
 
                 switch (alt24) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:444:3: template_slot
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:566:3: template_slot
             	    {
-            	    pushFollow(FOLLOW_template_slot_in_template1224);
-            	    template_slot64=template_slot();
+            	    pushFollow(FOLLOW_template_slot_in_template1328);
+            	    template_slot63=template_slot();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_template_slot.add(template_slot64.getTree());
+            	    if ( backtracking==0 ) stream_template_slot.add(template_slot63.getTree());
 
             	    }
             	    break;
@@ -2998,11 +3166,11 @@
                 cnt24++;
             } while (true);
 
-            END65=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template1229); if (failed) return retval;
-            if ( backtracking==0 ) stream_END.add(END65);
+            END64=(Token)input.LT(1);
+            match(input,END,FOLLOW_END_in_template1333); if (failed) return retval;
+            if ( backtracking==0 ) stream_END.add(END64);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:445:7: ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:567:12: (semi2= SEMICOLON )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -3011,11 +3179,11 @@
             }
             switch (alt25) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:445:7: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:567:12: semi2= SEMICOLON
                     {
-                    SEMICOLON66=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1231); if (failed) return retval;
-                    if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON66);
+                    semi2=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template1337); if (failed) return retval;
+                    if ( backtracking==0 ) stream_SEMICOLON.add(semi2);
 
 
                     }
@@ -3023,9 +3191,13 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(END64, DroolsEditorType.KEYWORD);
+              		emit(semi2, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: template_slot, template_id, END, template_key
+            // elements: END, template_id, template_slot, template_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3035,9 +3207,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 446:3: -> ^( template_key template_id ( template_slot )+ END )
+            // 570:3: -> ^( template_key template_id ( template_slot )+ END )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:446:6: ^( template_key template_id ( template_slot )+ END )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570: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);
@@ -3088,7 +3260,7 @@
     };
 
     // $ANTLR start template_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:449:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573: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);
@@ -3102,7 +3274,7 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:450:2: (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:574:2: (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -3115,20 +3287,21 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("449:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );", 26, 0, input);
+                    new NoViableAltException("573:1: template_id : (id= ID -> VT_TEMPLATE_ID[$id] | id= STRING -> VT_TEMPLATE_ID[$id] );", 26, 0, input);
 
                 throw nvae;
             }
             switch (alt26) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:450:5: id= ID
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:574:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_template_id1261); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_template_id1370); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.TEMPLATE, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.TEMPLATE, id.getText());	
                     }
 
                     // AST REWRITE
@@ -3142,7 +3315,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 451:70: -> VT_TEMPLATE_ID[$id]
+                    // 576:68: -> VT_TEMPLATE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_TEMPLATE_ID, id));
 
@@ -3153,14 +3326,15 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:5: id= STRING
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:577:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_template_id1277); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_template_id1386); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.TEMPLATE, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.TEMPLATE, id.getText());	
                     }
 
                     // AST REWRITE
@@ -3174,7 +3348,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 453:70: -> VT_TEMPLATE_ID[$id]
+                    // 579:68: -> VT_TEMPLATE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_TEMPLATE_ID, id));
 
@@ -3209,38 +3383,38 @@
     };
 
     // $ANTLR start template_slot
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:456:1: template_slot : data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582: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);
 
         Object root_0 = null;
 
-        Token SEMICOLON69=null;
-        data_type_return data_type67 = null;
+        Token SEMICOLON67=null;
+        data_type_return data_type65 = null;
 
-        slot_id_return slot_id68 = null;
+        slot_id_return slot_id66 = null;
 
 
-        Object SEMICOLON69_tree=null;
+        Object SEMICOLON67_tree=null;
         RewriteRuleTokenStream stream_SEMICOLON=new RewriteRuleTokenStream(adaptor,"token SEMICOLON");
         RewriteRuleSubtreeStream stream_slot_id=new RewriteRuleSubtreeStream(adaptor,"rule slot_id");
         RewriteRuleSubtreeStream stream_data_type=new RewriteRuleSubtreeStream(adaptor,"rule data_type");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:457:2: ( data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:457:5: data_type slot_id ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:2: ( data_type slot_id ( SEMICOLON )? -> ^( VT_SLOT data_type slot_id ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:5: data_type slot_id ( SEMICOLON )?
             {
-            pushFollow(FOLLOW_data_type_in_template_slot1297);
-            data_type67=data_type();
+            pushFollow(FOLLOW_data_type_in_template_slot1406);
+            data_type65=data_type();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_data_type.add(data_type67.getTree());
-            pushFollow(FOLLOW_slot_id_in_template_slot1299);
-            slot_id68=slot_id();
+            if ( backtracking==0 ) stream_data_type.add(data_type65.getTree());
+            pushFollow(FOLLOW_slot_id_in_template_slot1408);
+            slot_id66=slot_id();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_slot_id.add(slot_id68.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:457:23: ( SEMICOLON )?
+            if ( backtracking==0 ) stream_slot_id.add(slot_id66.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:23: ( SEMICOLON )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -3249,11 +3423,11 @@
             }
             switch (alt27) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:457:23: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:23: SEMICOLON
                     {
-                    SEMICOLON69=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template_slot1301); if (failed) return retval;
-                    if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON69);
+                    SEMICOLON67=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_template_slot1410); if (failed) return retval;
+                    if ( backtracking==0 ) stream_SEMICOLON.add(SEMICOLON67);
 
 
                     }
@@ -3261,6 +3435,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON67, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
             // elements: data_type, slot_id
@@ -3273,9 +3450,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 458:3: -> ^( VT_SLOT data_type slot_id )
+            // 585:3: -> ^( VT_SLOT data_type slot_id )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:458:6: ^( VT_SLOT data_type slot_id )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:585: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);
@@ -3315,7 +3492,7 @@
     };
 
     // $ANTLR start slot_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:461:1: slot_id : id= ID -> VT_SLOT_ID[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:588: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);
@@ -3328,13 +3505,16 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:461:9: (id= ID -> VT_SLOT_ID[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:461:11: id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:2: (id= ID -> VT_SLOT_ID[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:4: id= ID
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_slot_id1326); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_slot_id1439); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.IDENTIFIER);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -3347,7 +3527,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 462:3: -> VT_SLOT_ID[$id]
+            // 591:3: -> VT_SLOT_ID[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_SLOT_ID, id));
 
@@ -3380,22 +3560,22 @@
     };
 
     // $ANTLR start rule
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:465:1: rule : rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:594:1: rule : rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk ) ;
     public final rule_return rule() throws RecognitionException {
         rule_return retval = new rule_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        rule_key_return rule_key70 = null;
+        rule_key_return rule_key68 = null;
 
-        rule_id_return rule_id71 = null;
+        rule_id_return rule_id69 = null;
 
-        rule_attributes_return rule_attributes72 = null;
+        rule_attributes_return rule_attributes70 = null;
 
-        when_part_return when_part73 = null;
+        when_part_return when_part71 = null;
 
-        rhs_chunk_return rhs_chunk74 = null;
+        rhs_chunk_return rhs_chunk72 = null;
 
 
         RewriteRuleSubtreeStream stream_rule_key=new RewriteRuleSubtreeStream(adaptor,"rule rule_key");
@@ -3403,69 +3583,79 @@
         RewriteRuleSubtreeStream stream_when_part=new RewriteRuleSubtreeStream(adaptor,"rule when_part");
         RewriteRuleSubtreeStream stream_rule_attributes=new RewriteRuleSubtreeStream(adaptor,"rule rule_attributes");
         RewriteRuleSubtreeStream stream_rhs_chunk=new RewriteRuleSubtreeStream(adaptor,"rule rhs_chunk");
-         pushParaphrases(DroolsParaphareseTypes.RULE); 
+         pushParaphrases(DroolsParaphraseTypes.RULE); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:2: ( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:4: rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:2: ( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:598:2: rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk
             {
-            pushFollow(FOLLOW_rule_key_in_rule1355);
-            rule_key70=rule_key();
+            if ( backtracking==0 ) {
+              	beginSentence(DroolsSentenceType.RULE);	
+            }
+            pushFollow(FOLLOW_rule_key_in_rule1476);
+            rule_key68=rule_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rule_key.add(rule_key70.getTree());
-            pushFollow(FOLLOW_rule_id_in_rule1357);
-            rule_id71=rule_id();
+            if ( backtracking==0 ) stream_rule_key.add(rule_key68.getTree());
+            pushFollow(FOLLOW_rule_id_in_rule1478);
+            rule_id69=rule_id();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rule_id.add(rule_id71.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:21: ( rule_attributes )?
+            if ( backtracking==0 ) stream_rule_id.add(rule_id69.getTree());
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_RULE_HEADER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601:3: ( rule_attributes )?
             int alt28=2;
-            alt28 = dfa28.predict(input);
+            int LA28_0 = input.LA(1);
+
+            if ( (LA28_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))||(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(Drool!
 sSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {
+                alt28=1;
+            }
             switch (alt28) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:21: rule_attributes
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601:3: rule_attributes
                     {
-                    pushFollow(FOLLOW_rule_attributes_in_rule1359);
-                    rule_attributes72=rule_attributes();
+                    pushFollow(FOLLOW_rule_attributes_in_rule1488);
+                    rule_attributes70=rule_attributes();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_rule_attributes.add(rule_attributes72.getTree());
+                    if ( backtracking==0 ) stream_rule_attributes.add(rule_attributes70.getTree());
 
                     }
                     break;
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:38: ( when_part )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601:20: ( when_part )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
-            if ( (LA29_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.WHEN)))) {
+            if ( (LA29_0==WHEN) ) {
                 alt29=1;
             }
             switch (alt29) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:38: when_part
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601:20: when_part
                     {
-                    pushFollow(FOLLOW_when_part_in_rule1362);
-                    when_part73=when_part();
+                    pushFollow(FOLLOW_when_part_in_rule1491);
+                    when_part71=when_part();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_when_part.add(when_part73.getTree());
+                    if ( backtracking==0 ) stream_when_part.add(when_part71.getTree());
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule1365);
-            rhs_chunk74=rhs_chunk();
+            pushFollow(FOLLOW_rhs_chunk_in_rule1494);
+            rhs_chunk72=rhs_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rhs_chunk.add(rhs_chunk74.getTree());
+            if ( backtracking==0 ) stream_rhs_chunk.add(rhs_chunk72.getTree());
 
             // AST REWRITE
-            // elements: rule_key, rule_attributes, when_part, rhs_chunk, rule_id
+            // elements: rhs_chunk, rule_id, when_part, rule_attributes, rule_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3475,21 +3665,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 469:3: -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk )
+            // 602:3: -> ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:469:6: ^( rule_key rule_id ( rule_attributes )? ( when_part )? rhs_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:6: ^( rule_key rule_id ( 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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:469:25: ( rule_attributes )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:25: ( rule_attributes )?
                 if ( stream_rule_attributes.hasNext() ) {
                     adaptor.addChild(root_1, stream_rule_attributes.next());
 
                 }
                 stream_rule_attributes.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:469:42: ( when_part )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:42: ( when_part )?
                 if ( stream_when_part.hasNext() ) {
                     adaptor.addChild(root_1, stream_when_part.next());
 
@@ -3532,179 +3722,89 @@
     };
 
     // $ANTLR start when_part
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:472:1: when_part : ({...}? when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block | when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:605: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 COLON76=null;
-        Token COLON79=null;
-        when_key_return when_key75 = null;
+        Token WHEN73=null;
+        Token COLON74=null;
+        normal_lhs_block_return normal_lhs_block75 = null;
 
-        normal_lhs_block_return normal_lhs_block77 = null;
 
-        when_key_return when_key78 = null;
-
-        normal_lhs_block_return normal_lhs_block80 = null;
-
-
-        Object COLON76_tree=null;
-        Object COLON79_tree=null;
+        Object WHEN73_tree=null;
+        Object COLON74_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");
-        RewriteRuleSubtreeStream stream_when_key=new RewriteRuleSubtreeStream(adaptor,"rule when_key");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:473:2: ({...}? when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block | when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block )
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:2: ( WHEN ( COLON )? normal_lhs_block -> WHEN normal_lhs_block )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:5: WHEN ( COLON )? normal_lhs_block
+            {
+            WHEN73=(Token)input.LT(1);
+            match(input,WHEN,FOLLOW_WHEN_in_when_part1524); if (failed) return retval;
+            if ( backtracking==0 ) stream_WHEN.add(WHEN73);
 
-            if ( (LA32_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.WHEN)))) {
-                int LA32_1 = input.LA(2);
-
-                if ( ((validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN)))) ) {
-                    alt32=1;
-                }
-                else if ( ((validateIdentifierKey(DroolsSoftKeywords.WHEN))) ) {
-                    alt32=2;
-                }
-                else {
-                    if (backtracking>0) {failed=true; return retval;}
-                    NoViableAltException nvae =
-                        new NoViableAltException("472:1: when_part : ({...}? when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block | when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block );", 32, 1, input);
-
-                    throw nvae;
-                }
+            if ( backtracking==0 ) {
+              	emit(WHEN73, DroolsEditorType.KEYWORD);	
             }
-            else {
-                if (backtracking>0) {failed=true; return retval;}
-                NoViableAltException nvae =
-                    new NoViableAltException("472:1: when_part : ({...}? when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block | when_key ( COLON )? normal_lhs_block -> when_key normal_lhs_block );", 32, 0, input);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:607:3: ( COLON )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-                throw nvae;
+            if ( (LA30_0==COLON) ) {
+                alt30=1;
             }
-            switch (alt32) {
+            switch (alt30) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:473:4: {...}? when_key ( COLON )? normal_lhs_block
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:607:3: COLON
                     {
-                    if ( !(validateWhenWithParenthesis()) ) {
-                        if (backtracking>0) {failed=true; return retval;}
-                        throw new FailedPredicateException(input, "when_part", "validateWhenWithParenthesis()");
-                    }
-                    pushFollow(FOLLOW_when_key_in_when_part1396);
-                    when_key75=when_key();
-                    _fsp--;
-                    if (failed) return retval;
-                    if ( backtracking==0 ) stream_when_key.add(when_key75.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:473:46: ( COLON )?
-                    int alt30=2;
-                    int LA30_0 = input.LA(1);
+                    COLON74=(Token)input.LT(1);
+                    match(input,COLON,FOLLOW_COLON_in_when_part1530); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COLON.add(COLON74);
 
-                    if ( (LA30_0==COLON) ) {
-                        alt30=1;
-                    }
-                    switch (alt30) {
-                        case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:473:46: COLON
-                            {
-                            COLON76=(Token)input.LT(1);
-                            match(input,COLON,FOLLOW_COLON_in_when_part1398); if (failed) return retval;
-                            if ( backtracking==0 ) stream_COLON.add(COLON76);
 
-
-                            }
-                            break;
-
                     }
-
-                    pushFollow(FOLLOW_normal_lhs_block_in_when_part1401);
-                    normal_lhs_block77=normal_lhs_block();
-                    _fsp--;
-                    if (failed) return retval;
-                    if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block77.getTree());
-
-                    // AST REWRITE
-                    // elements: normal_lhs_block, when_key
-                    // 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();
-                    // 474:2: -> when_key normal_lhs_block
-                    {
-                        adaptor.addChild(root_0, stream_when_key.next());
-                        adaptor.addChild(root_0, stream_normal_lhs_block.next());
-
-                    }
-
-                    }
-
-                    }
                     break;
-                case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:475:4: when_key ( COLON )? normal_lhs_block
-                    {
-                    pushFollow(FOLLOW_when_key_in_when_part1413);
-                    when_key78=when_key();
-                    _fsp--;
-                    if (failed) return retval;
-                    if ( backtracking==0 ) stream_when_key.add(when_key78.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:475:13: ( COLON )?
-                    int alt31=2;
-                    int LA31_0 = input.LA(1);
 
-                    if ( (LA31_0==COLON) ) {
-                        alt31=1;
-                    }
-                    switch (alt31) {
-                        case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:475:13: COLON
-                            {
-                            COLON79=(Token)input.LT(1);
-                            match(input,COLON,FOLLOW_COLON_in_when_part1415); if (failed) return retval;
-                            if ( backtracking==0 ) stream_COLON.add(COLON79);
+            }
 
+            if ( backtracking==0 ) {
+              	emit(COLON74, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
+            }
+            pushFollow(FOLLOW_normal_lhs_block_in_when_part1540);
+            normal_lhs_block75=normal_lhs_block();
+            _fsp--;
+            if (failed) return retval;
+            if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block75.getTree());
 
-                            }
-                            break;
+            // AST REWRITE
+            // elements: normal_lhs_block, WHEN
+            // 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();
+            // 610:2: -> WHEN normal_lhs_block
+            {
+                adaptor.addChild(root_0, stream_WHEN.next());
+                adaptor.addChild(root_0, stream_normal_lhs_block.next());
 
-                    pushFollow(FOLLOW_normal_lhs_block_in_when_part1418);
-                    normal_lhs_block80=normal_lhs_block();
-                    _fsp--;
-                    if (failed) return retval;
-                    if ( backtracking==0 ) stream_normal_lhs_block.add(normal_lhs_block80.getTree());
+            }
 
-                    // AST REWRITE
-                    // elements: when_key, normal_lhs_block
-                    // 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();
-                    // 476:2: -> when_key normal_lhs_block
-                    {
-                        adaptor.addChild(root_0, stream_when_key.next());
-                        adaptor.addChild(root_0, stream_normal_lhs_block.next());
-
-                    }
-
-                    }
-
-                    }
-                    break;
-
             }
+
             retval.stop = input.LT(-1);
 
             if ( backtracking==0 ) {
@@ -3728,7 +3828,7 @@
     };
 
     // $ANTLR start rule_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:479:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:613: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);
@@ -3742,33 +3842,34 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:480:2: (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] )
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614:2: (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] )
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA33_0==ID) ) {
-                alt33=1;
+            if ( (LA31_0==ID) ) {
+                alt31=1;
             }
-            else if ( (LA33_0==STRING) ) {
-                alt33=2;
+            else if ( (LA31_0==STRING) ) {
+                alt31=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("479:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );", 33, 0, input);
+                    new NoViableAltException("613:1: rule_id : (id= ID -> VT_RULE_ID[$id] | id= STRING -> VT_RULE_ID[$id] );", 31, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt31) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:480:5: id= ID
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614:5: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_rule_id1439); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_rule_id1561); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.RULE, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.RULE, id.getText());	
                     }
 
                     // AST REWRITE
@@ -3782,7 +3883,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 481:66: -> VT_RULE_ID[$id]
+                    // 616:64: -> VT_RULE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_RULE_ID, id));
 
@@ -3793,14 +3894,15 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:482:5: id= STRING
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:617:5: id= STRING
                     {
                     id=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_rule_id1455); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_rule_id1577); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(id);
 
                     if ( backtracking==0 ) {
-                      	setParaphrasesValue(DroolsParaphareseTypes.RULE, id.getText());	
+                      	emit(id, DroolsEditorType.IDENTIFIER);
+                      		setParaphrasesValue(DroolsParaphraseTypes.RULE, id.getText());	
                     }
 
                     // AST REWRITE
@@ -3814,7 +3916,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 483:66: -> VT_RULE_ID[$id]
+                    // 619:64: -> VT_RULE_ID[$id]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_RULE_ID, id));
 
@@ -3849,90 +3951,102 @@
     };
 
     // $ANTLR start rule_attributes
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:486:1: rule_attributes : ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )* -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:622: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 COLON82=null;
-        Token COMMA84=null;
+        Token COLON77=null;
+        Token COMMA79=null;
         rule_attribute_return attr = null;
 
-        attributes_key_return attributes_key81 = null;
+        attributes_key_return attributes_key76 = null;
 
-        rule_attribute_return rule_attribute83 = null;
+        rule_attribute_return rule_attribute78 = null;
 
 
-        Object COLON82_tree=null;
-        Object COMMA84_tree=null;
+        Object COLON77_tree=null;
+        Object COMMA79_tree=null;
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleSubtreeStream stream_attributes_key=new RewriteRuleSubtreeStream(adaptor,"rule attributes_key");
         RewriteRuleSubtreeStream stream_rule_attribute=new RewriteRuleSubtreeStream(adaptor,"rule rule_attribute");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:2: ( ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )* -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:4: ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:2: ( ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )* -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:4: ( attributes_key COLON )? rule_attribute ( ( COMMA )? attr= rule_attribute )*
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:4: ( attributes_key COLON )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:4: ( attributes_key COLON )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA34_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))))) {
-                int LA34_1 = input.LA(2);
+            if ( (LA32_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(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))))) {
+                int LA32_1 = input.LA(2);
 
-                if ( (LA34_1==COLON) && ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES)))) {
-                    alt34=1;
+                if ( (LA32_1==COLON) && ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES)))) {
+                    alt32=1;
                 }
             }
-            switch (alt34) {
+            switch (alt32) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:6: attributes_key COLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:6: attributes_key COLON
                     {
-                    pushFollow(FOLLOW_attributes_key_in_rule_attributes1476);
-                    attributes_key81=attributes_key();
+                    pushFollow(FOLLOW_attributes_key_in_rule_attributes1598);
+                    attributes_key76=attributes_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_attributes_key.add(attributes_key81.getTree());
-                    COLON82=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_rule_attributes1478); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COLON.add(COLON82);
+                    if ( backtracking==0 ) stream_attributes_key.add(attributes_key76.getTree());
+                    COLON77=(Token)input.LT(1);
+                    match(input,COLON,FOLLOW_COLON_in_rule_attributes1600); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COLON.add(COLON77);
 
+                    if ( backtracking==0 ) {
+                      	emit(COLON77, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1483);
-            rule_attribute83=rule_attribute();
+            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1610);
+            rule_attribute78=rule_attribute();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_rule_attribute.add(rule_attribute83.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:45: ( ( COMMA )? attr= rule_attribute )*
-            loop36:
+            if ( backtracking==0 ) stream_rule_attribute.add(rule_attribute78.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:624:18: ( ( COMMA )? attr= rule_attribute )*
+            loop34:
             do {
-                int alt36=2;
-                alt36 = dfa36.predict(input);
-                switch (alt36) {
+                int alt34=2;
+                int LA34_0 = input.LA(1);
+
+                if ( (LA34_0==COMMA) ) {
+                    alt34=1;
+                }
+                else if ( (LA34_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))))) {
+                    alt34=1;
+                }
+
+
+                switch (alt34) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:47: ( COMMA )? attr= rule_attribute
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:624:20: ( COMMA )? attr= rule_attribute
             	    {
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:47: ( COMMA )?
-            	    int alt35=2;
-            	    int LA35_0 = input.LA(1);
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:624:20: ( COMMA )?
+            	    int alt33=2;
+            	    int LA33_0 = input.LA(1);
 
-            	    if ( (LA35_0==COMMA) ) {
-            	        alt35=1;
+            	    if ( (LA33_0==COMMA) ) {
+            	        alt33=1;
             	    }
-            	    switch (alt35) {
+            	    switch (alt33) {
             	        case 1 :
-            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:47: COMMA
+            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:624:20: COMMA
             	            {
-            	            COMMA84=(Token)input.LT(1);
-            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1487); if (failed) return retval;
-            	            if ( backtracking==0 ) stream_COMMA.add(COMMA84);
+            	            COMMA79=(Token)input.LT(1);
+            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1614); if (failed) return retval;
+            	            if ( backtracking==0 ) stream_COMMA.add(COMMA79);
 
 
             	            }
@@ -3940,7 +4054,10 @@
 
             	    }
 
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1492);
+            	    if ( backtracking==0 ) {
+            	      	emit(COMMA79, DroolsEditorType.SYMBOL);	
+            	    }
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1621);
             	    attr=rule_attribute();
             	    _fsp--;
             	    if (failed) return retval;
@@ -3950,13 +4067,13 @@
             	    break;
 
             	default :
-            	    break loop36;
+            	    break loop34;
                 }
             } while (true);
 
 
             // AST REWRITE
-            // elements: rule_attribute, attributes_key
+            // elements: attributes_key, rule_attribute
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3966,14 +4083,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 488:3: -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
+            // 625:3: -> ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:488:6: ^( VT_RULE_ATTRIBUTES ( attributes_key )? ( rule_attribute )+ )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:488:27: ( attributes_key )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625:27: ( attributes_key )?
                 if ( stream_attributes_key.hasNext() ) {
                     adaptor.addChild(root_1, stream_attributes_key.next());
 
@@ -4020,93 +4137,93 @@
     };
 
     // $ANTLR start rule_attribute
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:628: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 salience85 = null;
+        salience_return salience80 = null;
 
-        no_loop_return no_loop86 = null;
+        no_loop_return no_loop81 = null;
 
-        agenda_group_return agenda_group87 = null;
+        agenda_group_return agenda_group82 = null;
 
-        duration_return duration88 = null;
+        duration_return duration83 = null;
 
-        activation_group_return activation_group89 = null;
+        activation_group_return activation_group84 = null;
 
-        auto_focus_return auto_focus90 = null;
+        auto_focus_return auto_focus85 = null;
 
-        date_effective_return date_effective91 = null;
+        date_effective_return date_effective86 = null;
 
-        date_expires_return date_expires92 = null;
+        date_expires_return date_expires87 = null;
 
-        enabled_return enabled93 = null;
+        enabled_return enabled88 = null;
 
-        ruleflow_group_return ruleflow_group94 = null;
+        ruleflow_group_return ruleflow_group89 = null;
 
-        lock_on_active_return lock_on_active95 = null;
+        lock_on_active_return lock_on_active90 = null;
 
-        dialect_return dialect96 = null;
+        dialect_return dialect91 = null;
 
 
 
-         pushParaphrases(DroolsParaphareseTypes.RULE_ATTRIBUTE); 
+         pushParaphrases(DroolsParaphraseTypes.RULE_ATTRIBUTE); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:494: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;
-            int LA37_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:631:2: ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect )
+            int alt35=12;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA37_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))||(validateIdentifierKey(Drools!
 SoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
-                int LA37_1 = input.LA(2);
+            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))||(validateIdentifierKey(Drools!
 SoftKeywords.DURATION))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {
+                int LA35_1 = input.LA(2);
 
-                if ( (LA37_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))))) {
-                    int LA37_2 = input.LA(3);
+                if ( (LA35_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))))) {
+                    int LA35_2 = input.LA(3);
 
-                    if ( (LA37_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))))) {
-                        int LA37_7 = input.LA(4);
+                    if ( (LA35_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))))) {
+                        int LA35_7 = input.LA(4);
 
-                        if ( (LA37_7==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE)))) {
-                            alt37=11;
+                        if ( (LA35_7==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE)))) {
+                            alt35=11;
                         }
-                        else if ( (LA37_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))))) {
-                            int LA37_10 = input.LA(5);
+                        else if ( (LA35_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))))) {
+                            int LA35_10 = input.LA(5);
 
                             if ( ((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt37=3;
+                                alt35=3;
                             }
                             else if ( ((validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt37=5;
+                                alt35=5;
                             }
                             else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {
-                                alt37=7;
+                                alt35=7;
                             }
                             else if ( ((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {
-                                alt37=8;
+                                alt35=8;
                             }
                             else if ( ((validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))) ) {
-                                alt37=10;
+                                alt35=10;
                             }
                             else {
                                 if (backtracking>0) {failed=true; return retval;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 10, input);
+                                    new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 10, input);
 
                                 throw nvae;
                             }
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))) ) {
-                            alt37=2;
+                            alt35=2;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))) ) {
-                            alt37=6;
+                            alt35=6;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 7, input);
+                                new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 7, input);
 
                             throw nvae;
                         }
@@ -4114,41 +4231,41 @@
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 2, input);
+                            new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 2, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA37_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
-                    int LA37_3 = input.LA(3);
+                else if ( (LA35_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {
+                    int LA35_3 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {
-                        alt37=1;
+                        alt35=1;
                     }
                     else if ( ((validateIdentifierKey(DroolsSoftKeywords.DURATION))) ) {
-                        alt37=4;
+                        alt35=4;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 3, input);
+                            new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 3, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA37_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
-                    alt37=1;
+                else if ( (LA35_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {
+                    alt35=1;
                 }
-                else if ( (LA37_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
-                    alt37=9;
+                else if ( (LA35_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {
+                    alt35=9;
                 }
-                else if ( (LA37_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {
-                    alt37=12;
+                else if ( (LA35_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {
+                    alt35=12;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 1, input);
+                        new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 1, input);
 
                     throw nvae;
                 }
@@ -4156,164 +4273,164 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("491:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 37, 0, input);
+                    new NoViableAltException("628:1: rule_attribute : ( salience | no_loop | agenda_group | duration | activation_group | auto_focus | date_effective | date_expires | enabled | ruleflow_group | lock_on_active | dialect );", 35, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt35) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:494:4: salience
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:631:4: salience
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_salience_in_rule_attribute1531);
-                    salience85=salience();
+                    pushFollow(FOLLOW_salience_in_rule_attribute1660);
+                    salience80=salience();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, salience85.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, salience80.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:495:4: no_loop
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:632:4: no_loop
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute1537);
-                    no_loop86=no_loop();
+                    pushFollow(FOLLOW_no_loop_in_rule_attribute1666);
+                    no_loop81=no_loop();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, no_loop86.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, no_loop81.getTree());
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:496:4: agenda_group
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:633:4: agenda_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1544);
-                    agenda_group87=agenda_group();
+                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1673);
+                    agenda_group82=agenda_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, agenda_group87.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, agenda_group82.getTree());
 
                     }
                     break;
                 case 4 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:497:4: duration
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:634:4: duration
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_duration_in_rule_attribute1551);
-                    duration88=duration();
+                    pushFollow(FOLLOW_duration_in_rule_attribute1680);
+                    duration83=duration();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, duration88.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, duration83.getTree());
 
                     }
                     break;
                 case 5 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:498:4: activation_group
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:4: activation_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute1558);
-                    activation_group89=activation_group();
+                    pushFollow(FOLLOW_activation_group_in_rule_attribute1687);
+                    activation_group84=activation_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, activation_group89.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, activation_group84.getTree());
 
                     }
                     break;
                 case 6 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:499:4: auto_focus
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:636:4: auto_focus
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1564);
-                    auto_focus90=auto_focus();
+                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1693);
+                    auto_focus85=auto_focus();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, auto_focus90.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, auto_focus85.getTree());
 
                     }
                     break;
                 case 7 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:500:4: date_effective
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:637:4: date_effective
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1570);
-                    date_effective91=date_effective();
+                    pushFollow(FOLLOW_date_effective_in_rule_attribute1699);
+                    date_effective86=date_effective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, date_effective91.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, date_effective86.getTree());
 
                     }
                     break;
                 case 8 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:501:4: date_expires
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:638:4: date_expires
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1576);
-                    date_expires92=date_expires();
+                    pushFollow(FOLLOW_date_expires_in_rule_attribute1705);
+                    date_expires87=date_expires();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, date_expires92.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, date_expires87.getTree());
 
                     }
                     break;
                 case 9 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:502:4: enabled
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:639:4: enabled
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1582);
-                    enabled93=enabled();
+                    pushFollow(FOLLOW_enabled_in_rule_attribute1711);
+                    enabled88=enabled();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, enabled93.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, enabled88.getTree());
 
                     }
                     break;
                 case 10 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:503:4: ruleflow_group
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:640:4: ruleflow_group
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1588);
-                    ruleflow_group94=ruleflow_group();
+                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1717);
+                    ruleflow_group89=ruleflow_group();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, ruleflow_group94.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, ruleflow_group89.getTree());
 
                     }
                     break;
                 case 11 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:504:4: lock_on_active
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:641:4: lock_on_active
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1594);
-                    lock_on_active95=lock_on_active();
+                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1723);
+                    lock_on_active90=lock_on_active();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lock_on_active95.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lock_on_active90.getTree());
 
                     }
                     break;
                 case 12 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:505:4: dialect
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:4: dialect
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_dialect_in_rule_attribute1599);
-                    dialect96=dialect();
+                    pushFollow(FOLLOW_dialect_in_rule_attribute1728);
+                    dialect91=dialect();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, dialect96.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, dialect91.getTree());
 
                     }
                     break;
@@ -4345,36 +4462,39 @@
     };
 
     // $ANTLR start date_effective
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:508:1: date_effective : date_effective_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:645: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 STRING98=null;
-        date_effective_key_return date_effective_key97 = null;
+        Token STRING93=null;
+        date_effective_key_return date_effective_key92 = null;
 
 
-        Object STRING98_tree=null;
+        Object STRING93_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:2: ( date_effective_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:4: date_effective_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:646:2: ( date_effective_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:646:4: date_effective_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_date_effective_key_in_date_effective1611);
-            date_effective_key97=date_effective_key();
+            pushFollow(FOLLOW_date_effective_key_in_date_effective1740);
+            date_effective_key92=date_effective_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_effective_key97.getTree(), root_0);
-            STRING98=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1614); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_effective_key92.getTree(), root_0);
+            STRING93=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_date_effective1743); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING98_tree = (Object)adaptor.create(STRING98);
-            adaptor.addChild(root_0, STRING98_tree);
+            STRING93_tree = (Object)adaptor.create(STRING93);
+            adaptor.addChild(root_0, STRING93_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING93, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -4401,36 +4521,39 @@
     };
 
     // $ANTLR start date_expires
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:512:1: date_expires : date_expires_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:650: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 STRING100=null;
-        date_expires_key_return date_expires_key99 = null;
+        Token STRING95=null;
+        date_expires_key_return date_expires_key94 = null;
 
 
-        Object STRING100_tree=null;
+        Object STRING95_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:2: ( date_expires_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:4: date_expires_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:651:2: ( date_expires_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:651:4: date_expires_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_date_expires_key_in_date_expires1625);
-            date_expires_key99=date_expires_key();
+            pushFollow(FOLLOW_date_expires_key_in_date_expires1757);
+            date_expires_key94=date_expires_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_expires_key99.getTree(), root_0);
-            STRING100=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1628); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(date_expires_key94.getTree(), root_0);
+            STRING95=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_date_expires1760); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING100_tree = (Object)adaptor.create(STRING100);
-            adaptor.addChild(root_0, STRING100_tree);
+            STRING95_tree = (Object)adaptor.create(STRING95);
+            adaptor.addChild(root_0, STRING95_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING95, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -4457,36 +4580,39 @@
     };
 
     // $ANTLR start enabled
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:516:1: enabled : enabled_key BOOL ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:655:1: enabled : enabled_key BOOL ;
     public final enabled_return enabled() throws RecognitionException {
         enabled_return retval = new enabled_return();
         retval.start = input.LT(1);
 
         Object root_0 = null;
 
-        Token BOOL102=null;
-        enabled_key_return enabled_key101 = null;
+        Token BOOL97=null;
+        enabled_key_return enabled_key96 = null;
 
 
-        Object BOOL102_tree=null;
+        Object BOOL97_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:517:2: ( enabled_key BOOL )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:517:4: enabled_key BOOL
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:656:2: ( enabled_key BOOL )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:656:4: enabled_key BOOL
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_enabled_key_in_enabled1642);
-            enabled_key101=enabled_key();
+            pushFollow(FOLLOW_enabled_key_in_enabled1775);
+            enabled_key96=enabled_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(enabled_key101.getTree(), root_0);
-            BOOL102=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1645); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(enabled_key96.getTree(), root_0);
+            BOOL97=(Token)input.LT(1);
+            match(input,BOOL,FOLLOW_BOOL_in_enabled1778); if (failed) return retval;
             if ( backtracking==0 ) {
-            BOOL102_tree = (Object)adaptor.create(BOOL102);
-            adaptor.addChild(root_0, BOOL102_tree);
+            BOOL97_tree = (Object)adaptor.create(BOOL97);
+            adaptor.addChild(root_0, BOOL97_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(BOOL97, DroolsEditorType.BOOLEAN_CONST );	
+            }
 
             }
 
@@ -4513,70 +4639,73 @@
     };
 
     // $ANTLR start salience
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:520:1: salience : salience_key ( INT | paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:660: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 INT104=null;
-        salience_key_return salience_key103 = null;
+        Token INT99=null;
+        salience_key_return salience_key98 = null;
 
-        paren_chunk_return paren_chunk105 = null;
+        paren_chunk_return paren_chunk100 = null;
 
 
-        Object INT104_tree=null;
+        Object INT99_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:2: ( salience_key ( INT | paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:4: salience_key ( INT | paren_chunk )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:661:2: ( salience_key ( INT | paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:661:4: salience_key ( INT | paren_chunk )
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_salience_key_in_salience1657);
-            salience_key103=salience_key();
+            pushFollow(FOLLOW_salience_key_in_salience1793);
+            salience_key98=salience_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key103.getTree(), root_0);
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:522:3: ( INT | paren_chunk )
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(salience_key98.getTree(), root_0);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:662:3: ( INT | paren_chunk )
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA38_0==INT) ) {
-                alt38=1;
+            if ( (LA36_0==INT) ) {
+                alt36=1;
             }
-            else if ( (LA38_0==LEFT_PAREN) ) {
-                alt38=2;
+            else if ( (LA36_0==LEFT_PAREN) ) {
+                alt36=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("522:3: ( INT | paren_chunk )", 38, 0, input);
+                    new NoViableAltException("662:3: ( INT | paren_chunk )", 36, 0, input);
 
                 throw nvae;
             }
-            switch (alt38) {
+            switch (alt36) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:522:5: INT
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:662:5: INT
                     {
-                    INT104=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1664); if (failed) return retval;
+                    INT99=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_salience1800); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    INT104_tree = (Object)adaptor.create(INT104);
-                    adaptor.addChild(root_0, INT104_tree);
+                    INT99_tree = (Object)adaptor.create(INT99);
+                    adaptor.addChild(root_0, INT99_tree);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(INT99, DroolsEditorType.NUMERIC_CONST );	
+                    }
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523:5: paren_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:663:5: paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1673);
-                    paren_chunk105=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_salience1809);
+                    paren_chunk100=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk105.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk100.getTree());
 
                     }
                     break;
@@ -4609,46 +4738,46 @@
     };
 
     // $ANTLR start no_loop
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:527:1: no_loop : no_loop_key ( BOOL )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:667: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 BOOL107=null;
-        no_loop_key_return no_loop_key106 = null;
+        Token BOOL102=null;
+        no_loop_key_return no_loop_key101 = null;
 
 
-        Object BOOL107_tree=null;
+        Object BOOL102_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:2: ( no_loop_key ( BOOL )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:4: no_loop_key ( BOOL )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:2: ( no_loop_key ( BOOL )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:4: no_loop_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_no_loop_key_in_no_loop1689);
-            no_loop_key106=no_loop_key();
+            pushFollow(FOLLOW_no_loop_key_in_no_loop1824);
+            no_loop_key101=no_loop_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key106.getTree(), root_0);
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:17: ( BOOL )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(no_loop_key101.getTree(), root_0);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:17: ( BOOL )?
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA39_0==BOOL) ) {
-                alt39=1;
+            if ( (LA37_0==BOOL) ) {
+                alt37=1;
             }
-            switch (alt39) {
+            switch (alt37) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:17: BOOL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:17: BOOL
                     {
-                    BOOL107=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1692); if (failed) return retval;
+                    BOOL102=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1827); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL107_tree = (Object)adaptor.create(BOOL107);
-                    adaptor.addChild(root_0, BOOL107_tree);
+                    BOOL102_tree = (Object)adaptor.create(BOOL102);
+                    adaptor.addChild(root_0, BOOL102_tree);
                     }
 
                     }
@@ -4656,6 +4785,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(BOOL102, DroolsEditorType.BOOLEAN_CONST );	
+            }
 
             }
 
@@ -4682,46 +4814,46 @@
     };
 
     // $ANTLR start auto_focus
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:531:1: auto_focus : auto_focus_key ( BOOL )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672: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 BOOL109=null;
-        auto_focus_key_return auto_focus_key108 = null;
+        Token BOOL104=null;
+        auto_focus_key_return auto_focus_key103 = null;
 
 
-        Object BOOL109_tree=null;
+        Object BOOL104_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:2: ( auto_focus_key ( BOOL )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:4: auto_focus_key ( BOOL )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:2: ( auto_focus_key ( BOOL )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:4: auto_focus_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1704);
-            auto_focus_key108=auto_focus_key();
+            pushFollow(FOLLOW_auto_focus_key_in_auto_focus1842);
+            auto_focus_key103=auto_focus_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key108.getTree(), root_0);
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:20: ( BOOL )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(auto_focus_key103.getTree(), root_0);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:20: ( BOOL )?
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA40_0==BOOL) ) {
-                alt40=1;
+            if ( (LA38_0==BOOL) ) {
+                alt38=1;
             }
-            switch (alt40) {
+            switch (alt38) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:20: BOOL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:20: BOOL
                     {
-                    BOOL109=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1707); if (failed) return retval;
+                    BOOL104=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1845); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL109_tree = (Object)adaptor.create(BOOL109);
-                    adaptor.addChild(root_0, BOOL109_tree);
+                    BOOL104_tree = (Object)adaptor.create(BOOL104);
+                    adaptor.addChild(root_0, BOOL104_tree);
                     }
 
                     }
@@ -4729,6 +4861,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(BOOL104, DroolsEditorType.BOOLEAN_CONST );	
+            }
 
             }
 
@@ -4755,36 +4890,39 @@
     };
 
     // $ANTLR start activation_group
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:1: activation_group : activation_group_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:677: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 STRING111=null;
-        activation_group_key_return activation_group_key110 = null;
+        Token STRING106=null;
+        activation_group_key_return activation_group_key105 = null;
 
 
-        Object STRING111_tree=null;
+        Object STRING106_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:536:2: ( activation_group_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:536:4: activation_group_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:678:2: ( activation_group_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:678:4: activation_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_activation_group_key_in_activation_group1721);
-            activation_group_key110=activation_group_key();
+            pushFollow(FOLLOW_activation_group_key_in_activation_group1862);
+            activation_group_key105=activation_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key110.getTree(), root_0);
-            STRING111=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1724); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(activation_group_key105.getTree(), root_0);
+            STRING106=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_activation_group1865); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING111_tree = (Object)adaptor.create(STRING111);
-            adaptor.addChild(root_0, STRING111_tree);
+            STRING106_tree = (Object)adaptor.create(STRING106);
+            adaptor.addChild(root_0, STRING106_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING106, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -4811,36 +4949,39 @@
     };
 
     // $ANTLR start ruleflow_group
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:539:1: ruleflow_group : ruleflow_group_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:682: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 STRING113=null;
-        ruleflow_group_key_return ruleflow_group_key112 = null;
+        Token STRING108=null;
+        ruleflow_group_key_return ruleflow_group_key107 = null;
 
 
-        Object STRING113_tree=null;
+        Object STRING108_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:2: ( ruleflow_group_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:4: ruleflow_group_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:2: ( ruleflow_group_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:4: ruleflow_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1735);
-            ruleflow_group_key112=ruleflow_group_key();
+            pushFollow(FOLLOW_ruleflow_group_key_in_ruleflow_group1879);
+            ruleflow_group_key107=ruleflow_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key112.getTree(), root_0);
-            STRING113=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1738); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(ruleflow_group_key107.getTree(), root_0);
+            STRING108=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1882); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING113_tree = (Object)adaptor.create(STRING113);
-            adaptor.addChild(root_0, STRING113_tree);
+            STRING108_tree = (Object)adaptor.create(STRING108);
+            adaptor.addChild(root_0, STRING108_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING108, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -4867,36 +5008,39 @@
     };
 
     // $ANTLR start agenda_group
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:543:1: agenda_group : agenda_group_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:687: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 STRING115=null;
-        agenda_group_key_return agenda_group_key114 = null;
+        Token STRING110=null;
+        agenda_group_key_return agenda_group_key109 = null;
 
 
-        Object STRING115_tree=null;
+        Object STRING110_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:2: ( agenda_group_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:4: agenda_group_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:688:2: ( agenda_group_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:688:4: agenda_group_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1749);
-            agenda_group_key114=agenda_group_key();
+            pushFollow(FOLLOW_agenda_group_key_in_agenda_group1896);
+            agenda_group_key109=agenda_group_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key114.getTree(), root_0);
-            STRING115=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1752); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(agenda_group_key109.getTree(), root_0);
+            STRING110=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1899); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING115_tree = (Object)adaptor.create(STRING115);
-            adaptor.addChild(root_0, STRING115_tree);
+            STRING110_tree = (Object)adaptor.create(STRING110);
+            adaptor.addChild(root_0, STRING110_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING110, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -4923,36 +5067,39 @@
     };
 
     // $ANTLR start duration
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:547:1: duration : duration_key INT ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:692: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 INT117=null;
-        duration_key_return duration_key116 = null;
+        Token INT112=null;
+        duration_key_return duration_key111 = null;
 
 
-        Object INT117_tree=null;
+        Object INT112_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:548:2: ( duration_key INT )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:548:4: duration_key INT
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:693:2: ( duration_key INT )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:693:4: duration_key INT
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_duration_key_in_duration1763);
-            duration_key116=duration_key();
+            pushFollow(FOLLOW_duration_key_in_duration1913);
+            duration_key111=duration_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key116.getTree(), root_0);
-            INT117=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1766); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(duration_key111.getTree(), root_0);
+            INT112=(Token)input.LT(1);
+            match(input,INT,FOLLOW_INT_in_duration1916); if (failed) return retval;
             if ( backtracking==0 ) {
-            INT117_tree = (Object)adaptor.create(INT117);
-            adaptor.addChild(root_0, INT117_tree);
+            INT112_tree = (Object)adaptor.create(INT112);
+            adaptor.addChild(root_0, INT112_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(INT112, DroolsEditorType.NUMERIC_CONST );	
+            }
 
             }
 
@@ -4979,36 +5126,39 @@
     };
 
     // $ANTLR start dialect
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:551:1: dialect : dialect_key STRING ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:697: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 STRING119=null;
-        dialect_key_return dialect_key118 = null;
+        Token STRING114=null;
+        dialect_key_return dialect_key113 = null;
 
 
-        Object STRING119_tree=null;
+        Object STRING114_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:2: ( dialect_key STRING )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:4: dialect_key STRING
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:2: ( dialect_key STRING )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:4: dialect_key STRING
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_dialect_key_in_dialect1780);
-            dialect_key118=dialect_key();
+            pushFollow(FOLLOW_dialect_key_in_dialect1932);
+            dialect_key113=dialect_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key118.getTree(), root_0);
-            STRING119=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1783); if (failed) return retval;
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(dialect_key113.getTree(), root_0);
+            STRING114=(Token)input.LT(1);
+            match(input,STRING,FOLLOW_STRING_in_dialect1935); if (failed) return retval;
             if ( backtracking==0 ) {
-            STRING119_tree = (Object)adaptor.create(STRING119);
-            adaptor.addChild(root_0, STRING119_tree);
+            STRING114_tree = (Object)adaptor.create(STRING114);
+            adaptor.addChild(root_0, STRING114_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(STRING114, DroolsEditorType.STRING_CONST );	
+            }
 
             }
 
@@ -5035,46 +5185,46 @@
     };
 
     // $ANTLR start lock_on_active
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:555:1: lock_on_active : lock_on_active_key ( BOOL )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:702: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 BOOL121=null;
-        lock_on_active_key_return lock_on_active_key120 = null;
+        Token BOOL116=null;
+        lock_on_active_key_return lock_on_active_key115 = null;
 
 
-        Object BOOL121_tree=null;
+        Object BOOL116_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:2: ( lock_on_active_key ( BOOL )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:4: lock_on_active_key ( BOOL )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:703:2: ( lock_on_active_key ( BOOL )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:703:4: lock_on_active_key ( BOOL )?
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active1801);
-            lock_on_active_key120=lock_on_active_key();
+            pushFollow(FOLLOW_lock_on_active_key_in_lock_on_active1953);
+            lock_on_active_key115=lock_on_active_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key120.getTree(), root_0);
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:24: ( BOOL )?
-            int alt41=2;
-            int LA41_0 = input.LA(1);
+            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(lock_on_active_key115.getTree(), root_0);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:703:24: ( BOOL )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA41_0==BOOL) ) {
-                alt41=1;
+            if ( (LA39_0==BOOL) ) {
+                alt39=1;
             }
-            switch (alt41) {
+            switch (alt39) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:24: BOOL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:703:24: BOOL
                     {
-                    BOOL121=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1804); if (failed) return retval;
+                    BOOL116=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1956); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    BOOL121_tree = (Object)adaptor.create(BOOL121);
-                    adaptor.addChild(root_0, BOOL121_tree);
+                    BOOL116_tree = (Object)adaptor.create(BOOL116);
+                    adaptor.addChild(root_0, BOOL116_tree);
                     }
 
                     }
@@ -5082,6 +5232,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(BOOL116, DroolsEditorType.BOOLEAN_CONST );	
+            }
 
             }
 
@@ -5108,47 +5261,47 @@
     };
 
     // $ANTLR start normal_lhs_block
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:559:1: normal_lhs_block : ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:707: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 lhs122 = null;
+        lhs_return lhs117 = null;
 
 
         RewriteRuleSubtreeStream stream_lhs=new RewriteRuleSubtreeStream(adaptor,"rule lhs");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:560:2: ( ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:560:4: ( lhs )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:708:2: ( ( lhs )* -> ^( VT_AND_IMPLICIT ( lhs )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:708:4: ( lhs )*
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:560:4: ( lhs )*
-            loop42:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:708:4: ( lhs )*
+            loop40:
             do {
-                int alt42=2;
-                int LA42_0 = input.LA(1);
+                int alt40=2;
+                int LA40_0 = input.LA(1);
 
-                if ( (LA42_0==ID||LA42_0==LEFT_PAREN) ) {
-                    alt42=1;
+                if ( (LA40_0==ID||LA40_0==LEFT_PAREN) ) {
+                    alt40=1;
                 }
 
 
-                switch (alt42) {
+                switch (alt40) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:560:4: lhs
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:708:4: lhs
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1816);
-            	    lhs122=lhs();
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1971);
+            	    lhs117=lhs();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs.add(lhs122.getTree());
+            	    if ( backtracking==0 ) stream_lhs.add(lhs117.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop42;
+            	    break loop40;
                 }
             } while (true);
 
@@ -5164,14 +5317,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 561:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
+            // 709:2: -> ^( VT_AND_IMPLICIT ( lhs )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:561:5: ^( VT_AND_IMPLICIT ( lhs )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:561:23: ( lhs )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:23: ( lhs )*
                 while ( stream_lhs.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs.next());
 
@@ -5210,28 +5363,28 @@
     };
 
     // $ANTLR start lhs
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:564:1: lhs : lhs_or ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712: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_or123 = null;
+        lhs_or_return lhs_or118 = null;
 
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:564:5: ( lhs_or )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:564:7: lhs_or
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:5: ( lhs_or )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:7: lhs_or
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_lhs_or_in_lhs1837);
-            lhs_or123=lhs_or();
+            pushFollow(FOLLOW_lhs_or_in_lhs1992);
+            lhs_or118=lhs_or();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or123.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or118.getTree());
 
             }
 
@@ -5258,7 +5411,7 @@
     };
 
     // $ANTLR start lhs_or
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:567: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 ) )* );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715: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);
@@ -5266,22 +5419,22 @@
         Object root_0 = null;
 
         Token pipe=null;
-        Token LEFT_PAREN124=null;
-        Token RIGHT_PAREN126=null;
+        Token LEFT_PAREN119=null;
+        Token RIGHT_PAREN121=null;
         or_key_return or = null;
 
         or_key_return value = null;
 
-        lhs_and_return lhs_and125 = null;
+        lhs_and_return lhs_and120 = null;
 
-        lhs_and_return lhs_and127 = null;
+        lhs_and_return lhs_and122 = null;
 
-        lhs_and_return lhs_and128 = null;
+        lhs_and_return lhs_and123 = null;
 
 
         Object pipe_tree=null;
-        Object LEFT_PAREN124_tree=null;
-        Object RIGHT_PAREN126_tree=null;
+        Object LEFT_PAREN119_tree=null;
+        Object RIGHT_PAREN121_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");
@@ -5291,36 +5444,39 @@
         	Token orToken = null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570: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);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718: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 alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA46_0==LEFT_PAREN) ) {
-                int LA46_1 = input.LA(2);
+            if ( (LA44_0==LEFT_PAREN) ) {
+                int LA44_1 = input.LA(2);
 
-                if ( (LA46_1==ID) ) {
+                if ( (LA44_1==LEFT_PAREN) ) {
+                    alt44=2;
+                }
+                else if ( (LA44_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt46=2;
+                        alt44=2;
                         }
                         break;
                     case LEFT_PAREN:
                         {
-                        int LA46_4 = input.LA(4);
+                        int LA44_4 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt46=1;
+                            alt44=1;
                         }
                         else if ( (true) ) {
-                            alt46=2;
+                            alt44=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("567: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("715: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 ) )* );", 44, 4, input);
 
                             throw nvae;
                         }
@@ -5328,18 +5484,18 @@
                         break;
                     case ID:
                         {
-                        int LA46_5 = input.LA(4);
+                        int LA44_5 = input.LA(4);
 
                         if ( (synpred1()) ) {
-                            alt46=1;
+                            alt44=1;
                         }
                         else if ( (true) ) {
-                            alt46=2;
+                            alt44=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("567: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("715: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 ) )* );", 44, 5, input);
 
                             throw nvae;
                         }
@@ -5348,85 +5504,91 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("567: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("715: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 ) )* );", 44, 3, input);
 
                         throw nvae;
                     }
 
                 }
-                else if ( (LA46_1==LEFT_PAREN) ) {
-                    alt46=2;
-                }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("567: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("715: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 ) )* );", 44, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA46_0==ID) ) {
-                alt46=2;
+            else if ( (LA44_0==ID) ) {
+                alt44=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("567: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("715: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 ) )* );", 44, 0, input);
 
                 throw nvae;
             }
-            switch (alt46) {
+            switch (alt44) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718:5: ( LEFT_PAREN or_key )=> LEFT_PAREN or= or_key ( lhs_and )+ RIGHT_PAREN
                     {
-                    LEFT_PAREN124=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or1858); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN124);
+                    LEFT_PAREN119=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2016); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN119);
 
-                    pushFollow(FOLLOW_or_key_in_lhs_or1862);
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN119, DroolsEditorType.SYMBOL);	
+                    }
+                    pushFollow(FOLLOW_or_key_in_lhs_or2026);
                     or=or_key();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_or_key.add(or.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:48: ( lhs_and )+
-                    int cnt43=0;
-                    loop43:
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
+                    }
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:722:4: ( lhs_and )+
+                    int cnt41=0;
+                    loop41:
                     do {
-                        int alt43=2;
-                        int LA43_0 = input.LA(1);
+                        int alt41=2;
+                        int LA41_0 = input.LA(1);
 
-                        if ( (LA43_0==ID||LA43_0==LEFT_PAREN) ) {
-                            alt43=1;
+                        if ( (LA41_0==ID||LA41_0==LEFT_PAREN) ) {
+                            alt41=1;
                         }
 
 
-                        switch (alt43) {
+                        switch (alt41) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:48: lhs_and
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:722:4: lhs_and
                     	    {
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1864);
-                    	    lhs_and125=lhs_and();
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2034);
+                    	    lhs_and120=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_and120.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt43 >= 1 ) break loop43;
+                    	    if ( cnt41 >= 1 ) break loop41;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(43, input);
+                                    new EarlyExitException(41, input);
                                 throw eee;
                         }
-                        cnt43++;
+                        cnt41++;
                     } while (true);
 
-                    RIGHT_PAREN126=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or1867); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN126);
+                    RIGHT_PAREN121=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2040); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN121);
 
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN121, DroolsEditorType.SYMBOL);	
+                    }
 
                     // AST REWRITE
                     // elements: RIGHT_PAREN, lhs_and
@@ -5439,9 +5601,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 571:3: -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
+                    // 724:3: -> ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:571:6: ^( VT_OR_PREFIX[$or.start] ( lhs_and )+ RIGHT_PAREN )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:724: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);
@@ -5466,16 +5628,16 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:572: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 ) )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725: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 ) )*
                     {
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:572:4: ( lhs_and -> lhs_and )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:572:5: lhs_and
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:4: ( lhs_and -> lhs_and )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:5: lhs_and
                     {
-                    pushFollow(FOLLOW_lhs_and_in_lhs_or1888);
-                    lhs_and127=lhs_and();
+                    pushFollow(FOLLOW_lhs_and_in_lhs_or2063);
+                    lhs_and122=lhs_and();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_and.add(lhs_and127.getTree());
+                    if ( backtracking==0 ) stream_lhs_and.add(lhs_and122.getTree());
 
                     // AST REWRITE
                     // elements: lhs_and
@@ -5488,7 +5650,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 572:13: -> lhs_and
+                    // 725:13: -> lhs_and
                     {
                         adaptor.addChild(root_0, stream_lhs_and.next());
 
@@ -5498,58 +5660,58 @@
 
                     }
 
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:3: ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
-                    loop45:
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:3: ( ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and ) )*
+                    loop43:
                     do {
-                        int alt45=2;
-                        int LA45_0 = input.LA(1);
+                        int alt43=2;
+                        int LA43_0 = input.LA(1);
 
-                        if ( (LA45_0==ID) ) {
-                            int LA45_2 = input.LA(2);
+                        if ( (LA43_0==ID) ) {
+                            int LA43_2 = input.LA(2);
 
                             if ( ((synpred2()&&(validateIdentifierKey(DroolsSoftKeywords.OR)))) ) {
-                                alt45=1;
+                                alt43=1;
                             }
 
 
                         }
-                        else if ( (LA45_0==DOUBLE_PIPE) ) {
-                            int LA45_3 = input.LA(2);
+                        else if ( (LA43_0==DOUBLE_PIPE) ) {
+                            int LA43_3 = input.LA(2);
 
                             if ( (synpred2()) ) {
-                                alt45=1;
+                                alt43=1;
                             }
 
 
                         }
 
 
-                        switch (alt45) {
+                        switch (alt43) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:5: ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:5: ( or_key | DOUBLE_PIPE )=> (value= or_key | pipe= DOUBLE_PIPE ) lhs_and
                     	    {
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:28: (value= or_key | pipe= DOUBLE_PIPE )
-                    	    int alt44=2;
-                    	    int LA44_0 = input.LA(1);
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:28: (value= or_key | pipe= DOUBLE_PIPE )
+                    	    int alt42=2;
+                    	    int LA42_0 = input.LA(1);
 
-                    	    if ( (LA44_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    	        alt44=1;
+                    	    if ( (LA42_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    	        alt42=1;
                     	    }
-                    	    else if ( (LA44_0==DOUBLE_PIPE) ) {
-                    	        alt44=2;
+                    	    else if ( (LA42_0==DOUBLE_PIPE) ) {
+                    	        alt42=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("573:28: (value= or_key | pipe= DOUBLE_PIPE )", 44, 0, input);
+                    	            new NoViableAltException("726:28: (value= or_key | pipe= DOUBLE_PIPE )", 42, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt44) {
+                    	    switch (alt42) {
                     	        case 1 :
-                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:29: value= or_key
+                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:29: value= or_key
                     	            {
-                    	            pushFollow(FOLLOW_or_key_in_lhs_or1910);
+                    	            pushFollow(FOLLOW_or_key_in_lhs_or2085);
                     	            value=or_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -5561,14 +5723,14 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:69: pipe= DOUBLE_PIPE
+                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:69: pipe= DOUBLE_PIPE
                     	            {
                     	            pipe=(Token)input.LT(1);
-                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or1917); if (failed) return retval;
+                    	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_lhs_or2092); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
                     	            if ( backtracking==0 ) {
-                    	              orToken = pipe;
+                    	              orToken = pipe; emit(pipe, DroolsEditorType.SYMBOL);
                     	            }
 
                     	            }
@@ -5576,11 +5738,14 @@
 
                     	    }
 
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1922);
-                    	    lhs_and128=lhs_and();
+                    	    if ( backtracking==0 ) {
+                    	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
+                    	    }
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2103);
+                    	    lhs_and123=lhs_and();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and128.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_and.add(lhs_and123.getTree());
 
                     	    // AST REWRITE
                     	    // elements: lhs_and, lhs_or
@@ -5593,9 +5758,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 574:3: -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
+                    	    // 729:3: -> ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
                     	    {
-                    	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:574:6: ^( VT_OR_INFIX[orToken] $lhs_or lhs_and )
+                    	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:729: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);
@@ -5614,7 +5779,7 @@
                     	    break;
 
                     	default :
-                    	    break loop45;
+                    	    break loop43;
                         }
                     } while (true);
 
@@ -5646,7 +5811,7 @@
     };
 
     // $ANTLR start lhs_and
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:577: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 ) )* );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:732: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);
@@ -5654,22 +5819,22 @@
         Object root_0 = null;
 
         Token amper=null;
-        Token LEFT_PAREN129=null;
-        Token RIGHT_PAREN131=null;
+        Token LEFT_PAREN124=null;
+        Token RIGHT_PAREN126=null;
         and_key_return and = null;
 
         and_key_return value = null;
 
-        lhs_unary_return lhs_unary130 = null;
+        lhs_unary_return lhs_unary125 = null;
 
-        lhs_unary_return lhs_unary132 = null;
+        lhs_unary_return lhs_unary127 = null;
 
-        lhs_unary_return lhs_unary133 = null;
+        lhs_unary_return lhs_unary128 = null;
 
 
         Object amper_tree=null;
-        Object LEFT_PAREN129_tree=null;
-        Object RIGHT_PAREN131_tree=null;
+        Object LEFT_PAREN124_tree=null;
+        Object RIGHT_PAREN126_tree=null;
         RewriteRuleTokenStream stream_DOUBLE_AMPER=new RewriteRuleTokenStream(adaptor,"token DOUBLE_AMPER");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
@@ -5679,20 +5844,23 @@
         	Token andToken = null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580: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);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735: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 alt48=2;
+            int LA48_0 = input.LA(1);
 
-            if ( (LA50_0==LEFT_PAREN) ) {
-                int LA50_1 = input.LA(2);
+            if ( (LA48_0==LEFT_PAREN) ) {
+                int LA48_1 = input.LA(2);
 
-                if ( (LA50_1==ID) ) {
+                if ( (LA48_1==LEFT_PAREN) ) {
+                    alt48=2;
+                }
+                else if ( (LA48_1==ID) ) {
                     switch ( input.LA(3) ) {
                     case DOT:
                     case COLON:
                     case LEFT_SQUARE:
                         {
-                        alt50=2;
+                        alt48=2;
                         }
                         break;
                     case LEFT_PAREN:
@@ -5700,18 +5868,18 @@
                         switch ( input.LA(4) ) {
                         case ID:
                             {
-                            int LA50_6 = input.LA(5);
+                            int LA48_6 = input.LA(5);
 
                             if ( (synpred3()) ) {
-                                alt50=1;
+                                alt48=1;
                             }
                             else if ( (true) ) {
-                                alt50=2;
+                                alt48=2;
                             }
                             else {
                                 if (backtracking>0) {failed=true; return retval;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("577: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("732: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 ) )* );", 48, 6, input);
 
                                 throw nvae;
                             }
@@ -5719,18 +5887,18 @@
                             break;
                         case LEFT_PAREN:
                             {
-                            int LA50_7 = input.LA(5);
+                            int LA48_7 = input.LA(5);
 
                             if ( (synpred3()) ) {
-                                alt50=1;
+                                alt48=1;
                             }
                             else if ( (true) ) {
-                                alt50=2;
+                                alt48=2;
                             }
                             else {
                                 if (backtracking>0) {failed=true; return retval;}
                                 NoViableAltException nvae =
-                                    new NoViableAltException("577: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);
+                                    new NoViableAltException("732: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 ) )* );", 48, 7, input);
 
                                 throw nvae;
                             }
@@ -5790,7 +5958,6 @@
                         case VK_SALIENCE:
                         case VK_ENABLED:
                         case VK_ATTRIBUTES:
-                        case VK_WHEN:
                         case VK_RULE:
                         case VK_IMPORT:
                         case VK_PACKAGE:
@@ -5812,13 +5979,8 @@
                         case VK_AND:
                         case VK_EXISTS:
                         case VK_FORALL:
-                        case VK_FROM:
-                        case VK_ACCUMULATE:
-                        case VK_INIT:
                         case VK_ACTION:
                         case VK_REVERSE:
-                        case VK_RESULT:
-                        case VK_COLLECT:
                         case SEMICOLON:
                         case DOT:
                         case DOT_STAR:
@@ -5829,11 +5991,17 @@
                         case AT:
                         case COLON:
                         case EQUALS:
+                        case WHEN:
                         case BOOL:
                         case INT:
                         case DOUBLE_PIPE:
                         case DOUBLE_AMPER:
+                        case FROM:
                         case OVER:
+                        case ACCUMULATE:
+                        case INIT:
+                        case RESULT:
+                        case COLLECT:
                         case ARROW:
                         case EQUAL:
                         case GREATER:
@@ -5860,13 +6028,13 @@
                         case C_STYLE_SINGLE_LINE_COMMENT:
                         case MULTI_LINE_COMMENT:
                             {
-                            alt50=2;
+                            alt48=2;
                             }
                             break;
                         default:
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("577: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("732: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 ) )* );", 48, 4, input);
 
                             throw nvae;
                         }
@@ -5875,18 +6043,18 @@
                         break;
                     case ID:
                         {
-                        int LA50_5 = input.LA(4);
+                        int LA48_5 = input.LA(4);
 
                         if ( (synpred3()) ) {
-                            alt50=1;
+                            alt48=1;
                         }
                         else if ( (true) ) {
-                            alt50=2;
+                            alt48=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("577: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("732: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 ) )* );", 48, 5, input);
 
                             throw nvae;
                         }
@@ -5895,88 +6063,94 @@
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("577: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("732: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 ) )* );", 48, 3, input);
 
                         throw nvae;
                     }
 
                 }
-                else if ( (LA50_1==LEFT_PAREN) ) {
-                    alt50=2;
-                }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("577: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("732: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 ) )* );", 48, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA50_0==ID) ) {
-                alt50=2;
+            else if ( (LA48_0==ID) ) {
+                alt48=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("577: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("732: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 ) )* );", 48, 0, input);
 
                 throw nvae;
             }
-            switch (alt50) {
+            switch (alt48) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735:5: ( LEFT_PAREN and_key )=> LEFT_PAREN and= and_key ( lhs_unary )+ RIGHT_PAREN
                     {
-                    LEFT_PAREN129=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and1960); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN129);
+                    LEFT_PAREN124=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2144); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN124);
 
-                    pushFollow(FOLLOW_and_key_in_lhs_and1964);
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN124, DroolsEditorType.SYMBOL);	
+                    }
+                    pushFollow(FOLLOW_and_key_in_lhs_and2154);
                     and=and_key();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_and_key.add(and.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:51: ( lhs_unary )+
-                    int cnt47=0;
-                    loop47:
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
+                    }
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:4: ( lhs_unary )+
+                    int cnt45=0;
+                    loop45:
                     do {
-                        int alt47=2;
-                        int LA47_0 = input.LA(1);
+                        int alt45=2;
+                        int LA45_0 = input.LA(1);
 
-                        if ( (LA47_0==ID||LA47_0==LEFT_PAREN) ) {
-                            alt47=1;
+                        if ( (LA45_0==ID||LA45_0==LEFT_PAREN) ) {
+                            alt45=1;
                         }
 
 
-                        switch (alt47) {
+                        switch (alt45) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:51: lhs_unary
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:4: lhs_unary
                     	    {
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1966);
-                    	    lhs_unary130=lhs_unary();
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2162);
+                    	    lhs_unary125=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_unary125.getTree());
 
                     	    }
                     	    break;
 
                     	default :
-                    	    if ( cnt47 >= 1 ) break loop47;
+                    	    if ( cnt45 >= 1 ) break loop45;
                     	    if (backtracking>0) {failed=true; return retval;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(47, input);
+                                    new EarlyExitException(45, input);
                                 throw eee;
                         }
-                        cnt47++;
+                        cnt45++;
                     } while (true);
 
-                    RIGHT_PAREN131=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and1969); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN131);
+                    RIGHT_PAREN126=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2168); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN126);
 
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN126, DroolsEditorType.SYMBOL);	
+                    }
 
                     // AST REWRITE
-                    // elements: lhs_unary, RIGHT_PAREN
+                    // elements: RIGHT_PAREN, lhs_unary
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -5986,9 +6160,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 581:3: -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
+                    // 741:3: -> ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:581:6: ^( VT_AND_PREFIX[$and.start] ( lhs_unary )+ RIGHT_PAREN )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:741: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);
@@ -6013,16 +6187,16 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582: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 ) )*
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742: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 ) )*
                     {
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582:4: ( lhs_unary -> lhs_unary )
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582:5: lhs_unary
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742:4: ( lhs_unary -> lhs_unary )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742:5: lhs_unary
                     {
-                    pushFollow(FOLLOW_lhs_unary_in_lhs_and1990);
-                    lhs_unary132=lhs_unary();
+                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2192);
+                    lhs_unary127=lhs_unary();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary132.getTree());
+                    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary127.getTree());
 
                     // AST REWRITE
                     // elements: lhs_unary
@@ -6035,7 +6209,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 582:15: -> lhs_unary
+                    // 742:15: -> lhs_unary
                     {
                         adaptor.addChild(root_0, stream_lhs_unary.next());
 
@@ -6045,58 +6219,58 @@
 
                     }
 
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:3: ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
-                    loop49:
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:3: ( ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary ) )*
+                    loop47:
                     do {
-                        int alt49=2;
-                        int LA49_0 = input.LA(1);
+                        int alt47=2;
+                        int LA47_0 = input.LA(1);
 
-                        if ( (LA49_0==ID) ) {
-                            int LA49_2 = input.LA(2);
+                        if ( (LA47_0==ID) ) {
+                            int LA47_2 = input.LA(2);
 
                             if ( ((synpred4()&&(validateIdentifierKey(DroolsSoftKeywords.AND)))) ) {
-                                alt49=1;
+                                alt47=1;
                             }
 
 
                         }
-                        else if ( (LA49_0==DOUBLE_AMPER) ) {
-                            int LA49_3 = input.LA(2);
+                        else if ( (LA47_0==DOUBLE_AMPER) ) {
+                            int LA47_3 = input.LA(2);
 
                             if ( (synpred4()) ) {
-                                alt49=1;
+                                alt47=1;
                             }
 
 
                         }
 
 
-                        switch (alt49) {
+                        switch (alt47) {
                     	case 1 :
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:5: ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:5: ( and_key | DOUBLE_AMPER )=> (value= and_key | amper= DOUBLE_AMPER ) lhs_unary
                     	    {
-                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:30: (value= and_key | amper= DOUBLE_AMPER )
-                    	    int alt48=2;
-                    	    int LA48_0 = input.LA(1);
+                    	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:30: (value= and_key | amper= DOUBLE_AMPER )
+                    	    int alt46=2;
+                    	    int LA46_0 = input.LA(1);
 
-                    	    if ( (LA48_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-                    	        alt48=1;
+                    	    if ( (LA46_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+                    	        alt46=1;
                     	    }
-                    	    else if ( (LA48_0==DOUBLE_AMPER) ) {
-                    	        alt48=2;
+                    	    else if ( (LA46_0==DOUBLE_AMPER) ) {
+                    	        alt46=2;
                     	    }
                     	    else {
                     	        if (backtracking>0) {failed=true; return retval;}
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("583:30: (value= and_key | amper= DOUBLE_AMPER )", 48, 0, input);
+                    	            new NoViableAltException("743:30: (value= and_key | amper= DOUBLE_AMPER )", 46, 0, input);
 
                     	        throw nvae;
                     	    }
-                    	    switch (alt48) {
+                    	    switch (alt46) {
                     	        case 1 :
-                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:31: value= and_key
+                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:31: value= and_key
                     	            {
-                    	            pushFollow(FOLLOW_and_key_in_lhs_and2012);
+                    	            pushFollow(FOLLOW_and_key_in_lhs_and2214);
                     	            value=and_key();
                     	            _fsp--;
                     	            if (failed) return retval;
@@ -6108,14 +6282,14 @@
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:73: amper= DOUBLE_AMPER
+                    	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:73: amper= DOUBLE_AMPER
                     	            {
                     	            amper=(Token)input.LT(1);
-                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2019); if (failed) return retval;
+                    	            match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_lhs_and2221); if (failed) return retval;
                     	            if ( backtracking==0 ) stream_DOUBLE_AMPER.add(amper);
 
                     	            if ( backtracking==0 ) {
-                    	              andToken = amper;
+                    	              andToken = amper; emit(amper, DroolsEditorType.SYMBOL);
                     	            }
 
                     	            }
@@ -6123,14 +6297,17 @@
 
                     	    }
 
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2024);
-                    	    lhs_unary133=lhs_unary();
+                    	    if ( backtracking==0 ) {
+                    	      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	
+                    	    }
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2232);
+                    	    lhs_unary128=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return retval;
-                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary133.getTree());
+                    	    if ( backtracking==0 ) stream_lhs_unary.add(lhs_unary128.getTree());
 
                     	    // AST REWRITE
-                    	    // elements: lhs_unary, lhs_and
+                    	    // elements: lhs_and, lhs_unary
                     	    // token labels: 
                     	    // rule labels: retval
                     	    // token list labels: 
@@ -6140,9 +6317,9 @@
                     	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     	    root_0 = (Object)adaptor.nil();
-                    	    // 584:3: -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
+                    	    // 746:3: -> ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
                     	    {
-                    	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:584:6: ^( VT_AND_INFIX[andToken] $lhs_and lhs_unary )
+                    	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:746: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);
@@ -6161,7 +6338,7 @@
                     	    break;
 
                     	default :
-                    	    break loop49;
+                    	    break loop47;
                         }
                     } while (true);
 
@@ -6193,194 +6370,203 @@
     };
 
     // $ANTLR start lhs_unary
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:587:1: lhs_unary options {backtrack=true; } : ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:749: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_PAREN139=null;
-        Token RIGHT_PAREN141=null;
-        Token SEMICOLON143=null;
-        lhs_exist_return lhs_exist134 = null;
+        Token LEFT_PAREN134=null;
+        Token RIGHT_PAREN136=null;
+        Token SEMICOLON138=null;
+        lhs_exist_return lhs_exist129 = null;
 
-        lhs_not_binding_return lhs_not_binding135 = null;
+        lhs_not_binding_return lhs_not_binding130 = null;
 
-        lhs_not_return lhs_not136 = null;
+        lhs_not_return lhs_not131 = null;
 
-        lhs_eval_return lhs_eval137 = null;
+        lhs_eval_return lhs_eval132 = null;
 
-        lhs_forall_return lhs_forall138 = null;
+        lhs_forall_return lhs_forall133 = null;
 
-        lhs_or_return lhs_or140 = null;
+        lhs_or_return lhs_or135 = null;
 
-        pattern_source_return pattern_source142 = null;
+        pattern_source_return pattern_source137 = null;
 
 
-        Object LEFT_PAREN139_tree=null;
-        Object RIGHT_PAREN141_tree=null;
-        Object SEMICOLON143_tree=null;
+        Object LEFT_PAREN134_tree=null;
+        Object RIGHT_PAREN136_tree=null;
+        Object SEMICOLON138_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:2: ( ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:2: ( ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source ) ( ( SEMICOLON )=> SEMICOLON )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750: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();
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589: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);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )
+            int alt49=7;
+            int LA49_0 = input.LA(1);
 
-            if ( (LA51_0==ID) ) {
-                int LA51_1 = input.LA(2);
+            if ( (LA49_0==ID) ) {
+                int LA49_1 = input.LA(2);
 
                 if ( ((validateIdentifierKey(DroolsSoftKeywords.EXISTS))) ) {
-                    alt51=1;
+                    alt49=1;
                 }
                 else if ( ((validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))) ) {
-                    alt51=2;
+                    alt49=2;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                    alt51=3;
+                    alt49=3;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                    alt51=4;
+                    alt49=4;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.FORALL))) ) {
-                    alt51=5;
+                    alt49=5;
                 }
                 else if ( (true) ) {
-                    alt51=7;
+                    alt49=7;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("589: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("750:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 49, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA51_0==LEFT_PAREN) ) {
-                alt51=6;
+            else if ( (LA49_0==LEFT_PAREN) ) {
+                alt49=6;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("589: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("750:4: ( lhs_exist | {...}? => lhs_not_binding | lhs_not | lhs_eval | lhs_forall | LEFT_PAREN lhs_or RIGHT_PAREN | pattern_source )", 49, 0, input);
 
                 throw nvae;
             }
-            switch (alt51) {
+            switch (alt49) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:6: lhs_exist
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:6: lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2062);
-                    lhs_exist134=lhs_exist();
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2263);
+                    lhs_exist129=lhs_exist();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist134.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_exist129.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:590:4: {...}? => lhs_not_binding
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:751: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_unary2070);
-                    lhs_not_binding135=lhs_not_binding();
+                    pushFollow(FOLLOW_lhs_not_binding_in_lhs_unary2271);
+                    lhs_not_binding130=lhs_not_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding135.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not_binding130.getTree());
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:591:5: lhs_not
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:752:5: lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2076);
-                    lhs_not136=lhs_not();
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2277);
+                    lhs_not131=lhs_not();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not136.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_not131.getTree());
 
                     }
                     break;
                 case 4 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:592:5: lhs_eval
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:753:5: lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2082);
-                    lhs_eval137=lhs_eval();
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2283);
+                    lhs_eval132=lhs_eval();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval137.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_eval132.getTree());
 
                     }
                     break;
                 case 5 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:593:5: lhs_forall
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:5: lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2088);
-                    lhs_forall138=lhs_forall();
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2289);
+                    lhs_forall133=lhs_forall();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall138.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_forall133.getTree());
 
                     }
                     break;
                 case 6 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:594:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:755:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN139=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2094); if (failed) return retval;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2097);
-                    lhs_or140=lhs_or();
+                    LEFT_PAREN134=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2295); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN134, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                    }
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2306);
+                    lhs_or135=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or140.getTree());
-                    RIGHT_PAREN141=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2099); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, lhs_or135.getTree());
+                    RIGHT_PAREN136=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2312); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN141_tree = (Object)adaptor.create(RIGHT_PAREN141);
-                    adaptor.addChild(root_0, RIGHT_PAREN141_tree);
+                    RIGHT_PAREN136_tree = (Object)adaptor.create(RIGHT_PAREN136);
+                    adaptor.addChild(root_0, RIGHT_PAREN136_tree);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN136, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 7 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:595:5: pattern_source
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:5: pattern_source
                     {
-                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2105);
-                    pattern_source142=pattern_source();
+                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2320);
+                    pattern_source137=pattern_source();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source142.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, pattern_source137.getTree());
 
                     }
                     break;
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:3: ( ( SEMICOLON )=> SEMICOLON )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:3: ( ( SEMICOLON )=> SEMICOLON )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            if ( (LA52_0==SEMICOLON) ) {
-                int LA52_1 = input.LA(2);
+            if ( (LA50_0==SEMICOLON) ) {
+                int LA50_1 = input.LA(2);
 
                 if ( (synpred5()) ) {
-                    alt52=1;
+                    alt50=1;
                 }
             }
-            switch (alt52) {
+            switch (alt50) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:4: ( SEMICOLON )=> SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:4: ( SEMICOLON )=> SEMICOLON
                     {
-                    SEMICOLON143=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2119); if (failed) return retval;
+                    SEMICOLON138=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_lhs_unary2334); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                      	emit(SEMICOLON138, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
@@ -6413,82 +6599,91 @@
     };
 
     // $ANTLR start lhs_exist
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:600: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 )? ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:763: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_PAREN146=null;
-        Token RIGHT_PAREN148=null;
-        exists_key_return exists_key144 = null;
+        Token LEFT_PAREN141=null;
+        Token RIGHT_PAREN143=null;
+        exists_key_return exists_key139 = null;
 
-        lhs_or_return lhs_or145 = null;
+        lhs_or_return lhs_or140 = null;
 
-        lhs_or_return lhs_or147 = null;
+        lhs_or_return lhs_or142 = null;
 
-        lhs_pattern_return lhs_pattern149 = null;
+        lhs_pattern_return lhs_pattern144 = null;
 
 
-        Object LEFT_PAREN146_tree=null;
-        Object RIGHT_PAREN148_tree=null;
+        Object LEFT_PAREN141_tree=null;
+        Object RIGHT_PAREN143_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_exists_key=new RewriteRuleSubtreeStream(adaptor,"rule exists_key");
         RewriteRuleSubtreeStream stream_lhs_pattern=new RewriteRuleSubtreeStream(adaptor,"rule lhs_pattern");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601: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 )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:601:4: exists_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:764: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 )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:764: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_exist2133);
-            exists_key144=exists_key();
+            pushFollow(FOLLOW_exists_key_in_lhs_exist2350);
+            exists_key139=exists_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_exists_key.add(exists_key144.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602: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) {
+            if ( backtracking==0 ) stream_exists_key.add(exists_key139.getTree());
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            int alt51=3;
+            alt51 = dfa51.predict(input);
+            switch (alt51) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:12: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
                     {
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2157);
-                    lhs_or145=lhs_or();
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2377);
+                    lhs_or140=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or145.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or140.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:603:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:767:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN146=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2164); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN146);
+                    LEFT_PAREN141=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2384); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN141);
 
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2166);
-                    lhs_or147=lhs_or();
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN141, DroolsEditorType.SYMBOL);	
+                    }
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2392);
+                    lhs_or142=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or147.getTree());
-                    RIGHT_PAREN148=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2168); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN148);
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or142.getTree());
+                    RIGHT_PAREN143=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2399); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN143);
 
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN143, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:604:12: lhs_pattern
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:770:12: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2181);
-                    lhs_pattern149=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2414);
+                    lhs_pattern144=lhs_pattern();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern149.getTree());
+                    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern144.getTree());
 
                     }
                     break;
@@ -6497,7 +6692,7 @@
 
 
             // AST REWRITE
-            // elements: lhs_pattern, exists_key, RIGHT_PAREN, lhs_or
+            // elements: RIGHT_PAREN, lhs_or, lhs_pattern, exists_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6507,26 +6702,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 606:10: -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 772:10: -> ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:13: ^( exists_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:26: ( lhs_or )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772:26: ( lhs_or )?
                 if ( stream_lhs_or.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_or.next());
 
                 }
                 stream_lhs_or.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:34: ( lhs_pattern )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772:34: ( lhs_pattern )?
                 if ( stream_lhs_pattern.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_pattern.next());
 
                 }
                 stream_lhs_pattern.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:47: ( RIGHT_PAREN )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772:47: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -6565,37 +6760,37 @@
     };
 
     // $ANTLR start lhs_not_binding
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:609:1: lhs_not_binding : not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:775: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_key150 = null;
+        not_key_return not_key145 = null;
 
-        fact_binding_return fact_binding151 = null;
+        fact_binding_return fact_binding146 = null;
 
 
         RewriteRuleSubtreeStream stream_fact_binding=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding");
         RewriteRuleSubtreeStream stream_not_key=new RewriteRuleSubtreeStream(adaptor,"rule not_key");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:610:2: ( not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:610:4: not_key fact_binding
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:776:2: ( not_key fact_binding -> ^( not_key ^( VT_PATTERN fact_binding ) ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:776:4: not_key fact_binding
             {
-            pushFollow(FOLLOW_not_key_in_lhs_not_binding2227);
-            not_key150=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not_binding2460);
+            not_key145=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key150.getTree());
-            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2229);
-            fact_binding151=fact_binding();
+            if ( backtracking==0 ) stream_not_key.add(not_key145.getTree());
+            pushFollow(FOLLOW_fact_binding_in_lhs_not_binding2462);
+            fact_binding146=fact_binding();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact_binding.add(fact_binding151.getTree());
+            if ( backtracking==0 ) stream_fact_binding.add(fact_binding146.getTree());
 
             // AST REWRITE
-            // elements: not_key, fact_binding
+            // elements: fact_binding, not_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6605,14 +6800,14 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 611:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
+            // 777:2: -> ^( not_key ^( VT_PATTERN fact_binding ) )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:611:5: ^( not_key ^( VT_PATTERN fact_binding ) )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:777:5: ^( not_key ^( VT_PATTERN fact_binding ) )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_not_key.nextNode(), root_1);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:611:15: ^( VT_PATTERN fact_binding )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:777:15: ^( VT_PATTERN fact_binding )
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_2);
@@ -6654,82 +6849,94 @@
     };
 
     // $ANTLR start lhs_not
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614: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 )? ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:780: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_PAREN154=null;
-        Token RIGHT_PAREN156=null;
-        not_key_return not_key152 = null;
+        Token LEFT_PAREN149=null;
+        Token RIGHT_PAREN151=null;
+        not_key_return not_key147 = null;
 
-        lhs_or_return lhs_or153 = null;
+        lhs_or_return lhs_or148 = null;
 
-        lhs_or_return lhs_or155 = null;
+        lhs_or_return lhs_or150 = null;
 
-        lhs_pattern_return lhs_pattern157 = null;
+        lhs_pattern_return lhs_pattern152 = null;
 
 
-        Object LEFT_PAREN154_tree=null;
-        Object RIGHT_PAREN156_tree=null;
+        Object LEFT_PAREN149_tree=null;
+        Object RIGHT_PAREN151_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");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614: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 )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:614:11: not_key ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:780: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 )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:780: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_not2252);
-            not_key152=not_key();
+            pushFollow(FOLLOW_not_key_in_lhs_not2485);
+            not_key147=not_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_not_key.add(not_key152.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615: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) {
+            if ( backtracking==0 ) stream_not_key.add(not_key147.getTree());
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )
+            int alt52=3;
+            alt52 = dfa52.predict(input);
+            switch (alt52) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:5: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:5: ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or
                     {
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2269);
-                    lhs_or153=lhs_or();
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                    }
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2507);
+                    lhs_or148=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or153.getTree());
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or148.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:616:5: LEFT_PAREN lhs_or RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:5: LEFT_PAREN lhs_or RIGHT_PAREN
                     {
-                    LEFT_PAREN154=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2276); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN154);
+                    LEFT_PAREN149=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2514); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN149);
 
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2278);
-                    lhs_or155=lhs_or();
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN149, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	
+                    }
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2523);
+                    lhs_or150=lhs_or();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or155.getTree());
-                    RIGHT_PAREN156=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2280); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN156);
+                    if ( backtracking==0 ) stream_lhs_or.add(lhs_or150.getTree());
+                    RIGHT_PAREN151=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2529); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN151);
 
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN151, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:617:6: lhs_pattern
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:786:6: lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2288);
-                    lhs_pattern157=lhs_pattern();
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2539);
+                    lhs_pattern152=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_pattern152.getTree());
 
                     }
                     break;
@@ -6738,7 +6945,7 @@
 
 
             // AST REWRITE
-            // elements: not_key, RIGHT_PAREN, lhs_pattern, lhs_or
+            // elements: RIGHT_PAREN, lhs_pattern, not_key, lhs_or
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6748,26 +6955,26 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 618:10: -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+            // 787:10: -> ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:13: ^( not_key ( lhs_or )? ( lhs_pattern )? ( RIGHT_PAREN )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:787: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);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:23: ( lhs_or )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:787:23: ( lhs_or )?
                 if ( stream_lhs_or.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_or.next());
 
                 }
                 stream_lhs_or.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:31: ( lhs_pattern )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:787:31: ( lhs_pattern )?
                 if ( stream_lhs_pattern.hasNext() ) {
                     adaptor.addChild(root_1, stream_lhs_pattern.next());
 
                 }
                 stream_lhs_pattern.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:44: ( RIGHT_PAREN )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:787:44: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -6806,7 +7013,7 @@
     };
 
     // $ANTLR start lhs_eval
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:621:1: lhs_eval : ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:790: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);
@@ -6821,26 +7028,32 @@
         RewriteRuleSubtreeStream stream_eval_key=new RewriteRuleSubtreeStream(adaptor,"rule eval_key");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:622:2: (ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:622:4: ev= eval_key pc= paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:791:2: (ev= eval_key pc= paren_chunk -> ^( eval_key paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:791:4: ev= eval_key pc= paren_chunk
             {
-            pushFollow(FOLLOW_eval_key_in_lhs_eval2327);
+            pushFollow(FOLLOW_eval_key_in_lhs_eval2578);
             ev=eval_key();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_eval_key.add(ev.getTree());
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2331);
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_EVAL);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2587);
             pc=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(pc.getTree());
             if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
+            }
+            if ( backtracking==0 ) {
               	String body = safeSubstring( input.toString(pc.start,pc.stop), 1, input.toString(pc.start,pc.stop).length()-1 );
               		checkTrailingSemicolon( body, ((Token)ev.start) );	
             }
 
             // AST REWRITE
-            // elements: eval_key, paren_chunk
+            // elements: paren_chunk, eval_key
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6850,9 +7063,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 625:3: -> ^( eval_key paren_chunk )
+            // 797:3: -> ^( eval_key paren_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625:6: ^( eval_key paren_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:797:6: ^( eval_key paren_chunk )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_eval_key.nextNode(), root_1);
@@ -6891,81 +7104,87 @@
     };
 
     // $ANTLR start lhs_forall
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:628:1: lhs_forall : forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:800: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_PAREN159=null;
-        Token RIGHT_PAREN161=null;
-        forall_key_return forall_key158 = null;
+        Token LEFT_PAREN154=null;
+        Token RIGHT_PAREN156=null;
+        forall_key_return forall_key153 = null;
 
-        lhs_pattern_return lhs_pattern160 = null;
+        lhs_pattern_return lhs_pattern155 = null;
 
 
-        Object LEFT_PAREN159_tree=null;
-        Object RIGHT_PAREN161_tree=null;
+        Object LEFT_PAREN154_tree=null;
+        Object RIGHT_PAREN156_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:629:2: ( forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:629:4: forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:801:2: ( forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:801:4: forall_key LEFT_PAREN ( lhs_pattern )+ RIGHT_PAREN
             {
-            pushFollow(FOLLOW_forall_key_in_lhs_forall2355);
-            forall_key158=forall_key();
+            pushFollow(FOLLOW_forall_key_in_lhs_forall2614);
+            forall_key153=forall_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_forall_key.add(forall_key158.getTree());
-            LEFT_PAREN159=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2357); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN159);
+            if ( backtracking==0 ) stream_forall_key.add(forall_key153.getTree());
+            LEFT_PAREN154=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2619); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN154);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:629:26: ( lhs_pattern )+
-            int cnt55=0;
-            loop55:
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN154, DroolsEditorType.SYMBOL);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:4: ( lhs_pattern )+
+            int cnt53=0;
+            loop53:
             do {
-                int alt55=2;
-                int LA55_0 = input.LA(1);
+                int alt53=2;
+                int LA53_0 = input.LA(1);
 
-                if ( (LA55_0==ID) ) {
-                    alt55=1;
+                if ( (LA53_0==ID) ) {
+                    alt53=1;
                 }
 
 
-                switch (alt55) {
+                switch (alt53) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:629:26: lhs_pattern
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:4: lhs_pattern
             	    {
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2359);
-            	    lhs_pattern160=lhs_pattern();
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2627);
+            	    lhs_pattern155=lhs_pattern();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern160.getTree());
+            	    if ( backtracking==0 ) stream_lhs_pattern.add(lhs_pattern155.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    if ( cnt55 >= 1 ) break loop55;
+            	    if ( cnt53 >= 1 ) break loop53;
             	    if (backtracking>0) {failed=true; return retval;}
                         EarlyExitException eee =
-                            new EarlyExitException(55, input);
+                            new EarlyExitException(53, input);
                         throw eee;
                 }
-                cnt55++;
+                cnt53++;
             } while (true);
 
-            RIGHT_PAREN161=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2362); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN161);
+            RIGHT_PAREN156=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2633); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN156);
 
+            if ( backtracking==0 ) {
+              	emit(RIGHT_PAREN156, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
-            // elements: RIGHT_PAREN, forall_key, lhs_pattern
+            // elements: forall_key, RIGHT_PAREN, lhs_pattern
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6975,9 +7194,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 630:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+            // 805:3: -> ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:630:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:805:6: ^( forall_key ( lhs_pattern )+ RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_forall_key.nextNode(), root_1);
@@ -7024,399 +7243,166 @@
     };
 
     // $ANTLR start pattern_source
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:633:1: pattern_source options {backtrack=true; } : lhs_pattern ( over_clause )? ( from_key ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:808: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;
 
-        lhs_pattern_return lhs_pattern162 = null;
+        Token FROM159=null;
+        lhs_pattern_return lhs_pattern157 = null;
 
-        over_clause_return over_clause163 = null;
+        over_clause_return over_clause158 = null;
 
-        from_key_return from_key164 = null;
+        accumulate_statement_return accumulate_statement160 = null;
 
-        accumulate_statement_return accumulate_statement165 = null;
+        collect_statement_return collect_statement161 = null;
 
-        collect_statement_return collect_statement166 = null;
+        entrypoint_statement_return entrypoint_statement162 = null;
 
-        entrypoint_statement_return entrypoint_statement167 = null;
+        from_source_return from_source163 = null;
 
-        from_source_return from_source168 = null;
 
+        Object FROM159_tree=null;
 
-
+         boolean isFailed = true;	
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:2: ( lhs_pattern ( over_clause )? ( from_key ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:4: lhs_pattern ( over_clause )? ( from_key ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:811:2: ( lhs_pattern ( over_clause )? ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:811: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_source2394);
-            lhs_pattern162=lhs_pattern();
+            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2669);
+            lhs_pattern157=lhs_pattern();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_pattern162.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:636:3: ( over_clause )?
-            int alt56=2;
-            int LA56_0 = input.LA(1);
+            if ( backtracking==0 ) adaptor.addChild(root_0, lhs_pattern157.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:812:3: ( over_clause )?
+            int alt54=2;
+            int LA54_0 = input.LA(1);
 
-            if ( (LA56_0==OVER) ) {
-                alt56=1;
+            if ( (LA54_0==OVER) ) {
+                alt54=1;
             }
-            switch (alt56) {
+            switch (alt54) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:636:3: over_clause
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:812:3: over_clause
                     {
-                    pushFollow(FOLLOW_over_clause_in_pattern_source2398);
-                    over_clause163=over_clause();
+                    pushFollow(FOLLOW_over_clause_in_pattern_source2673);
+                    over_clause158=over_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause163.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, over_clause158.getTree());
 
                     }
                     break;
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:637:3: ( from_key ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
-            int alt58=2;
-            int LA58_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:813:3: ( FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source ) )?
+            int alt56=2;
+            int LA56_0 = input.LA(1);
 
-            if ( (LA58_0==ID) ) {
-                int LA58_1 = input.LA(2);
-
-                if ( (LA58_1==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(validateNotWithBinding()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.OR))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) {
-                    int LA58_3 = input.LA(3);
-
-                    if ( (LA58_3==SEMICOLON||LA58_3==END||(LA58_3>=COMMA && LA58_3<=RIGHT_PAREN)||(LA58_3>=DOUBLE_PIPE && LA58_3<=DOUBLE_AMPER)||LA58_3==THEN||LA58_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.FROM)))) {
-                        alt58=1;
+            if ( (LA56_0==FROM) ) {
+                alt56=1;
+            }
+            switch (alt56) {
+                case 1 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:814:4: FROM ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    {
+                    FROM159=(Token)input.LT(1);
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2683); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    FROM159_tree = (Object)adaptor.create(FROM159);
+                    root_0 = (Object)adaptor.becomeRoot(FROM159_tree, root_0);
                     }
-                    else if ( (LA58_3==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                        int LA58_6 = input.LA(4);
-
-                        if ( (LA58_6==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                            int LA58_10 = input.LA(5);
-
-                            if ( (LA58_10==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                                int LA58_11 = input.LA(6);
-
-                                if ( (LA58_11==RIGHT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.OR))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) {
-                                    int LA58_14 = input.LA(7);
-
-                                    if ( (LA58_14==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                                        int LA58_16 = input.LA(8);
-
-                                        if ( ((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                                            alt58=1;
-                                        }
-                                    }
-                                    else if ( ((LA58_14>=SEMICOLON && LA58_14<=DOT)||LA58_14==END||(LA58_14>=COMMA && LA58_14<=RIGHT_PAREN)||(LA58_14>=DOUBLE_PIPE && LA58_14<=DOUBLE_AMPER)||LA58_14==THEN) && ((validateIdentifierKey(DroolsSoftKeywords.FROM)))) {
-                                        alt58=1;
-                                    }
-                                }
-                                else if ( ((LA58_11>=VT_COMPILATION_UNIT && LA58_11<=LEFT_SQUARE)||(LA58_11>=THEN && LA58_11<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.FROM)))) {
-                                    alt58=1;
-                                }
-                            }
-                            else if ( (LA58_10==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                                int LA58_12 = input.LA(6);
-
-                                if ( ((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                                    alt58=1;
-                                }
-                            }
-                            else if ( (LA58_10==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                                int LA58_13 = input.LA(6);
-
-                                if ( (LA58_13==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                                    int LA58_15 = input.LA(7);
-
-                                    if ( ((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                                        alt58=1;
-                                    }
-                                }
-                            }
-                            else if ( ((LA58_10>=SEMICOLON && LA58_10<=ID)||LA58_10==END||(LA58_10>=COMMA && LA58_10<=RIGHT_PAREN)||(LA58_10>=DOUBLE_PIPE && LA58_10<=DOUBLE_AMPER)||LA58_10==THEN) && ((validateIdentifierKey(DroolsSoftKeywords.FROM)))) {
-                                alt58=1;
-                            }
-                        }
+                    if ( backtracking==0 ) {
+                      	emit(FROM159, DroolsEditorType.KEYWORD);
+                      			emit(Location.LOCATION_LHS_FROM);	
                     }
-                    else if ( (LA58_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.OR))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) {
-                        int LA58_8 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                            alt58=1;
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
+                    int alt55=4;
+                    switch ( input.LA(1) ) {
+                    case ACCUMULATE:
+                        {
+                        alt55=1;
                         }
-                    }
-                    else if ( (LA58_3==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.FROM))||(validateIdentifierKey(DroolsSoftKeywords.EXISTS))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-                        int LA58_9 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                            alt58=1;
+                        break;
+                    case COLLECT:
+                        {
+                        alt55=2;
                         }
-                    }
-                }
-            }
-            switch (alt58) {
-                case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:638:4: from_key ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
-                    {
-                    pushFollow(FOLLOW_from_key_in_pattern_source2408);
-                    from_key164=from_key();
-                    _fsp--;
-                    if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(from_key164.getTree(), root_0);
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )
-                    int alt57=4;
-                    int LA57_0 = input.LA(1);
+                        break;
+                    case ID:
+                        {
+                        int LA55_3 = input.LA(2);
 
-                    if ( (LA57_0==ID) ) {
-                        int LA57_1 = input.LA(2);
-
-                        if ( (LA57_1==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
-                            alt57=3;
+                        if ( (LA55_3==MISC) && ((validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT)))) {
+                            alt55=3;
                         }
-                        else if ( (LA57_1==LEFT_PAREN) ) {
-                            switch ( input.LA(3) ) {
-                            case ID:
-                                {
-                                int LA57_5 = input.LA(4);
-
-                                if ( ((validateIdentifierKey(DroolsSoftKeywords.ACCUMULATE))) ) {
-                                    alt57=1;
-                                }
-                                else if ( ((validateIdentifierKey(DroolsSoftKeywords.COLLECT))) ) {
-                                    alt57=2;
-                                }
-                                else if ( (true) ) {
-                                    alt57=4;
-                                }
-                                else {
-                                    if (backtracking>0) {failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 5, input);
-
-                                    throw nvae;
-                                }
-                                }
-                                break;
-                            case LEFT_PAREN:
-                                {
-                                int LA57_6 = input.LA(4);
-
-                                if ( ((validateIdentifierKey(DroolsSoftKeywords.ACCUMULATE))) ) {
-                                    alt57=1;
-                                }
-                                else if ( (true) ) {
-                                    alt57=4;
-                                }
-                                else {
-                                    if (backtracking>0) {failed=true; return retval;}
-                                    NoViableAltException nvae =
-                                        new NoViableAltException("639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 6, input);
-
-                                    throw nvae;
-                                }
-                                }
-                                break;
-                            case VT_COMPILATION_UNIT:
-                            case VT_FUNCTION_IMPORT:
-                            case VT_FACT:
-                            case VT_CONSTRAINTS:
-                            case VT_LABEL:
-                            case VT_QUERY_ID:
-                            case VT_TEMPLATE_ID:
-                            case VT_TYPE_DECLARE_ID:
-                            case VT_RULE_ID:
-                            case VT_ENTRYPOINT_ID:
-                            case VT_SLOT_ID:
-                            case VT_SLOT:
-                            case VT_RULE_ATTRIBUTES:
-                            case VT_RHS_CHUNK:
-                            case VT_CURLY_CHUNK:
-                            case VT_SQUARE_CHUNK:
-                            case VT_PAREN_CHUNK:
-                            case VT_BEHAVIOR:
-                            case VT_AND_IMPLICIT:
-                            case VT_AND_PREFIX:
-                            case VT_OR_PREFIX:
-                            case VT_AND_INFIX:
-                            case VT_OR_INFIX:
-                            case VT_ACCUMULATE_INIT_CLAUSE:
-                            case VT_ACCUMULATE_ID_CLAUSE:
-                            case VT_FROM_SOURCE:
-                            case VT_EXPRESSION_CHAIN:
-                            case VT_PATTERN:
-                            case VT_FACT_BINDING:
-                            case VT_FACT_OR:
-                            case VT_BIND_FIELD:
-                            case VT_FIELD:
-                            case VT_ACCESSOR_PATH:
-                            case VT_ACCESSOR_ELEMENT:
-                            case VT_DATA_TYPE:
-                            case VT_PATTERN_TYPE:
-                            case VT_PACKAGE_ID:
-                            case VT_IMPORT_ID:
-                            case VT_GLOBAL_ID:
-                            case VT_FUNCTION_ID:
-                            case VT_PARAM_LIST:
-                            case VK_DATE_EFFECTIVE:
-                            case VK_DATE_EXPIRES:
-                            case VK_LOCK_ON_ACTIVE:
-                            case VK_NO_LOOP:
-                            case VK_AUTO_FOCUS:
-                            case VK_ACTIVATION_GROUP:
-                            case VK_AGENDA_GROUP:
-                            case VK_RULEFLOW_GROUP:
-                            case VK_DURATION:
-                            case VK_DIALECT:
-                            case VK_SALIENCE:
-                            case VK_ENABLED:
-                            case VK_ATTRIBUTES:
-                            case VK_WHEN:
-                            case VK_RULE:
-                            case VK_IMPORT:
-                            case VK_PACKAGE:
-                            case VK_TEMPLATE:
-                            case VK_QUERY:
-                            case VK_DECLARE:
-                            case VK_FUNCTION:
-                            case VK_GLOBAL:
-                            case VK_EVAL:
-                            case VK_CONTAINS:
-                            case VK_MATCHES:
-                            case VK_EXCLUDES:
-                            case VK_SOUNDSLIKE:
-                            case VK_MEMBEROF:
-                            case VK_ENTRY_POINT:
-                            case VK_NOT:
-                            case VK_IN:
-                            case VK_OR:
-                            case VK_AND:
-                            case VK_EXISTS:
-                            case VK_FORALL:
-                            case VK_FROM:
-                            case VK_ACCUMULATE:
-                            case VK_INIT:
-                            case VK_ACTION:
-                            case VK_REVERSE:
-                            case VK_RESULT:
-                            case VK_COLLECT:
-                            case SEMICOLON:
-                            case DOT:
-                            case DOT_STAR:
-                            case END:
-                            case STRING:
-                            case COMMA:
-                            case RIGHT_PAREN:
-                            case AT:
-                            case COLON:
-                            case EQUALS:
-                            case BOOL:
-                            case INT:
-                            case DOUBLE_PIPE:
-                            case DOUBLE_AMPER:
-                            case OVER:
-                            case ARROW:
-                            case EQUAL:
-                            case GREATER:
-                            case GREATER_EQUAL:
-                            case LESS:
-                            case LESS_EQUAL:
-                            case NOT_EQUAL:
-                            case GRAVE_ACCENT:
-                            case FLOAT:
-                            case NULL:
-                            case LEFT_SQUARE:
-                            case RIGHT_SQUARE:
-                            case THEN:
-                            case LEFT_CURLY:
-                            case RIGHT_CURLY:
-                            case MISC:
-                            case EOL:
-                            case WS:
-                            case EscapeSequence:
-                            case HexDigit:
-                            case UnicodeEscape:
-                            case OctalEscape:
-                            case SH_STYLE_SINGLE_LINE_COMMENT:
-                            case C_STYLE_SINGLE_LINE_COMMENT:
-                            case MULTI_LINE_COMMENT:
-                                {
-                                alt57=4;
-                                }
-                                break;
-                            default:
-                                if (backtracking>0) {failed=true; return retval;}
-                                NoViableAltException nvae =
-                                    new NoViableAltException("639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 3, input);
-
-                                throw nvae;
-                            }
-
+                        else if ( ((LA55_3>=SEMICOLON && LA55_3<=DOT)||LA55_3==END||(LA55_3>=LEFT_PAREN && LA55_3<=RIGHT_PAREN)||(LA55_3>=DOUBLE_PIPE && LA55_3<=DOUBLE_AMPER)||LA55_3==INIT||LA55_3==THEN) ) {
+                            alt55=4;
                         }
-                        else if ( ((LA57_1>=SEMICOLON && LA57_1<=DOT)||LA57_1==END||(LA57_1>=COMMA && LA57_1<=RIGHT_PAREN)||(LA57_1>=DOUBLE_PIPE && LA57_1<=DOUBLE_AMPER)||LA57_1==THEN) ) {
-                            alt57=4;
-                        }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 1, input);
+                                new NoViableAltException("817:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 55, 3, input);
 
                             throw nvae;
                         }
-                    }
-                    else {
+                        }
+                        break;
+                    default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("639:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 57, 0, input);
+                            new NoViableAltException("817:11: ( accumulate_statement | collect_statement | entrypoint_statement | from_source )", 55, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt57) {
+
+                    switch (alt55) {
                         case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:639:14: accumulate_statement
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:14: accumulate_statement
                             {
-                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2424);
-                            accumulate_statement165=accumulate_statement();
+                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2703);
+                            accumulate_statement160=accumulate_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement165.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, accumulate_statement160.getTree());
 
                             }
                             break;
                         case 2 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:640:15: collect_statement
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:15: collect_statement
                             {
-                            pushFollow(FOLLOW_collect_statement_in_pattern_source2440);
-                            collect_statement166=collect_statement();
+                            pushFollow(FOLLOW_collect_statement_in_pattern_source2719);
+                            collect_statement161=collect_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement166.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, collect_statement161.getTree());
 
                             }
                             break;
                         case 3 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:641:15: entrypoint_statement
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:15: entrypoint_statement
                             {
-                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2457);
-                            entrypoint_statement167=entrypoint_statement();
+                            pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2736);
+                            entrypoint_statement162=entrypoint_statement();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement167.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, entrypoint_statement162.getTree());
 
                             }
                             break;
                         case 4 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:15: from_source
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:15: from_source
                             {
-                            pushFollow(FOLLOW_from_source_in_pattern_source2473);
-                            from_source168=from_source();
+                            pushFollow(FOLLOW_from_source_in_pattern_source2752);
+                            from_source163=from_source();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source168.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, from_source163.getTree());
 
                             }
                             break;
@@ -7438,12 +7424,28 @@
                 retval.tree = (Object)adaptor.rulePostProcessing(root_0);
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( backtracking==0 ) {
+               isFailed = false;	
+            }
         }
         catch (RecognitionException re) {
             reportError(re);
             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);
+            			input.consume();
+            			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE);
+            	} else if (isEditorInterfaceEnabled && input.LA(3) == EOF && input.LA(1) == COLLECT) {
+            			emit(input.LT(1), DroolsEditorType.KEYWORD);
+            			emit(input.LT(2), DroolsEditorType.SYMBOL);
+            			input.consume();
+            			emit(true, Location.LOCATION_LHS_FROM_COLLECT);
+            	}
+
         }
         return retval;
     }
@@ -7455,54 +7457,57 @@
     };
 
     // $ANTLR start over_clause
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:647:1: over_clause : OVER over_elements ( COMMA over_elements )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838: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 OVER169=null;
-        Token COMMA171=null;
-        over_elements_return over_elements170 = null;
+        Token OVER164=null;
+        Token COMMA166=null;
+        over_elements_return over_elements165 = null;
 
-        over_elements_return over_elements172 = null;
+        over_elements_return over_elements167 = null;
 
 
-        Object OVER169_tree=null;
-        Object COMMA171_tree=null;
+        Object OVER164_tree=null;
+        Object COMMA166_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:648:2: ( OVER over_elements ( COMMA over_elements )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:648:4: OVER over_elements ( COMMA over_elements )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:839:2: ( OVER over_elements ( COMMA over_elements )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:839:4: OVER over_elements ( COMMA over_elements )*
             {
             root_0 = (Object)adaptor.nil();
 
-            OVER169=(Token)input.LT(1);
-            match(input,OVER,FOLLOW_OVER_in_over_clause2501); if (failed) return retval;
+            OVER164=(Token)input.LT(1);
+            match(input,OVER,FOLLOW_OVER_in_over_clause2784); if (failed) return retval;
             if ( backtracking==0 ) {
-            OVER169_tree = (Object)adaptor.create(OVER169);
-            root_0 = (Object)adaptor.becomeRoot(OVER169_tree, root_0);
+            OVER164_tree = (Object)adaptor.create(OVER164);
+            root_0 = (Object)adaptor.becomeRoot(OVER164_tree, root_0);
             }
-            pushFollow(FOLLOW_over_elements_in_over_clause2504);
-            over_elements170=over_elements();
+            if ( backtracking==0 ) {
+              	emit(OVER164, DroolsEditorType.KEYWORD);	
+            }
+            pushFollow(FOLLOW_over_elements_in_over_clause2789);
+            over_elements165=over_elements();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements170.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:648:24: ( COMMA over_elements )*
-            loop59:
+            if ( backtracking==0 ) adaptor.addChild(root_0, over_elements165.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:4: ( COMMA over_elements )*
+            loop57:
             do {
-                int alt59=2;
-                int LA59_0 = input.LA(1);
+                int alt57=2;
+                int LA57_0 = input.LA(1);
 
-                if ( (LA59_0==COMMA) ) {
-                    int LA59_2 = input.LA(2);
+                if ( (LA57_0==COMMA) ) {
+                    int LA57_2 = input.LA(2);
 
-                    if ( (LA59_2==ID) ) {
-                        int LA59_3 = input.LA(3);
+                    if ( (LA57_2==ID) ) {
+                        int LA57_3 = input.LA(3);
 
-                        if ( (LA59_3==COLON) ) {
-                            alt59=1;
+                        if ( (LA57_3==COLON) ) {
+                            alt57=1;
                         }
 
 
@@ -7512,23 +7517,26 @@
                 }
 
 
-                switch (alt59) {
+                switch (alt57) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:648:25: COMMA over_elements
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:5: COMMA over_elements
             	    {
-            	    COMMA171=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2507); if (failed) return retval;
-            	    pushFollow(FOLLOW_over_elements_in_over_clause2510);
-            	    over_elements172=over_elements();
+            	    COMMA166=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_over_clause2796); if (failed) return retval;
+            	    if ( backtracking==0 ) {
+            	      	emit(COMMA166, DroolsEditorType.SYMBOL);	
+            	    }
+            	    pushFollow(FOLLOW_over_elements_in_over_clause2801);
+            	    over_elements167=over_elements();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements172.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, over_elements167.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop57;
                 }
             } while (true);
 
@@ -7558,67 +7566,78 @@
     };
 
     // $ANTLR start over_elements
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:651:1: over_elements : ID COLON ID paren_chunk -> ^( VT_BEHAVIOR ID ID paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:843: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);
 
         Object root_0 = null;
 
-        Token ID173=null;
-        Token COLON174=null;
-        Token ID175=null;
-        paren_chunk_return paren_chunk176 = null;
+        Token id1=null;
+        Token id2=null;
+        Token COLON168=null;
+        paren_chunk_return paren_chunk169 = null;
 
 
-        Object ID173_tree=null;
-        Object COLON174_tree=null;
-        Object ID175_tree=null;
+        Object id1_tree=null;
+        Object id2_tree=null;
+        Object COLON168_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:652:2: ( ID COLON ID paren_chunk -> ^( VT_BEHAVIOR ID ID paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:652:4: ID COLON ID paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:844:2: (id1= ID COLON id2= ID paren_chunk -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:844:4: id1= ID COLON id2= ID paren_chunk
             {
-            ID173=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2523); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID173);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_over_elements2816); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            COLON174=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_over_elements2525); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON174);
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.IDENTIFIER);	
+            }
+            COLON168=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_over_elements2823); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON168);
 
-            ID175=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_over_elements2527); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID175);
+            if ( backtracking==0 ) {
+              	emit(COLON168, DroolsEditorType.SYMBOL);	
+            }
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_over_elements2832); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
-            pushFollow(FOLLOW_paren_chunk_in_over_elements2529);
-            paren_chunk176=paren_chunk();
+            if ( backtracking==0 ) {
+              	emit(id2, DroolsEditorType.IDENTIFIER);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_over_elements2839);
+            paren_chunk169=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk176.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk169.getTree());
 
             // AST REWRITE
-            // elements: ID, paren_chunk, ID
-            // token labels: 
+            // elements: id1, paren_chunk, id2
+            // token labels: id1, id2
             // rule labels: retval
             // token list labels: 
             // rule list labels: 
             if ( backtracking==0 ) {
             retval.tree = root_0;
+            RewriteRuleTokenStream stream_id1=new RewriteRuleTokenStream(adaptor,"token id1",id1);
+            RewriteRuleTokenStream stream_id2=new RewriteRuleTokenStream(adaptor,"token id2",id2);
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 653:2: -> ^( VT_BEHAVIOR ID ID paren_chunk )
+            // 848:2: -> ^( VT_BEHAVIOR $id1 $id2 paren_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:653:5: ^( VT_BEHAVIOR ID ID paren_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848: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);
 
-                adaptor.addChild(root_1, stream_ID.next());
-                adaptor.addChild(root_1, stream_ID.next());
+                adaptor.addChild(root_1, stream_id1.next());
+                adaptor.addChild(root_1, stream_id2.next());
                 adaptor.addChild(root_1, stream_paren_chunk.next());
 
                 adaptor.addChild(root_0, root_1);
@@ -7653,67 +7672,75 @@
     };
 
     // $ANTLR start accumulate_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:656:1: accumulate_statement : accumulate_key LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( accumulate_key lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:851: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 LEFT_PAREN178=null;
-        Token COMMA180=null;
-        Token RIGHT_PAREN183=null;
-        accumulate_key_return accumulate_key177 = null;
+        Token ACCUMULATE170=null;
+        Token LEFT_PAREN171=null;
+        Token COMMA173=null;
+        Token RIGHT_PAREN176=null;
+        lhs_or_return lhs_or172 = null;
 
-        lhs_or_return lhs_or179 = null;
+        accumulate_init_clause_return accumulate_init_clause174 = null;
 
-        accumulate_init_clause_return accumulate_init_clause181 = null;
+        accumulate_id_clause_return accumulate_id_clause175 = null;
 
-        accumulate_id_clause_return accumulate_id_clause182 = null;
 
-
-        Object LEFT_PAREN178_tree=null;
-        Object COMMA180_tree=null;
-        Object RIGHT_PAREN183_tree=null;
+        Object ACCUMULATE170_tree=null;
+        Object LEFT_PAREN171_tree=null;
+        Object COMMA173_tree=null;
+        Object RIGHT_PAREN176_tree=null;
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleTokenStream stream_ACCUMULATE=new RewriteRuleTokenStream(adaptor,"token ACCUMULATE");
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_lhs_or=new RewriteRuleSubtreeStream(adaptor,"rule lhs_or");
         RewriteRuleSubtreeStream stream_accumulate_init_clause=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_init_clause");
         RewriteRuleSubtreeStream stream_accumulate_id_clause=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_id_clause");
-        RewriteRuleSubtreeStream stream_accumulate_key=new RewriteRuleSubtreeStream(adaptor,"rule accumulate_key");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:2: ( accumulate_key LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN -> ^( accumulate_key lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:4: accumulate_key LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:852: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 ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:852:4: ACCUMULATE LEFT_PAREN lhs_or ( COMMA )? ( accumulate_init_clause | accumulate_id_clause ) RIGHT_PAREN
             {
-            pushFollow(FOLLOW_accumulate_key_in_accumulate_statement2553);
-            accumulate_key177=accumulate_key();
-            _fsp--;
-            if (failed) return retval;
-            if ( backtracking==0 ) stream_accumulate_key.add(accumulate_key177.getTree());
-            LEFT_PAREN178=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2557); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN178);
+            ACCUMULATE170=(Token)input.LT(1);
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2865); if (failed) return retval;
+            if ( backtracking==0 ) stream_ACCUMULATE.add(ACCUMULATE170);
 
-            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2559);
-            lhs_or179=lhs_or();
+            if ( backtracking==0 ) {
+              	emit(ACCUMULATE170, DroolsEditorType.KEYWORD);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_ACCUMULATE);	
+            }
+            LEFT_PAREN171=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2874); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN171);
+
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN171, DroolsEditorType.SYMBOL);	
+            }
+            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2882);
+            lhs_or172=lhs_or();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_lhs_or.add(lhs_or179.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:658:21: ( COMMA )?
-            int alt60=2;
-            int LA60_0 = input.LA(1);
+            if ( backtracking==0 ) stream_lhs_or.add(lhs_or172.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:3: ( COMMA )?
+            int alt58=2;
+            int LA58_0 = input.LA(1);
 
-            if ( (LA60_0==COMMA) ) {
-                alt60=1;
+            if ( (LA58_0==COMMA) ) {
+                alt58=1;
             }
-            switch (alt60) {
+            switch (alt58) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:658:21: COMMA
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:3: COMMA
                     {
-                    COMMA180=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2561); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COMMA.add(COMMA180);
+                    COMMA173=(Token)input.LT(1);
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2887); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COMMA.add(COMMA173);
 
 
                     }
@@ -7721,42 +7748,65 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:659:3: ( accumulate_init_clause | accumulate_id_clause )
-            int alt61=2;
-            alt61 = dfa61.predict(input);
-            switch (alt61) {
+            if ( backtracking==0 ) {
+              	emit(COMMA173, DroolsEditorType.SYMBOL);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:3: ( accumulate_init_clause | accumulate_id_clause )
+            int alt59=2;
+            int LA59_0 = input.LA(1);
+
+            if ( (LA59_0==INIT) ) {
+                alt59=1;
+            }
+            else if ( (LA59_0==ID) ) {
+                alt59=2;
+            }
+            else {
+                if (backtracking>0) {failed=true; return retval;}
+                NoViableAltException nvae =
+                    new NoViableAltException("857:3: ( accumulate_init_clause | accumulate_id_clause )", 59, 0, input);
+
+                throw nvae;
+            }
+            switch (alt59) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:659:5: accumulate_init_clause
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:5: accumulate_init_clause
                     {
-                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2569);
-                    accumulate_init_clause181=accumulate_init_clause();
+                    pushFollow(FOLLOW_accumulate_init_clause_in_accumulate_statement2897);
+                    accumulate_init_clause174=accumulate_init_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause181.getTree());
+                    if ( backtracking==0 ) stream_accumulate_init_clause.add(accumulate_init_clause174.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:660:5: accumulate_id_clause
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:5: accumulate_id_clause
                     {
-                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2575);
-                    accumulate_id_clause182=accumulate_id_clause();
+                    pushFollow(FOLLOW_accumulate_id_clause_in_accumulate_statement2903);
+                    accumulate_id_clause175=accumulate_id_clause();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause182.getTree());
+                    if ( backtracking==0 ) stream_accumulate_id_clause.add(accumulate_id_clause175.getTree());
 
                     }
                     break;
 
             }
 
-            RIGHT_PAREN183=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2583); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN183);
+            RIGHT_PAREN176=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2911); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN176);
 
+            if ( backtracking==0 ) {
+              	emit(RIGHT_PAREN176, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
+            }
 
             // AST REWRITE
-            // elements: accumulate_id_clause, accumulate_init_clause, RIGHT_PAREN, lhs_or, accumulate_key
+            // elements: lhs_or, accumulate_init_clause, RIGHT_PAREN, ACCUMULATE, accumulate_id_clause
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -7766,21 +7816,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 663:3: -> ^( accumulate_key lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
+            // 862:3: -> ^( ACCUMULATE lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:663:6: ^( accumulate_key lhs_or ( accumulate_init_clause )? ( accumulate_id_clause )? RIGHT_PAREN )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862: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_key.nextNode(), root_1);
+                root_1 = (Object)adaptor.becomeRoot(stream_ACCUMULATE.next(), root_1);
 
                 adaptor.addChild(root_1, stream_lhs_or.next());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:663:30: ( accumulate_init_clause )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:26: ( accumulate_init_clause )?
                 if ( stream_accumulate_init_clause.hasNext() ) {
                     adaptor.addChild(root_1, stream_accumulate_init_clause.next());
 
                 }
                 stream_accumulate_init_clause.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:663:54: ( accumulate_id_clause )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:50: ( accumulate_id_clause )?
                 if ( stream_accumulate_id_clause.hasNext() ) {
                     adaptor.addChild(root_1, stream_accumulate_id_clause.next());
 
@@ -7820,16 +7870,18 @@
     };
 
     // $ANTLR start accumulate_init_clause
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:666:1: accumulate_init_clause : init_key pc1= paren_chunk ( COMMA )? action_key pc2= paren_chunk ( COMMA )? ( reverse_key pc3= paren_chunk ( COMMA )? )? result_key pc4= paren_chunk -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( init_key $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:866:1: accumulate_init_clause : INIT pc1= paren_chunk (cm1= COMMA )? action_key pc2= paren_chunk (cm2= COMMA )? ( reverse_key pc3= paren_chunk (cm3= COMMA )? )? RESULT pc4= paren_chunk -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( RESULT $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);
 
         Object root_0 = null;
 
-        Token COMMA185=null;
-        Token COMMA187=null;
-        Token COMMA189=null;
+        Token cm1=null;
+        Token cm2=null;
+        Token cm3=null;
+        Token INIT177=null;
+        Token RESULT180=null;
         paren_chunk_return pc1 = null;
 
         paren_chunk_return pc2 = null;
@@ -7838,52 +7890,55 @@
 
         paren_chunk_return pc4 = null;
 
-        init_key_return init_key184 = null;
+        action_key_return action_key178 = null;
 
-        action_key_return action_key186 = null;
+        reverse_key_return reverse_key179 = null;
 
-        reverse_key_return reverse_key188 = null;
 
-        result_key_return result_key190 = null;
-
-
-        Object COMMA185_tree=null;
-        Object COMMA187_tree=null;
-        Object COMMA189_tree=null;
+        Object cm1_tree=null;
+        Object cm2_tree=null;
+        Object cm3_tree=null;
+        Object INIT177_tree=null;
+        Object RESULT180_tree=null;
         RewriteRuleTokenStream stream_COMMA=new RewriteRuleTokenStream(adaptor,"token COMMA");
+        RewriteRuleTokenStream stream_INIT=new RewriteRuleTokenStream(adaptor,"token INIT");
+        RewriteRuleTokenStream stream_RESULT=new RewriteRuleTokenStream(adaptor,"token RESULT");
         RewriteRuleSubtreeStream stream_reverse_key=new RewriteRuleSubtreeStream(adaptor,"rule reverse_key");
-        RewriteRuleSubtreeStream stream_result_key=new RewriteRuleSubtreeStream(adaptor,"rule result_key");
-        RewriteRuleSubtreeStream stream_init_key=new RewriteRuleSubtreeStream(adaptor,"rule init_key");
         RewriteRuleSubtreeStream stream_action_key=new RewriteRuleSubtreeStream(adaptor,"rule action_key");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:667:2: ( init_key pc1= paren_chunk ( COMMA )? action_key pc2= paren_chunk ( COMMA )? ( reverse_key pc3= paren_chunk ( COMMA )? )? result_key pc4= paren_chunk -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( init_key $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:667:4: init_key pc1= paren_chunk ( COMMA )? action_key pc2= paren_chunk ( COMMA )? ( reverse_key pc3= paren_chunk ( COMMA )? )? result_key pc4= paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:867:2: ( INIT pc1= paren_chunk (cm1= COMMA )? action_key pc2= paren_chunk (cm2= COMMA )? ( reverse_key pc3= paren_chunk (cm3= COMMA )? )? RESULT pc4= paren_chunk -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( RESULT $pc4) ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:867:4: INIT pc1= paren_chunk (cm1= COMMA )? action_key pc2= paren_chunk (cm2= COMMA )? ( reverse_key pc3= paren_chunk (cm3= COMMA )? )? RESULT pc4= paren_chunk
             {
-            pushFollow(FOLLOW_init_key_in_accumulate_init_clause2612);
-            init_key184=init_key();
-            _fsp--;
-            if (failed) return retval;
-            if ( backtracking==0 ) stream_init_key.add(init_key184.getTree());
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2617);
+            INIT177=(Token)input.LT(1);
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause2946); if (failed) return retval;
+            if ( backtracking==0 ) stream_INIT.add(INIT177);
+
+            if ( backtracking==0 ) {
+              	emit(INIT177, DroolsEditorType.KEYWORD);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2957);
             pc1=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(pc1.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:18: ( COMMA )?
-            int alt62=2;
-            int LA62_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:869:22: (cm1= COMMA )?
+            int alt60=2;
+            int LA60_0 = input.LA(1);
 
-            if ( (LA62_0==COMMA) ) {
-                alt62=1;
+            if ( (LA60_0==COMMA) ) {
+                alt60=1;
             }
-            switch (alt62) {
+            switch (alt60) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:18: COMMA
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:869:22: cm1= COMMA
                     {
-                    COMMA185=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause2619); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COMMA.add(COMMA185);
+                    cm1=(Token)input.LT(1);
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause2961); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COMMA.add(cm1);
 
 
                     }
@@ -7891,30 +7946,36 @@
 
             }
 
-            pushFollow(FOLLOW_action_key_in_accumulate_init_clause2623);
-            action_key186=action_key();
+            if ( backtracking==0 ) {
+              	emit(cm1, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION);	
+            }
+            pushFollow(FOLLOW_action_key_in_accumulate_init_clause2972);
+            action_key178=action_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_action_key.add(action_key186.getTree());
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2627);
+            if ( backtracking==0 ) stream_action_key.add(action_key178.getTree());
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2976);
             pc2=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(pc2.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:669:29: ( COMMA )?
-            int alt63=2;
-            int LA63_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:871:33: (cm2= COMMA )?
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( (LA63_0==COMMA) ) {
-                alt63=1;
+            if ( (LA61_0==COMMA) ) {
+                alt61=1;
             }
-            switch (alt63) {
+            switch (alt61) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:669:29: COMMA
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:871:33: cm2= COMMA
                     {
-                    COMMA187=(Token)input.LT(1);
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause2629); if (failed) return retval;
-                    if ( backtracking==0 ) stream_COMMA.add(COMMA187);
+                    cm2=(Token)input.LT(1);
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause2980); if (failed) return retval;
+                    if ( backtracking==0 ) stream_COMMA.add(cm2);
 
 
                     }
@@ -7922,37 +7983,47 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:2: ( reverse_key pc3= paren_chunk ( COMMA )? )?
-            int alt65=2;
-            alt65 = dfa65.predict(input);
-            switch (alt65) {
+            if ( backtracking==0 ) {
+              	emit(cm2, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:2: ( reverse_key pc3= paren_chunk (cm3= COMMA )? )?
+            int alt63=2;
+            int LA63_0 = input.LA(1);
+
+            if ( (LA63_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {
+                alt63=1;
+            }
+            switch (alt63) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:4: reverse_key pc3= paren_chunk ( COMMA )?
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:4: reverse_key pc3= paren_chunk (cm3= COMMA )?
                     {
-                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause2635);
-                    reverse_key188=reverse_key();
+                    pushFollow(FOLLOW_reverse_key_in_accumulate_init_clause2993);
+                    reverse_key179=reverse_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key188.getTree());
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2639);
+                    if ( backtracking==0 ) stream_reverse_key.add(reverse_key179.getTree());
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2997);
                     pc3=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
                     if ( backtracking==0 ) stream_paren_chunk.add(pc3.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:32: ( COMMA )?
-                    int alt64=2;
-                    int LA64_0 = input.LA(1);
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:35: (cm3= COMMA )?
+                    int alt62=2;
+                    int LA62_0 = input.LA(1);
 
-                    if ( (LA64_0==COMMA) ) {
-                        alt64=1;
+                    if ( (LA62_0==COMMA) ) {
+                        alt62=1;
                     }
-                    switch (alt64) {
+                    switch (alt62) {
                         case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:32: COMMA
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:35: cm3= COMMA
                             {
-                            COMMA189=(Token)input.LT(1);
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause2641); if (failed) return retval;
-                            if ( backtracking==0 ) stream_COMMA.add(COMMA189);
+                            cm3=(Token)input.LT(1);
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_init_clause3001); if (failed) return retval;
+                            if ( backtracking==0 ) stream_COMMA.add(cm3);
 
 
                             }
@@ -7960,55 +8031,66 @@
 
                     }
 
+                    if ( backtracking==0 ) {
+                      	emit(cm3, DroolsEditorType.SYMBOL);	
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	
+                    }
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_result_key_in_accumulate_init_clause2647);
-            result_key190=result_key();
-            _fsp--;
-            if (failed) return retval;
-            if ( backtracking==0 ) stream_result_key.add(result_key190.getTree());
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause2651);
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	
+            }
+            RESULT180=(Token)input.LT(1);
+            match(input,RESULT,FOLLOW_RESULT_in_accumulate_init_clause3017); if (failed) return retval;
+            if ( backtracking==0 ) stream_RESULT.add(RESULT180);
+
+            if ( backtracking==0 ) {
+              	emit(RESULT180, DroolsEditorType.KEYWORD);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_init_clause3023);
             pc4=paren_chunk();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk.add(pc4.getTree());
 
             // AST REWRITE
-            // elements: pc2, result_key, pc3, action_key, pc4, init_key, pc1, reverse_key
+            // elements: pc1, pc4, action_key, pc2, INIT, RESULT, pc3, reverse_key
             // token labels: 
-            // rule labels: pc2, pc4, pc3, pc1, retval
+            // rule labels: pc2, pc3, pc4, pc1, retval
             // token list labels: 
             // rule list labels: 
             if ( backtracking==0 ) {
             retval.tree = root_0;
             RewriteRuleSubtreeStream stream_pc2=new RewriteRuleSubtreeStream(adaptor,"token pc2",pc2!=null?pc2.tree:null);
-            RewriteRuleSubtreeStream stream_pc4=new RewriteRuleSubtreeStream(adaptor,"token pc4",pc4!=null?pc4.tree:null);
             RewriteRuleSubtreeStream stream_pc3=new RewriteRuleSubtreeStream(adaptor,"token pc3",pc3!=null?pc3.tree:null);
+            RewriteRuleSubtreeStream stream_pc4=new RewriteRuleSubtreeStream(adaptor,"token pc4",pc4!=null?pc4.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);
 
             root_0 = (Object)adaptor.nil();
-            // 672:2: -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( init_key $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
+            // 878:2: -> ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( RESULT $pc4) )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:5: ^( VT_ACCUMULATE_INIT_CLAUSE ^( init_key $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( result_key $pc4) )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:5: ^( VT_ACCUMULATE_INIT_CLAUSE ^( INIT $pc1) ^( action_key $pc2) ( ^( reverse_key $pc3) )? ^( RESULT $pc4) )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_ACCUMULATE_INIT_CLAUSE, "VT_ACCUMULATE_INIT_CLAUSE"), root_1);
 
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:33: ^( init_key $pc1)
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:33: ^( INIT $pc1)
                 {
                 Object root_2 = (Object)adaptor.nil();
-                root_2 = (Object)adaptor.becomeRoot(stream_init_key.nextNode(), root_2);
+                root_2 = (Object)adaptor.becomeRoot(stream_INIT.next(), root_2);
 
                 adaptor.addChild(root_2, stream_pc1.next());
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:50: ^( action_key $pc2)
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:46: ^( action_key $pc2)
                 {
                 Object root_2 = (Object)adaptor.nil();
                 root_2 = (Object)adaptor.becomeRoot(stream_action_key.nextNode(), root_2);
@@ -8017,9 +8099,9 @@
 
                 adaptor.addChild(root_1, root_2);
                 }
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:69: ( ^( reverse_key $pc3) )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:65: ( ^( reverse_key $pc3) )?
                 if ( stream_pc3.hasNext()||stream_reverse_key.hasNext() ) {
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:69: ^( reverse_key $pc3)
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:65: ^( reverse_key $pc3)
                     {
                     Object root_2 = (Object)adaptor.nil();
                     root_2 = (Object)adaptor.becomeRoot(stream_reverse_key.nextNode(), root_2);
@@ -8032,10 +8114,10 @@
                 }
                 stream_pc3.reset();
                 stream_reverse_key.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:90: ^( result_key $pc4)
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:86: ^( RESULT $pc4)
                 {
                 Object root_2 = (Object)adaptor.nil();
-                root_2 = (Object)adaptor.becomeRoot(stream_result_key.nextNode(), root_2);
+                root_2 = (Object)adaptor.becomeRoot(stream_RESULT.next(), root_2);
 
                 adaptor.addChild(root_2, stream_pc4.next());
 
@@ -8063,6 +8145,20 @@
             recover(input,re);
         }
         finally {
+
+            	if (isEditorInterfaceEnabled && input.LA(1) == EOF) {
+            		int lastPosition = getLastIntegerValue(getActiveSentence().getContent());
+            		if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_INIT) {
+            			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE);
+            		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION) {
+            			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE);
+            		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE) {
+            			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE);
+            		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT) {
+            			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE);
+            		}
+            	}
+
         }
         return retval;
     }
@@ -8074,36 +8170,39 @@
     };
 
     // $ANTLR start accumulate_id_clause
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:675:1: accumulate_id_clause : id= ID text= paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895: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 id=null;
-        paren_chunk_return text = null;
+        Token ID181=null;
+        paren_chunk_return paren_chunk182 = null;
 
 
-        Object id_tree=null;
+        Object ID181_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:676:2: (id= ID text= paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:676:4: id= ID text= paren_chunk
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:896:2: ( ID paren_chunk -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:896:4: ID paren_chunk
             {
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accumulate_id_clause2700); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
+            ID181=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accumulate_id_clause3074); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID181);
 
-            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause2704);
-            text=paren_chunk();
+            if ( backtracking==0 ) {
+              	emit(ID181, DroolsEditorType.IDENTIFIER);	
+            }
+            pushFollow(FOLLOW_paren_chunk_in_accumulate_id_clause3080);
+            paren_chunk182=paren_chunk();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_paren_chunk.add(text.getTree());
+            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk182.getTree());
 
             // AST REWRITE
-            // elements: paren_chunk, ID
+            // elements: ID, paren_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8113,9 +8212,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 677:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+            // 898:2: -> ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:677:5: ^( VT_ACCUMULATE_ID_CLAUSE ID paren_chunk )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:898: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);
@@ -8155,51 +8254,65 @@
     };
 
     // $ANTLR start collect_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:680:1: collect_statement : collect_key LEFT_PAREN pattern_source RIGHT_PAREN -> ^( collect_key pattern_source RIGHT_PAREN ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:901: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 LEFT_PAREN192=null;
-        Token RIGHT_PAREN194=null;
-        collect_key_return collect_key191 = null;
+        Token COLLECT183=null;
+        Token LEFT_PAREN184=null;
+        Token RIGHT_PAREN186=null;
+        pattern_source_return pattern_source185 = null;
 
-        pattern_source_return pattern_source193 = null;
 
-
-        Object LEFT_PAREN192_tree=null;
-        Object RIGHT_PAREN194_tree=null;
+        Object COLLECT183_tree=null;
+        Object LEFT_PAREN184_tree=null;
+        Object RIGHT_PAREN186_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
-        RewriteRuleSubtreeStream stream_collect_key=new RewriteRuleSubtreeStream(adaptor,"rule collect_key");
+        RewriteRuleTokenStream stream_COLLECT=new RewriteRuleTokenStream(adaptor,"token COLLECT");
         RewriteRuleSubtreeStream stream_pattern_source=new RewriteRuleSubtreeStream(adaptor,"rule pattern_source");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:681:2: ( collect_key LEFT_PAREN pattern_source RIGHT_PAREN -> ^( collect_key pattern_source RIGHT_PAREN ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:681:4: collect_key LEFT_PAREN pattern_source RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:902:2: ( COLLECT LEFT_PAREN pattern_source RIGHT_PAREN -> ^( COLLECT pattern_source RIGHT_PAREN ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:902:4: COLLECT LEFT_PAREN pattern_source RIGHT_PAREN
             {
-            pushFollow(FOLLOW_collect_key_in_collect_statement2726);
-            collect_key191=collect_key();
-            _fsp--;
-            if (failed) return retval;
-            if ( backtracking==0 ) stream_collect_key.add(collect_key191.getTree());
-            LEFT_PAREN192=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement2730); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN192);
+            COLLECT183=(Token)input.LT(1);
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3102); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLLECT.add(COLLECT183);
 
-            pushFollow(FOLLOW_pattern_source_in_collect_statement2732);
-            pattern_source193=pattern_source();
+            if ( backtracking==0 ) {
+              	emit(COLLECT183, DroolsEditorType.KEYWORD);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_COLLECT);	
+            }
+            LEFT_PAREN184=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3111); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN184);
+
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN184, DroolsEditorType.SYMBOL);	
+            }
+            pushFollow(FOLLOW_pattern_source_in_collect_statement3118);
+            pattern_source185=pattern_source();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_pattern_source.add(pattern_source193.getTree());
-            RIGHT_PAREN194=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement2734); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN194);
+            if ( backtracking==0 ) stream_pattern_source.add(pattern_source185.getTree());
+            RIGHT_PAREN186=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3123); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN186);
 
+            if ( backtracking==0 ) {
+              	emit(RIGHT_PAREN186, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	
+            }
 
             // AST REWRITE
-            // elements: collect_key, pattern_source, RIGHT_PAREN
+            // elements: RIGHT_PAREN, pattern_source, COLLECT
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8209,12 +8322,12 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 683:2: -> ^( collect_key pattern_source RIGHT_PAREN )
+            // 908:2: -> ^( COLLECT pattern_source RIGHT_PAREN )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:5: ^( collect_key pattern_source RIGHT_PAREN )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:908:5: ^( COLLECT pattern_source RIGHT_PAREN )
                 {
                 Object root_1 = (Object)adaptor.nil();
-                root_1 = (Object)adaptor.becomeRoot(stream_collect_key.nextNode(), root_1);
+                root_1 = (Object)adaptor.becomeRoot(stream_COLLECT.next(), root_1);
 
                 adaptor.addChild(root_1, stream_pattern_source.next());
                 adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
@@ -8251,37 +8364,43 @@
     };
 
     // $ANTLR start entrypoint_statement
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:686:1: entrypoint_statement : entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:911: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_key195 = null;
+        entry_point_key_return entry_point_key187 = null;
 
-        entrypoint_id_return entrypoint_id196 = null;
+        entrypoint_id_return entrypoint_id188 = null;
 
 
         RewriteRuleSubtreeStream stream_entrypoint_id=new RewriteRuleSubtreeStream(adaptor,"rule entrypoint_id");
         RewriteRuleSubtreeStream stream_entry_point_key=new RewriteRuleSubtreeStream(adaptor,"rule entry_point_key");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:687:2: ( entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:687:4: entry_point_key entrypoint_id
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:912:2: ( entry_point_key entrypoint_id -> ^( entry_point_key entrypoint_id ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:912:4: entry_point_key entrypoint_id
             {
-            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement2756);
-            entry_point_key195=entry_point_key();
+            pushFollow(FOLLOW_entry_point_key_in_entrypoint_statement3150);
+            entry_point_key187=entry_point_key();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key195.getTree());
-            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement2758);
-            entrypoint_id196=entrypoint_id();
+            if ( backtracking==0 ) stream_entry_point_key.add(entry_point_key187.getTree());
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_FROM_COLLECT);	
+            }
+            pushFollow(FOLLOW_entrypoint_id_in_entrypoint_statement3158);
+            entrypoint_id188=entrypoint_id();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id196.getTree());
+            if ( backtracking==0 ) stream_entrypoint_id.add(entrypoint_id188.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: 
@@ -8291,9 +8410,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 688:2: -> ^( entry_point_key entrypoint_id )
+            // 916:2: -> ^( entry_point_key entrypoint_id )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:688:5: ^( entry_point_key entrypoint_id )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:916:5: ^( entry_point_key entrypoint_id )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot(stream_entry_point_key.nextNode(), root_1);
@@ -8332,7 +8451,7 @@
     };
 
     // $ANTLR start entrypoint_id
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:691:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:919: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);
@@ -8346,31 +8465,34 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:692:2: (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] )
-            int alt66=2;
-            int LA66_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:920:2: (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] )
+            int alt64=2;
+            int LA64_0 = input.LA(1);
 
-            if ( (LA66_0==ID) ) {
-                alt66=1;
+            if ( (LA64_0==ID) ) {
+                alt64=1;
             }
-            else if ( (LA66_0==STRING) ) {
-                alt66=2;
+            else if ( (LA64_0==STRING) ) {
+                alt64=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("691:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 66, 0, input);
+                    new NoViableAltException("919:1: entrypoint_id : (value= ID -> VT_ENTRYPOINT_ID[$value] | value= STRING -> VT_ENTRYPOINT_ID[$value] );", 64, 0, input);
 
                 throw nvae;
             }
-            switch (alt66) {
+            switch (alt64) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:692:5: value= ID
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:920:5: value= ID
                     {
                     value=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_entrypoint_id2781); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_entrypoint_id3184); if (failed) return retval;
                     if ( backtracking==0 ) stream_ID.add(value);
 
+                    if ( backtracking==0 ) {
+                      	emit(value, DroolsEditorType.IDENTIFIER);	
+                    }
 
                     // AST REWRITE
                     // elements: 
@@ -8383,7 +8505,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 692:14: -> VT_ENTRYPOINT_ID[$value]
+                    // 921:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8394,12 +8516,15 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:693:5: value= STRING
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:922:5: value= STRING
                     {
                     value=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id2794); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_entrypoint_id3201); if (failed) return retval;
                     if ( backtracking==0 ) stream_STRING.add(value);
 
+                    if ( backtracking==0 ) {
+                      	emit(value, DroolsEditorType.IDENTIFIER);	
+                    }
 
                     // AST REWRITE
                     // elements: 
@@ -8412,7 +8537,7 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 693:18: -> VT_ENTRYPOINT_ID[$value]
+                    // 923:3: -> VT_ENTRYPOINT_ID[$value]
                     {
                         adaptor.addChild(root_0, adaptor.create(VT_ENTRYPOINT_ID, value));
 
@@ -8447,64 +8572,42 @@
     };
 
     // $ANTLR start from_source
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:696:1: from_source : ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:926: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 ID197=null;
+        Token ID189=null;
         paren_chunk_return args = null;
 
-        expression_chain_return expression_chain198 = null;
+        expression_chain_return expression_chain190 = null;
 
 
-        Object ID197_tree=null;
+        Object ID189_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_expression_chain=new RewriteRuleSubtreeStream(adaptor,"rule expression_chain");
         RewriteRuleSubtreeStream stream_paren_chunk=new RewriteRuleSubtreeStream(adaptor,"rule paren_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:697:2: ( ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:697:4: ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:2: ( ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )? -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:4: ID ( ( LEFT_PAREN )=>args= paren_chunk )? ( expression_chain )?
             {
-            ID197=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_source2810); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID197);
+            ID189=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_from_source3221); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID189);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
-            int alt67=2;
-            int LA67_0 = input.LA(1);
-
-            if ( (LA67_0==LEFT_PAREN) ) {
-                int LA67_1 = input.LA(2);
-
-                if ( (LA67_1==LEFT_PAREN) ) {
-                    int LA67_3 = input.LA(3);
-
-                    if ( (synpred8()) ) {
-                        alt67=1;
-                    }
-                }
-                else if ( (LA67_1==ID) ) {
-                    int LA67_4 = input.LA(3);
-
-                    if ( (synpred8()) ) {
-                        alt67=1;
-                    }
-                }
-                else if ( ((LA67_1>=VT_COMPILATION_UNIT && LA67_1<=SEMICOLON)||(LA67_1>=DOT && LA67_1<=STRING)||LA67_1==COMMA||(LA67_1>=AT && LA67_1<=MULTI_LINE_COMMENT)) && (synpred8())) {
-                    alt67=1;
-                }
-                else if ( (LA67_1==RIGHT_PAREN) && (synpred8())) {
-                    alt67=1;
-                }
+            if ( backtracking==0 ) {
+              	emit(ID189, DroolsEditorType.IDENTIFIER);	
             }
-            switch (alt67) {
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:928:3: ( ( LEFT_PAREN )=>args= paren_chunk )?
+            int alt65=2;
+            alt65 = dfa65.predict(input);
+            switch (alt65) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:5: ( LEFT_PAREN )=>args= paren_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:928:5: ( LEFT_PAREN )=>args= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source2823);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source3236);
                     args=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
@@ -8515,31 +8618,38 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:699:3: ( expression_chain )?
-            int alt68=2;
-            int LA68_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:929:3: ( expression_chain )?
+            int alt66=2;
+            int LA66_0 = input.LA(1);
 
-            if ( (LA68_0==DOT) ) {
-                alt68=1;
+            if ( (LA66_0==DOT) ) {
+                alt66=1;
             }
-            switch (alt68) {
+            switch (alt66) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:699:3: expression_chain
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:929:3: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source2830);
-                    expression_chain198=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_from_source3243);
+                    expression_chain190=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain198.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain190.getTree());
 
                     }
                     break;
 
             }
 
+            if ( backtracking==0 ) {
+              	if ( input.LA(1) == EOF && input.get(input.index() - 1).getType() == WS) {
+              			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+              		} else if ( input.LA(1) != EOF ) {
+              			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+              		}	
+            }
 
             // AST REWRITE
-            // elements: paren_chunk, ID, expression_chain
+            // elements: ID, paren_chunk, expression_chain
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8549,21 +8659,21 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 700:2: -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
+            // 935:2: -> ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:700:5: ^( VT_FROM_SOURCE ID ( paren_chunk )? ( expression_chain )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:935: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:700:25: ( paren_chunk )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:935:25: ( paren_chunk )?
                 if ( stream_paren_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_paren_chunk.next());
 
                 }
                 stream_paren_chunk.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:700:38: ( expression_chain )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:935:38: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -8602,114 +8712,120 @@
     };
 
     // $ANTLR start expression_chain
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:703:1: expression_chain : startToken= DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$startToken] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:938:1: expression_chain : DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_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 startToken=null;
-        Token ID199=null;
-        square_chunk_return square_chunk200 = null;
+        Token DOT191=null;
+        Token ID192=null;
+        square_chunk_return square_chunk193 = null;
 
-        paren_chunk_return paren_chunk201 = null;
+        paren_chunk_return paren_chunk194 = null;
 
-        expression_chain_return expression_chain202 = null;
+        expression_chain_return expression_chain195 = null;
 
 
-        Object startToken_tree=null;
-        Object ID199_tree=null;
+        Object DOT191_tree=null;
+        Object ID192_tree=null;
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:704:2: (startToken= DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$startToken] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:705:3: startToken= DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )? ( expression_chain )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:939:2: ( DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )? ( expression_chain )? -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:940:3: DOT ID ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )? ( expression_chain )?
             {
-            startToken=(Token)input.LT(1);
-            match(input,DOT,FOLLOW_DOT_in_expression_chain2862); if (failed) return retval;
-            if ( backtracking==0 ) stream_DOT.add(startToken);
+            DOT191=(Token)input.LT(1);
+            match(input,DOT,FOLLOW_DOT_in_expression_chain3276); if (failed) return retval;
+            if ( backtracking==0 ) stream_DOT.add(DOT191);
 
-            ID199=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_expression_chain2864); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID199);
+            if ( backtracking==0 ) {
+              	emit(DOT191, DroolsEditorType.IDENTIFIER);	
+            }
+            ID192=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_expression_chain3283); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID192);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:706:4: ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )?
-            int alt69=3;
-            int LA69_0 = input.LA(1);
+            if ( backtracking==0 ) {
+              	emit(ID192, DroolsEditorType.IDENTIFIER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:942:4: ( ( LEFT_SQUARE )=> square_chunk | ( LEFT_PAREN )=> paren_chunk )?
+            int alt67=3;
+            int LA67_0 = input.LA(1);
 
-            if ( (LA69_0==LEFT_SQUARE) && (synpred9())) {
-                alt69=1;
+            if ( (LA67_0==LEFT_SQUARE) && (synpred9())) {
+                alt67=1;
             }
-            else if ( (LA69_0==LEFT_PAREN) ) {
-                int LA69_2 = input.LA(2);
+            else if ( (LA67_0==LEFT_PAREN) ) {
+                int LA67_2 = input.LA(2);
 
-                if ( (LA69_2==LEFT_PAREN) ) {
-                    int LA69_4 = input.LA(3);
+                if ( (LA67_2==LEFT_PAREN) ) {
+                    int LA67_4 = input.LA(3);
 
                     if ( (synpred10()) ) {
-                        alt69=2;
+                        alt67=2;
                     }
                 }
-                else if ( (LA69_2==ID) ) {
-                    int LA69_5 = input.LA(3);
+                else if ( (LA67_2==ID) ) {
+                    int LA67_5 = input.LA(3);
 
                     if ( (synpred10()) ) {
-                        alt69=2;
+                        alt67=2;
                     }
                 }
-                else if ( ((LA69_2>=VT_COMPILATION_UNIT && LA69_2<=SEMICOLON)||(LA69_2>=DOT && LA69_2<=STRING)||LA69_2==COMMA||(LA69_2>=AT && LA69_2<=MULTI_LINE_COMMENT)) && (synpred10())) {
-                    alt69=2;
+                else if ( ((LA67_2>=VT_COMPILATION_UNIT && LA67_2<=SEMICOLON)||(LA67_2>=DOT && LA67_2<=STRING)||LA67_2==COMMA||(LA67_2>=AT && LA67_2<=MULTI_LINE_COMMENT)) && (synpred10())) {
+                    alt67=2;
                 }
-                else if ( (LA69_2==RIGHT_PAREN) && (synpred10())) {
-                    alt69=2;
+                else if ( (LA67_2==RIGHT_PAREN) && (synpred10())) {
+                    alt67=2;
                 }
             }
-            switch (alt69) {
+            switch (alt67) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:707:6: ( LEFT_SQUARE )=> square_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:6: ( LEFT_SQUARE )=> square_chunk
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain2884);
-                    square_chunk200=square_chunk();
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain3305);
+                    square_chunk193=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk200.getTree());
+                    if ( backtracking==0 ) stream_square_chunk.add(square_chunk193.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:6: ( LEFT_PAREN )=> paren_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:945:6: ( LEFT_PAREN )=> paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain2906);
-                    paren_chunk201=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3327);
+                    paren_chunk194=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk201.getTree());
+                    if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk194.getTree());
 
                     }
                     break;
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:711:4: ( expression_chain )?
-            int alt70=2;
-            int LA70_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:947:4: ( expression_chain )?
+            int alt68=2;
+            int LA68_0 = input.LA(1);
 
-            if ( (LA70_0==DOT) ) {
-                alt70=1;
+            if ( (LA68_0==DOT) ) {
+                alt68=1;
             }
-            switch (alt70) {
+            switch (alt68) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:711:4: expression_chain
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:947:4: expression_chain
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain2917);
-                    expression_chain202=expression_chain();
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain3338);
+                    expression_chain195=expression_chain();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain202.getTree());
+                    if ( backtracking==0 ) stream_expression_chain.add(expression_chain195.getTree());
 
                     }
                     break;
@@ -8718,7 +8834,7 @@
 
 
             // AST REWRITE
-            // elements: ID, expression_chain, paren_chunk, square_chunk
+            // elements: expression_chain, ID, paren_chunk, square_chunk
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -8728,27 +8844,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 712:4: -> ^( VT_EXPRESSION_CHAIN[$startToken] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
+            // 948:4: -> ^( VT_EXPRESSION_CHAIN[$DOT] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:7: ^( VT_EXPRESSION_CHAIN[$startToken] ID ( square_chunk )? ( paren_chunk )? ( expression_chain )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948: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, startToken), root_1);
+                root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_EXPRESSION_CHAIN, DOT191), root_1);
 
                 adaptor.addChild(root_1, stream_ID.next());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:45: ( square_chunk )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:38: ( square_chunk )?
                 if ( stream_square_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_square_chunk.next());
 
                 }
                 stream_square_chunk.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:59: ( paren_chunk )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:52: ( paren_chunk )?
                 if ( stream_paren_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_paren_chunk.next());
 
                 }
                 stream_paren_chunk.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:72: ( expression_chain )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:65: ( expression_chain )?
                 if ( stream_expression_chain.hasNext() ) {
                     adaptor.addChild(root_1, stream_expression_chain.next());
 
@@ -8787,38 +8903,38 @@
     };
 
     // $ANTLR start lhs_pattern
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:951: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_binding203 = null;
+        fact_binding_return fact_binding196 = null;
 
-        fact_return fact204 = null;
+        fact_return fact197 = null;
 
 
         RewriteRuleSubtreeStream stream_fact_binding=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding");
         RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:716:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
-            int alt71=2;
-            int LA71_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:952:2: ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) )
+            int alt69=2;
+            int LA69_0 = input.LA(1);
 
-            if ( (LA71_0==ID) ) {
-                int LA71_1 = input.LA(2);
+            if ( (LA69_0==ID) ) {
+                int LA69_1 = input.LA(2);
 
-                if ( (LA71_1==COLON) ) {
-                    alt71=1;
+                if ( (LA69_1==COLON) ) {
+                    alt69=1;
                 }
-                else if ( (LA71_1==DOT||LA71_1==LEFT_PAREN||LA71_1==LEFT_SQUARE) ) {
-                    alt71=2;
+                else if ( (LA69_1==DOT||LA69_1==LEFT_PAREN||LA69_1==LEFT_SQUARE) ) {
+                    alt69=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("715:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 71, 1, input);
+                        new NoViableAltException("951:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 69, 1, input);
 
                     throw nvae;
                 }
@@ -8826,19 +8942,19 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("715:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 71, 0, input);
+                    new NoViableAltException("951:1: lhs_pattern : ( fact_binding -> ^( VT_PATTERN fact_binding ) | fact -> ^( VT_PATTERN fact ) );", 69, 0, input);
 
                 throw nvae;
             }
-            switch (alt71) {
+            switch (alt69) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:716:4: fact_binding
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:952:4: fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern2950);
-                    fact_binding203=fact_binding();
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3371);
+                    fact_binding196=fact_binding();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding203.getTree());
+                    if ( backtracking==0 ) stream_fact_binding.add(fact_binding196.getTree());
 
                     // AST REWRITE
                     // elements: fact_binding
@@ -8851,9 +8967,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 716:17: -> ^( VT_PATTERN fact_binding )
+                    // 952:17: -> ^( VT_PATTERN fact_binding )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:716:20: ^( VT_PATTERN fact_binding )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:952:20: ^( VT_PATTERN fact_binding )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -8870,13 +8986,13 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:717:4: fact
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:953:4: fact
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern2963);
-                    fact204=fact();
+                    pushFollow(FOLLOW_fact_in_lhs_pattern3384);
+                    fact197=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact204.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact197.getTree());
 
                     // AST REWRITE
                     // elements: fact
@@ -8889,9 +9005,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 717:9: -> ^( VT_PATTERN fact )
+                    // 953:9: -> ^( VT_PATTERN fact )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:717:12: ^( VT_PATTERN fact )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:953:12: ^( VT_PATTERN fact )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot(adaptor.create(VT_PATTERN, "VT_PATTERN"), root_1);
@@ -8932,83 +9048,89 @@
     };
 
     // $ANTLR start fact_binding
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:720:1: fact_binding : label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:956: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_PAREN207=null;
-        Token RIGHT_PAREN209=null;
-        label_return label205 = null;
+        Token LEFT_PAREN200=null;
+        Token RIGHT_PAREN202=null;
+        label_return label198 = null;
 
-        fact_return fact206 = null;
+        fact_return fact199 = null;
 
-        fact_binding_expression_return fact_binding_expression208 = null;
+        fact_binding_expression_return fact_binding_expression201 = null;
 
 
-        Object LEFT_PAREN207_tree=null;
-        Object RIGHT_PAREN209_tree=null;
+        Object LEFT_PAREN200_tree=null;
+        Object RIGHT_PAREN202_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_label=new RewriteRuleSubtreeStream(adaptor,"rule label");
         RewriteRuleSubtreeStream stream_fact_binding_expression=new RewriteRuleSubtreeStream(adaptor,"rule fact_binding_expression");
         RewriteRuleSubtreeStream stream_fact=new RewriteRuleSubtreeStream(adaptor,"rule fact");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:721:3: ( label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:721:5: label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:957:3: ( label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN ) -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:957:5: label ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
             {
-            pushFollow(FOLLOW_label_in_fact_binding2983);
-            label205=label();
+            pushFollow(FOLLOW_label_in_fact_binding3404);
+            label198=label();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_label.add(label205.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:722:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            if ( backtracking==0 ) stream_label.add(label198.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:958:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )
+            int alt70=2;
+            int LA70_0 = input.LA(1);
 
-            if ( (LA72_0==ID) ) {
-                alt72=1;
+            if ( (LA70_0==ID) ) {
+                alt70=1;
             }
-            else if ( (LA72_0==LEFT_PAREN) ) {
-                alt72=2;
+            else if ( (LA70_0==LEFT_PAREN) ) {
+                alt70=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("722:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 72, 0, input);
+                    new NoViableAltException("958:3: ( fact | LEFT_PAREN fact_binding_expression RIGHT_PAREN )", 70, 0, input);
 
                 throw nvae;
             }
-            switch (alt72) {
+            switch (alt70) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:722:5: fact
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:958:5: fact
                     {
-                    pushFollow(FOLLOW_fact_in_fact_binding2989);
-                    fact206=fact();
+                    pushFollow(FOLLOW_fact_in_fact_binding3410);
+                    fact199=fact();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact.add(fact206.getTree());
+                    if ( backtracking==0 ) stream_fact.add(fact199.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:723:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:959:6: LEFT_PAREN fact_binding_expression RIGHT_PAREN
                     {
-                    LEFT_PAREN207=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding2996); if (failed) return retval;
-                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN207);
+                    LEFT_PAREN200=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3417); if (failed) return retval;
+                    if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN200);
 
-                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding2998);
-                    fact_binding_expression208=fact_binding_expression();
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN200, DroolsEditorType.SYMBOL);	
+                    }
+                    pushFollow(FOLLOW_fact_binding_expression_in_fact_binding3425);
+                    fact_binding_expression201=fact_binding_expression();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_fact_binding_expression.add(fact_binding_expression208.getTree());
-                    RIGHT_PAREN209=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3000); if (failed) return retval;
-                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN209);
+                    if ( backtracking==0 ) stream_fact_binding_expression.add(fact_binding_expression201.getTree());
+                    RIGHT_PAREN202=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3433); if (failed) return retval;
+                    if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN202);
 
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN202, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
@@ -9017,7 +9139,7 @@
 
 
             // AST REWRITE
-            // elements: RIGHT_PAREN, fact_binding_expression, label, fact
+            // elements: RIGHT_PAREN, fact_binding_expression, fact, label
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -9027,27 +9149,27 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 725:3: -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
+            // 963:3: -> ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:6: ^( VT_FACT_BINDING label ( fact )? ( fact_binding_expression )? ( RIGHT_PAREN )? )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:30: ( fact )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:30: ( fact )?
                 if ( stream_fact.hasNext() ) {
                     adaptor.addChild(root_1, stream_fact.next());
 
                 }
                 stream_fact.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:36: ( fact_binding_expression )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:36: ( fact_binding_expression )?
                 if ( stream_fact_binding_expression.hasNext() ) {
                     adaptor.addChild(root_1, stream_fact_binding_expression.next());
 
                 }
                 stream_fact_binding_expression.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:61: ( RIGHT_PAREN )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:61: ( RIGHT_PAREN )?
                 if ( stream_RIGHT_PAREN.hasNext() ) {
                     adaptor.addChild(root_1, stream_RIGHT_PAREN.next());
 
@@ -9086,7 +9208,7 @@
     };
 
     // $ANTLR start fact_binding_expression
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:728:1: fact_binding_expression : ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:966: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);
@@ -9096,9 +9218,9 @@
         Token pipe=null;
         or_key_return value = null;
 
-        fact_return fact210 = null;
+        fact_return fact203 = null;
 
-        fact_return fact211 = null;
+        fact_return fact204 = null;
 
 
         Object pipe_tree=null;
@@ -9109,17 +9231,17 @@
         	Token orToken = null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:3: ( ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:5: ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:3: ( ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:5: ( fact -> fact ) ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
             {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:5: ( fact -> fact )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:6: fact
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:5: ( fact -> fact )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:6: fact
             {
-            pushFollow(FOLLOW_fact_in_fact_binding_expression3039);
-            fact210=fact();
+            pushFollow(FOLLOW_fact_in_fact_binding_expression3474);
+            fact203=fact();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_fact.add(fact210.getTree());
+            if ( backtracking==0 ) stream_fact.add(fact203.getTree());
 
             // AST REWRITE
             // elements: fact
@@ -9132,7 +9254,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 731:11: -> fact
+            // 969:11: -> fact
             {
                 adaptor.addChild(root_0, stream_fact.next());
 
@@ -9142,46 +9264,46 @@
 
             }
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:20: ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
-            loop74:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:20: ( (value= or_key | pipe= DOUBLE_PIPE ) fact -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact ) )*
+            loop72:
             do {
-                int alt74=2;
-                int LA74_0 = input.LA(1);
+                int alt72=2;
+                int LA72_0 = input.LA(1);
 
-                if ( (LA74_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-                    alt74=1;
+                if ( (LA72_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+                    alt72=1;
                 }
-                else if ( (LA74_0==DOUBLE_PIPE) ) {
-                    alt74=1;
+                else if ( (LA72_0==DOUBLE_PIPE) ) {
+                    alt72=1;
                 }
 
 
-                switch (alt74) {
+                switch (alt72) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:22: (value= or_key | pipe= DOUBLE_PIPE ) fact
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:22: (value= or_key | pipe= DOUBLE_PIPE ) fact
             	    {
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:22: (value= or_key | pipe= DOUBLE_PIPE )
-            	    int alt73=2;
-            	    int LA73_0 = input.LA(1);
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:22: (value= or_key | pipe= DOUBLE_PIPE )
+            	    int alt71=2;
+            	    int LA71_0 = input.LA(1);
 
-            	    if ( (LA73_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-            	        alt73=1;
+            	    if ( (LA71_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+            	        alt71=1;
             	    }
-            	    else if ( (LA73_0==DOUBLE_PIPE) ) {
-            	        alt73=2;
+            	    else if ( (LA71_0==DOUBLE_PIPE) ) {
+            	        alt71=2;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        NoViableAltException nvae =
-            	            new NoViableAltException("731:22: (value= or_key | pipe= DOUBLE_PIPE )", 73, 0, input);
+            	            new NoViableAltException("969:22: (value= or_key | pipe= DOUBLE_PIPE )", 71, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt73) {
+            	    switch (alt71) {
             	        case 1 :
-            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:23: value= or_key
+            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:23: value= or_key
             	            {
-            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3051);
+            	            pushFollow(FOLLOW_or_key_in_fact_binding_expression3486);
             	            value=or_key();
             	            _fsp--;
             	            if (failed) return retval;
@@ -9193,10 +9315,10 @@
             	            }
             	            break;
             	        case 2 :
-            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:62: pipe= DOUBLE_PIPE
+            	            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:969:62: pipe= DOUBLE_PIPE
             	            {
             	            pipe=(Token)input.LT(1);
-            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3057); if (failed) return retval;
+            	            match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3492); if (failed) return retval;
             	            if ( backtracking==0 ) stream_DOUBLE_PIPE.add(pipe);
 
             	            if ( backtracking==0 ) {
@@ -9208,11 +9330,11 @@
 
             	    }
 
-            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3062);
-            	    fact211=fact();
+            	    pushFollow(FOLLOW_fact_in_fact_binding_expression3497);
+            	    fact204=fact();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_fact.add(fact211.getTree());
+            	    if ( backtracking==0 ) stream_fact.add(fact204.getTree());
 
             	    // AST REWRITE
             	    // elements: fact, fact_binding_expression
@@ -9225,9 +9347,9 @@
             	    RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             	    root_0 = (Object)adaptor.nil();
-            	    // 732:3: -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
+            	    // 970:3: -> ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
             	    {
-            	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:732:6: ^( VT_FACT_OR[orToken] $fact_binding_expression fact )
+            	        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970: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);
@@ -9246,7 +9368,7 @@
             	    break;
 
             	default :
-            	    break loop74;
+            	    break loop72;
                 }
             } while (true);
 
@@ -9276,66 +9398,81 @@
     };
 
     // $ANTLR start fact
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735:1: fact : pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:973: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_PAREN213=null;
-        Token RIGHT_PAREN215=null;
-        pattern_type_return pattern_type212 = null;
+        Token LEFT_PAREN206=null;
+        Token RIGHT_PAREN208=null;
+        pattern_type_return pattern_type205 = null;
 
-        constraints_return constraints214 = null;
+        constraints_return constraints207 = null;
 
 
-        Object LEFT_PAREN213_tree=null;
-        Object RIGHT_PAREN215_tree=null;
+        Object LEFT_PAREN206_tree=null;
+        Object RIGHT_PAREN208_tree=null;
         RewriteRuleTokenStream stream_LEFT_PAREN=new RewriteRuleTokenStream(adaptor,"token LEFT_PAREN");
         RewriteRuleTokenStream stream_RIGHT_PAREN=new RewriteRuleTokenStream(adaptor,"token RIGHT_PAREN");
         RewriteRuleSubtreeStream stream_pattern_type=new RewriteRuleSubtreeStream(adaptor,"rule pattern_type");
         RewriteRuleSubtreeStream stream_constraints=new RewriteRuleSubtreeStream(adaptor,"rule constraints");
-         pushParaphrases(DroolsParaphareseTypes.PATTERN); 
+         pushParaphrases(DroolsParaphraseTypes.PATTERN); 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:2: ( pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:4: pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:976:2: ( pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:976:4: pattern_type LEFT_PAREN ( constraints )? RIGHT_PAREN
             {
-            pushFollow(FOLLOW_pattern_type_in_fact3102);
-            pattern_type212=pattern_type();
+            pushFollow(FOLLOW_pattern_type_in_fact3537);
+            pattern_type205=pattern_type();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_pattern_type.add(pattern_type212.getTree());
-            LEFT_PAREN213=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3104); if (failed) return retval;
-            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN213);
+            if ( backtracking==0 ) stream_pattern_type.add(pattern_type205.getTree());
+            LEFT_PAREN206=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3542); if (failed) return retval;
+            if ( backtracking==0 ) stream_LEFT_PAREN.add(LEFT_PAREN206);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:28: ( constraints )?
-            int alt75=2;
-            int LA75_0 = input.LA(1);
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN206, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:4: ( constraints )?
+            int alt73=2;
+            int LA73_0 = input.LA(1);
 
-            if ( (LA75_0==ID||LA75_0==LEFT_PAREN) ) {
-                alt75=1;
+            if ( (LA73_0==ID||LA73_0==LEFT_PAREN) ) {
+                alt73=1;
             }
-            switch (alt75) {
+            switch (alt73) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:28: constraints
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:4: constraints
                     {
-                    pushFollow(FOLLOW_constraints_in_fact3106);
-                    constraints214=constraints();
+                    pushFollow(FOLLOW_constraints_in_fact3553);
+                    constraints207=constraints();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_constraints.add(constraints214.getTree());
+                    if ( backtracking==0 ) stream_constraints.add(constraints207.getTree());
 
                     }
                     break;
 
             }
 
-            RIGHT_PAREN215=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3109); if (failed) return retval;
-            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN215);
+            RIGHT_PAREN208=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3559); if (failed) return retval;
+            if ( backtracking==0 ) stream_RIGHT_PAREN.add(RIGHT_PAREN208);
 
+            if ( backtracking==0 ) {
+              		
+            }
+            if ( backtracking==0 ) {
+              	if (RIGHT_PAREN208.getText().equals(")") ){ //WORKAROUND FOR ANTLR BUG!
+              			emit(RIGHT_PAREN208, DroolsEditorType.SYMBOL);
+              			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+              		}	
+            }
 
             // AST REWRITE
             // elements: RIGHT_PAREN, pattern_type, constraints
@@ -9348,15 +9485,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 739:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+            // 985:2: -> ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:5: ^( VT_FACT pattern_type ( constraints )? RIGHT_PAREN )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:985: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:28: ( constraints )?
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:985:28: ( constraints )?
                 if ( stream_constraints.hasNext() ) {
                     adaptor.addChild(root_1, stream_constraints.next());
 
@@ -9399,60 +9536,64 @@
     };
 
     // $ANTLR start constraints
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:742:1: constraints : constraint ( COMMA constraint )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:988: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 COMMA217=null;
-        constraint_return constraint216 = null;
+        Token COMMA210=null;
+        constraint_return constraint209 = null;
 
-        constraint_return constraint218 = null;
+        constraint_return constraint211 = null;
 
 
-        Object COMMA217_tree=null;
+        Object COMMA210_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:2: ( constraint ( COMMA constraint )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:4: constraint ( COMMA constraint )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:2: ( constraint ( COMMA constraint )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:4: constraint ( COMMA constraint )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_in_constraints3134);
-            constraint216=constraint();
+            pushFollow(FOLLOW_constraint_in_constraints3589);
+            constraint209=constraint();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, constraint216.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:15: ( COMMA constraint )*
-            loop76:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint209.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:15: ( COMMA constraint )*
+            loop74:
             do {
-                int alt76=2;
-                int LA76_0 = input.LA(1);
+                int alt74=2;
+                int LA74_0 = input.LA(1);
 
-                if ( (LA76_0==COMMA) ) {
-                    alt76=1;
+                if ( (LA74_0==COMMA) ) {
+                    alt74=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt74) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:17: COMMA constraint
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:17: COMMA constraint
             	    {
-            	    COMMA217=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3138); if (failed) return retval;
-            	    pushFollow(FOLLOW_constraint_in_constraints3141);
-            	    constraint218=constraint();
+            	    COMMA210=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3593); if (failed) return retval;
+            	    if ( backtracking==0 ) {
+            	      	emit(COMMA210, DroolsEditorType.SYMBOL);
+            	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	
+            	    }
+            	    pushFollow(FOLLOW_constraint_in_constraints3600);
+            	    constraint211=constraint();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint218.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint211.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop74;
                 }
             } while (true);
 
@@ -9482,28 +9623,28 @@
     };
 
     // $ANTLR start constraint
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:746:1: constraint : or_constr ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:994: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_constr219 = null;
+        or_constr_return or_constr212 = null;
 
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:747:2: ( or_constr )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:747:4: or_constr
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:995:2: ( or_constr )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:995:4: or_constr
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_or_constr_in_constraint3155);
-            or_constr219=or_constr();
+            pushFollow(FOLLOW_or_constr_in_constraint3614);
+            or_constr212=or_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr219.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, or_constr212.getTree());
 
             }
 
@@ -9530,64 +9671,68 @@
     };
 
     // $ANTLR start or_constr
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:1: or_constr : and_constr ( DOUBLE_PIPE and_constr )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:998: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_PIPE221=null;
-        and_constr_return and_constr220 = null;
+        Token DOUBLE_PIPE214=null;
+        and_constr_return and_constr213 = null;
 
-        and_constr_return and_constr222 = null;
+        and_constr_return and_constr215 = null;
 
 
-        Object DOUBLE_PIPE221_tree=null;
+        Object DOUBLE_PIPE214_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:751:2: ( and_constr ( DOUBLE_PIPE and_constr )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:751:4: and_constr ( DOUBLE_PIPE and_constr )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:2: ( and_constr ( DOUBLE_PIPE and_constr )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:4: and_constr ( DOUBLE_PIPE and_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_constr_in_or_constr3166);
-            and_constr220=and_constr();
+            pushFollow(FOLLOW_and_constr_in_or_constr3625);
+            and_constr213=and_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, and_constr220.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:751:15: ( DOUBLE_PIPE and_constr )*
-            loop77:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_constr213.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:15: ( DOUBLE_PIPE and_constr )*
+            loop75:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
+                int alt75=2;
+                int LA75_0 = input.LA(1);
 
-                if ( (LA77_0==DOUBLE_PIPE) ) {
-                    alt77=1;
+                if ( (LA75_0==DOUBLE_PIPE) ) {
+                    alt75=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt75) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:751:17: DOUBLE_PIPE and_constr
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:17: DOUBLE_PIPE and_constr
             	    {
-            	    DOUBLE_PIPE221=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3170); if (failed) return retval;
+            	    DOUBLE_PIPE214=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3629); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE221_tree = (Object)adaptor.create(DOUBLE_PIPE221);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE221_tree, root_0);
+            	    DOUBLE_PIPE214_tree = (Object)adaptor.create(DOUBLE_PIPE214);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE214_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr3173);
-            	    and_constr222=and_constr();
+            	    if ( backtracking==0 ) {
+            	      	emit(DOUBLE_PIPE214, DroolsEditorType.SYMBOL);
+            	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+            	    }
+            	    pushFollow(FOLLOW_and_constr_in_or_constr3636);
+            	    and_constr215=and_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr222.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_constr215.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop75;
                 }
             } while (true);
 
@@ -9617,64 +9762,68 @@
     };
 
     // $ANTLR start and_constr
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:1: and_constr : unary_constr ( DOUBLE_AMPER unary_constr )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1004: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_AMPER224=null;
-        unary_constr_return unary_constr223 = null;
+        Token DOUBLE_AMPER217=null;
+        unary_constr_return unary_constr216 = null;
 
-        unary_constr_return unary_constr225 = null;
+        unary_constr_return unary_constr218 = null;
 
 
-        Object DOUBLE_AMPER224_tree=null;
+        Object DOUBLE_AMPER217_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:755:2: ( unary_constr ( DOUBLE_AMPER unary_constr )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:755:4: unary_constr ( DOUBLE_AMPER unary_constr )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1005:2: ( unary_constr ( DOUBLE_AMPER unary_constr )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1005:4: unary_constr ( DOUBLE_AMPER unary_constr )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_unary_constr_in_and_constr3188);
-            unary_constr223=unary_constr();
+            pushFollow(FOLLOW_unary_constr_in_and_constr3651);
+            unary_constr216=unary_constr();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr223.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:755:17: ( DOUBLE_AMPER unary_constr )*
-            loop78:
+            if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr216.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1005:17: ( DOUBLE_AMPER unary_constr )*
+            loop76:
             do {
-                int alt78=2;
-                int LA78_0 = input.LA(1);
+                int alt76=2;
+                int LA76_0 = input.LA(1);
 
-                if ( (LA78_0==DOUBLE_AMPER) ) {
-                    alt78=1;
+                if ( (LA76_0==DOUBLE_AMPER) ) {
+                    alt76=1;
                 }
 
 
-                switch (alt78) {
+                switch (alt76) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:755:19: DOUBLE_AMPER unary_constr
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1005:19: DOUBLE_AMPER unary_constr
             	    {
-            	    DOUBLE_AMPER224=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3192); if (failed) return retval;
+            	    DOUBLE_AMPER217=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3655); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER224_tree = (Object)adaptor.create(DOUBLE_AMPER224);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER224_tree, root_0);
+            	    DOUBLE_AMPER217_tree = (Object)adaptor.create(DOUBLE_AMPER217);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER217_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr3195);
-            	    unary_constr225=unary_constr();
+            	    if ( backtracking==0 ) {
+            	      	emit(DOUBLE_AMPER217, DroolsEditorType.SYMBOL);
+            	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+            	    }
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr3662);
+            	    unary_constr218=unary_constr();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr225.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, unary_constr218.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop76;
                 }
             } while (true);
 
@@ -9704,51 +9853,52 @@
     };
 
     // $ANTLR start unary_constr
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1010: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_PAREN229=null;
-        Token RIGHT_PAREN231=null;
-        eval_key_return eval_key226 = null;
+        Token LEFT_PAREN222=null;
+        Token RIGHT_PAREN224=null;
+        eval_key_return eval_key219 = null;
 
-        paren_chunk_return paren_chunk227 = null;
+        paren_chunk_return paren_chunk220 = null;
 
-        field_constraint_return field_constraint228 = null;
+        field_constraint_return field_constraint221 = null;
 
-        or_constr_return or_constr230 = null;
+        or_constr_return or_constr223 = null;
 
 
-        Object LEFT_PAREN229_tree=null;
-        Object RIGHT_PAREN231_tree=null;
+        Object LEFT_PAREN222_tree=null;
+        Object RIGHT_PAREN224_tree=null;
 
+         boolean isFailed = true;	
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:2: ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN )
-            int alt79=3;
-            int LA79_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:2: ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN )
+            int alt77=3;
+            int LA77_0 = input.LA(1);
 
-            if ( (LA79_0==ID) ) {
-                int LA79_1 = input.LA(2);
+            if ( (LA77_0==ID) ) {
+                int LA77_1 = input.LA(2);
 
-                if ( ((LA79_1>=ID && LA79_1<=DOT)||LA79_1==COLON||(LA79_1>=EQUAL && LA79_1<=GRAVE_ACCENT)||LA79_1==LEFT_SQUARE) ) {
-                    alt79=2;
+                if ( ((LA77_1>=ID && LA77_1<=DOT)||LA77_1==COLON||(LA77_1>=EQUAL && LA77_1<=GRAVE_ACCENT)||LA77_1==LEFT_SQUARE) ) {
+                    alt77=2;
                 }
-                else if ( (LA79_1==LEFT_PAREN) ) {
-                    int LA79_4 = input.LA(3);
+                else if ( (LA77_1==LEFT_PAREN) ) {
+                    int LA77_14 = input.LA(3);
 
                     if ( ((validateIdentifierKey(DroolsSoftKeywords.EVAL))) ) {
-                        alt79=1;
+                        alt77=1;
                     }
                     else if ( (true) ) {
-                        alt79=2;
+                        alt77=2;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("758:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 4, input);
+                            new NoViableAltException("1010:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 77, 14, input);
 
                         throw nvae;
                     }
@@ -9756,71 +9906,77 @@
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("758:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 1, input);
+                        new NoViableAltException("1010:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 77, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA79_0==LEFT_PAREN) ) {
-                alt79=3;
+            else if ( (LA77_0==LEFT_PAREN) ) {
+                alt77=3;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("758:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 79, 0, input);
+                    new NoViableAltException("1010:1: unary_constr options {k=2; } : ( eval_key paren_chunk | field_constraint | LEFT_PAREN or_constr RIGHT_PAREN );", 77, 0, input);
 
                 throw nvae;
             }
-            switch (alt79) {
+            switch (alt77) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:4: eval_key paren_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:4: eval_key paren_chunk
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_eval_key_in_unary_constr3216);
-                    eval_key226=eval_key();
+                    pushFollow(FOLLOW_eval_key_in_unary_constr3695);
+                    eval_key219=eval_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key226.getTree(), root_0);
-                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3219);
-                    paren_chunk227=paren_chunk();
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(eval_key219.getTree(), root_0);
+                    pushFollow(FOLLOW_paren_chunk_in_unary_constr3698);
+                    paren_chunk220=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk227.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk220.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:761:4: field_constraint
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1015:4: field_constraint
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr3224);
-                    field_constraint228=field_constraint();
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr3703);
+                    field_constraint221=field_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint228.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, field_constraint221.getTree());
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:762:4: LEFT_PAREN or_constr RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1016:5: LEFT_PAREN or_constr RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN229=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3229); if (failed) return retval;
-                    pushFollow(FOLLOW_or_constr_in_unary_constr3232);
-                    or_constr230=or_constr();
+                    LEFT_PAREN222=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3709); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN222, DroolsEditorType.SYMBOL);	
+                    }
+                    pushFollow(FOLLOW_or_constr_in_unary_constr3719);
+                    or_constr223=or_constr();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, or_constr230.getTree());
-                    RIGHT_PAREN231=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3234); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, or_constr223.getTree());
+                    RIGHT_PAREN224=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3724); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN231_tree = (Object)adaptor.create(RIGHT_PAREN231);
-                    adaptor.addChild(root_0, RIGHT_PAREN231_tree);
+                    RIGHT_PAREN224_tree = (Object)adaptor.create(RIGHT_PAREN224);
+                    adaptor.addChild(root_0, RIGHT_PAREN224_tree);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN224, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
@@ -9832,12 +9988,21 @@
                 retval.tree = (Object)adaptor.rulePostProcessing(root_0);
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
+            if ( backtracking==0 ) {
+               isFailed = false;	
+            }
         }
         catch (RecognitionException re) {
             reportError(re);
             recover(input,re);
         }
         finally {
+             
+            	if (isEditorInterfaceEnabled && isFailed && input.LA(2) == EOF && input.LA(1) == ID) {
+            		emit(input.LT(1), DroolsEditorType.IDENTIFIER);
+            		input.consume();
+            		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+            	}	
         }
         return retval;
     }
@@ -9849,7 +10014,7 @@
     };
 
     // $ANTLR start field_constraint
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:765: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 ) );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1027: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);
@@ -9857,17 +10022,17 @@
         Object root_0 = null;
 
         Token arw=null;
-        label_return label232 = null;
+        label_return label225 = null;
 
-        accessor_path_return accessor_path233 = null;
+        accessor_path_return accessor_path226 = null;
 
-        or_restr_connective_return or_restr_connective234 = null;
+        or_restr_connective_return or_restr_connective227 = null;
 
-        paren_chunk_return paren_chunk235 = null;
+        paren_chunk_return paren_chunk228 = null;
 
-        accessor_path_return accessor_path236 = null;
+        accessor_path_return accessor_path229 = null;
 
-        or_restr_connective_return or_restr_connective237 = null;
+        or_restr_connective_return or_restr_connective230 = null;
 
 
         Object arw_tree=null;
@@ -9880,23 +10045,23 @@
         	boolean isArrow = false;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:3: ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) )
-            int alt81=2;
-            int LA81_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1030: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 alt79=2;
+            int LA79_0 = input.LA(1);
 
-            if ( (LA81_0==ID) ) {
-                int LA81_1 = input.LA(2);
+            if ( (LA79_0==ID) ) {
+                int LA79_1 = input.LA(2);
 
-                if ( (LA81_1==COLON) ) {
-                    alt81=1;
+                if ( (LA79_1==COLON) ) {
+                    alt79=1;
                 }
-                else if ( ((LA81_1>=ID && LA81_1<=DOT)||LA81_1==LEFT_PAREN||(LA81_1>=EQUAL && LA81_1<=GRAVE_ACCENT)||LA81_1==LEFT_SQUARE) ) {
-                    alt81=2;
+                else if ( ((LA79_1>=ID && LA79_1<=DOT)||LA79_1==LEFT_PAREN||(LA79_1>=EQUAL && LA79_1<=GRAVE_ACCENT)||LA79_1==LEFT_SQUARE) ) {
+                    alt79=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("765:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 81, 1, input);
+                        new NoViableAltException("1027: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 ) );", 79, 1, input);
 
                     throw nvae;
                 }
@@ -9904,58 +10069,64 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("765:1: field_constraint : ( label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )? -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )? -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) ) | accessor_path or_restr_connective -> ^( VT_FIELD accessor_path or_restr_connective ) );", 81, 0, input);
+                    new NoViableAltException("1027: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 ) );", 79, 0, input);
 
                 throw nvae;
             }
-            switch (alt81) {
+            switch (alt79) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1030:5: label accessor_path ( or_restr_connective | arw= ARROW paren_chunk )?
                     {
-                    pushFollow(FOLLOW_label_in_field_constraint3248);
-                    label232=label();
+                    pushFollow(FOLLOW_label_in_field_constraint3744);
+                    label225=label();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_label.add(label232.getTree());
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3250);
-                    accessor_path233=accessor_path();
+                    if ( backtracking==0 ) stream_label.add(label225.getTree());
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3746);
+                    accessor_path226=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path233.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:25: ( or_restr_connective | arw= ARROW paren_chunk )?
-                    int alt80=3;
-                    int LA80_0 = input.LA(1);
+                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path226.getTree());
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+                    }
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1032:3: ( or_restr_connective | arw= ARROW paren_chunk )?
+                    int alt78=3;
+                    int LA78_0 = input.LA(1);
 
-                    if ( (LA80_0==ID||LA80_0==LEFT_PAREN||(LA80_0>=EQUAL && LA80_0<=GRAVE_ACCENT)) ) {
-                        alt80=1;
+                    if ( (LA78_0==ID||LA78_0==LEFT_PAREN||(LA78_0>=EQUAL && LA78_0<=GRAVE_ACCENT)) ) {
+                        alt78=1;
                     }
-                    else if ( (LA80_0==ARROW) ) {
-                        alt80=2;
+                    else if ( (LA78_0==ARROW) ) {
+                        alt78=2;
                     }
-                    switch (alt80) {
+                    switch (alt78) {
                         case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:27: or_restr_connective
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1032:5: or_restr_connective
                             {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3254);
-                            or_restr_connective234=or_restr_connective();
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3756);
+                            or_restr_connective227=or_restr_connective();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective234.getTree());
+                            if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective227.getTree());
 
                             }
                             break;
                         case 2 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:49: arw= ARROW paren_chunk
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1032:27: arw= ARROW paren_chunk
                             {
                             arw=(Token)input.LT(1);
-                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3260); if (failed) return retval;
+                            match(input,ARROW,FOLLOW_ARROW_in_field_constraint3762); if (failed) return retval;
                             if ( backtracking==0 ) stream_ARROW.add(arw);
 
-                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3262);
-                            paren_chunk235=paren_chunk();
+                            if ( backtracking==0 ) {
+                              	emit(arw, DroolsEditorType.SYMBOL);	
+                            }
+                            pushFollow(FOLLOW_paren_chunk_in_field_constraint3766);
+                            paren_chunk228=paren_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk235.getTree());
+                            if ( backtracking==0 ) stream_paren_chunk.add(paren_chunk228.getTree());
                             if ( backtracking==0 ) {
                               isArrow = true;
                             }
@@ -9967,7 +10138,7 @@
 
 
                     // AST REWRITE
-                    // elements: label, accessor_path, or_restr_connective, paren_chunk, label, accessor_path
+                    // elements: accessor_path, accessor_path, label, or_restr_connective, label, paren_chunk
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -9977,15 +10148,15 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 769:3: -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                    // 1033:3: -> {isArrow}? ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) ) ( ^( VK_EVAL[$arw] paren_chunk ) )?
                     if (isArrow) {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:769:17: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ) )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033: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());
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:769:39: ^( VT_FIELD accessor_path )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:39: ^( VT_FIELD accessor_path )
                         {
                         Object root_2 = (Object)adaptor.nil();
                         root_2 = (Object)adaptor.becomeRoot(adaptor.create(VT_FIELD, "VT_FIELD"), root_2);
@@ -9997,9 +10168,9 @@
 
                         adaptor.addChild(root_0, root_1);
                         }
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:769:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:66: ( ^( VK_EVAL[$arw] paren_chunk ) )?
                         if ( stream_paren_chunk.hasNext() ) {
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:769:66: ^( VK_EVAL[$arw] paren_chunk )
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:66: ^( VK_EVAL[$arw] paren_chunk )
                             {
                             Object root_1 = (Object)adaptor.nil();
                             root_1 = (Object)adaptor.becomeRoot(adaptor.create(VK_EVAL, arw), root_1);
@@ -10013,21 +10184,21 @@
                         stream_paren_chunk.reset();
 
                     }
-                    else // 770:3: -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
+                    else // 1034:3: -> ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:770:6: ^( VT_BIND_FIELD label ^( VT_FIELD accessor_path ( or_restr_connective )? ) )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1034: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());
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:770:28: ^( VT_FIELD accessor_path ( or_restr_connective )? )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1034: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());
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:770:53: ( or_restr_connective )?
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1034:53: ( or_restr_connective )?
                         if ( stream_or_restr_connective.hasNext() ) {
                             adaptor.addChild(root_2, stream_or_restr_connective.next());
 
@@ -10047,18 +10218,21 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:771:4: accessor_path or_restr_connective
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1035:4: accessor_path or_restr_connective
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3316);
-                    accessor_path236=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3820);
+                    accessor_path229=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path236.getTree());
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3318);
-                    or_restr_connective237=or_restr_connective();
+                    if ( backtracking==0 ) stream_accessor_path.add(accessor_path229.getTree());
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+                    }
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3824);
+                    or_restr_connective230=or_restr_connective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective237.getTree());
+                    if ( backtracking==0 ) stream_or_restr_connective.add(or_restr_connective230.getTree());
 
                     // AST REWRITE
                     // elements: or_restr_connective, accessor_path
@@ -10071,9 +10245,9 @@
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 772:3: -> ^( VT_FIELD accessor_path or_restr_connective )
+                    // 1036:3: -> ^( VT_FIELD accessor_path or_restr_connective )
                     {
-                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772:6: ^( VT_FIELD accessor_path or_restr_connective )
+                        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1036: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);
@@ -10115,7 +10289,7 @@
     };
 
     // $ANTLR start label
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:775:1: label : value= ID COLON -> VT_LABEL[$value] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1039: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);
@@ -10123,25 +10297,31 @@
         Object root_0 = null;
 
         Token value=null;
-        Token COLON238=null;
+        Token COLON231=null;
 
         Object value_tree=null;
-        Object COLON238_tree=null;
+        Object COLON231_tree=null;
         RewriteRuleTokenStream stream_COLON=new RewriteRuleTokenStream(adaptor,"token COLON");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:775:7: (value= ID COLON -> VT_LABEL[$value] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:775:9: value= ID COLON
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:2: (value= ID COLON -> VT_LABEL[$value] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:4: value= ID COLON
             {
             value=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_label3342); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_label3849); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(value);
 
-            COLON238=(Token)input.LT(1);
-            match(input,COLON,FOLLOW_COLON_in_label3344); if (failed) return retval;
-            if ( backtracking==0 ) stream_COLON.add(COLON238);
+            if ( backtracking==0 ) {
+              	emit(value, DroolsEditorType.IDENTIFIER);	
+            }
+            COLON231=(Token)input.LT(1);
+            match(input,COLON,FOLLOW_COLON_in_label3856); if (failed) return retval;
+            if ( backtracking==0 ) stream_COLON.add(COLON231);
 
+            if ( backtracking==0 ) {
+              	emit(COLON231, DroolsEditorType.SYMBOL);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -10154,7 +10334,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 775:24: -> VT_LABEL[$value]
+            // 1042:3: -> VT_LABEL[$value]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_LABEL, value));
 
@@ -10187,62 +10367,66 @@
     };
 
     // $ANTLR start or_restr_connective
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:778:1: or_restr_connective : and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1045: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_PIPE240=null;
-        and_restr_connective_return and_restr_connective239 = null;
+        Token DOUBLE_PIPE233=null;
+        and_restr_connective_return and_restr_connective232 = null;
 
-        and_restr_connective_return and_restr_connective241 = null;
+        and_restr_connective_return and_restr_connective234 = null;
 
 
-        Object DOUBLE_PIPE240_tree=null;
+        Object DOUBLE_PIPE233_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:779:2: ( and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:779:4: and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:2: ( and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:4: and_restr_connective ({...}? => DOUBLE_PIPE and_restr_connective )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3360);
-            and_restr_connective239=and_restr_connective();
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3877);
+            and_restr_connective232=and_restr_connective();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective239.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:779:25: ({...}? => DOUBLE_PIPE and_restr_connective )*
-            loop82:
+            if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective232.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:25: ({...}? => DOUBLE_PIPE and_restr_connective )*
+            loop80:
             do {
-                int alt82=2;
-                alt82 = dfa82.predict(input);
-                switch (alt82) {
+                int alt80=2;
+                alt80 = dfa80.predict(input);
+                switch (alt80) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:779:26: {...}? => DOUBLE_PIPE and_restr_connective
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:26: {...}? => DOUBLE_PIPE and_restr_connective
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "or_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_PIPE240=(Token)input.LT(1);
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3366); if (failed) return retval;
+            	    DOUBLE_PIPE233=(Token)input.LT(1);
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3883); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_PIPE240_tree = (Object)adaptor.create(DOUBLE_PIPE240);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE240_tree, root_0);
+            	    DOUBLE_PIPE233_tree = (Object)adaptor.create(DOUBLE_PIPE233);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_PIPE233_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3369);
-            	    and_restr_connective241=and_restr_connective();
+            	    if ( backtracking==0 ) {
+            	      	emit(DOUBLE_PIPE233, DroolsEditorType.SYMBOL);
+            	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+            	    }
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3891);
+            	    and_restr_connective234=and_restr_connective();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective241.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, and_restr_connective234.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop82;
+            	    break loop80;
                 }
             } while (true);
 
@@ -10272,62 +10456,66 @@
     };
 
     // $ANTLR start and_restr_connective
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:1: and_restr_connective : constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1051: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_AMPER243=null;
-        constraint_expression_return constraint_expression242 = null;
+        Token DOUBLE_AMPER236=null;
+        constraint_expression_return constraint_expression235 = null;
 
-        constraint_expression_return constraint_expression244 = null;
+        constraint_expression_return constraint_expression237 = null;
 
 
-        Object DOUBLE_AMPER243_tree=null;
+        Object DOUBLE_AMPER236_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:2: ( constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:4: constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1052:2: ( constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )* )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1052:4: constraint_expression ({...}? => DOUBLE_AMPER constraint_expression )*
             {
             root_0 = (Object)adaptor.nil();
 
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3384);
-            constraint_expression242=constraint_expression();
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3906);
+            constraint_expression235=constraint_expression();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression242.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:26: ({...}? => DOUBLE_AMPER constraint_expression )*
-            loop83:
+            if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression235.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1052:26: ({...}? => DOUBLE_AMPER constraint_expression )*
+            loop81:
             do {
-                int alt83=2;
-                alt83 = dfa83.predict(input);
-                switch (alt83) {
+                int alt81=2;
+                alt81 = dfa81.predict(input);
+                switch (alt81) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:27: {...}? => DOUBLE_AMPER constraint_expression
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1052:27: {...}? => DOUBLE_AMPER constraint_expression
             	    {
             	    if ( !((validateRestr())) ) {
             	        if (backtracking>0) {failed=true; return retval;}
             	        throw new FailedPredicateException(input, "and_restr_connective", "(validateRestr())");
             	    }
-            	    DOUBLE_AMPER243=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3390); if (failed) return retval;
+            	    DOUBLE_AMPER236=(Token)input.LT(1);
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3912); if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	    DOUBLE_AMPER243_tree = (Object)adaptor.create(DOUBLE_AMPER243);
-            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER243_tree, root_0);
+            	    DOUBLE_AMPER236_tree = (Object)adaptor.create(DOUBLE_AMPER236);
+            	    root_0 = (Object)adaptor.becomeRoot(DOUBLE_AMPER236_tree, root_0);
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3393);
-            	    constraint_expression244=constraint_expression();
+            	    if ( backtracking==0 ) {
+            	      	emit(DOUBLE_AMPER236, DroolsEditorType.SYMBOL);
+            	      		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+            	    }
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3919);
+            	    constraint_expression237=constraint_expression();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression244.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, constraint_expression237.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop83;
+            	    break loop81;
                 }
             } while (true);
 
@@ -10357,108 +10545,200 @@
     };
 
     // $ANTLR start constraint_expression
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1057: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_PAREN247=null;
-        Token RIGHT_PAREN249=null;
-        compound_operator_return compound_operator245 = null;
+        Token LEFT_PAREN240=null;
+        Token RIGHT_PAREN242=null;
+        compound_operator_return compound_operator238 = null;
 
-        simple_operator_return simple_operator246 = null;
+        simple_operator_return simple_operator239 = null;
 
-        or_restr_connective_return or_restr_connective248 = null;
+        or_restr_connective_return or_restr_connective241 = null;
 
 
-        Object LEFT_PAREN247_tree=null;
-        Object RIGHT_PAREN249_tree=null;
+        Object LEFT_PAREN240_tree=null;
+        Object RIGHT_PAREN242_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
-            int alt84=3;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1060:3: ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN )
+            int alt82=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                int LA84_1 = input.LA(2);
+                int LA82_1 = input.LA(2);
 
-                if ( (LA84_1==ID) ) {
-                    int LA84_10 = input.LA(3);
+                if ( (LA82_1==ID) ) {
+                    int LA82_10 = input.LA(3);
 
-                    if ( (LA84_10==ID||LA84_10==STRING||(LA84_10>=BOOL && LA84_10<=INT)||(LA84_10>=FLOAT && LA84_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        alt84=2;
+                    if ( (LA82_10==DOT||(LA82_10>=COMMA && LA82_10<=RIGHT_PAREN)||(LA82_10>=DOUBLE_PIPE && LA82_10<=DOUBLE_AMPER)||LA82_10==LEFT_SQUARE) ) {
+                        alt82=2;
                     }
-                    else if ( (LA84_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                        int LA84_16 = input.LA(4);
+                    else if ( (LA82_10==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        int LA82_24 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt84=1;
+                            alt82=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.NOT))) ) {
-                            alt84=2;
+                            alt82=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 16, input);
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 24, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA84_10==DOT||(LA84_10>=COMMA && LA84_10<=RIGHT_PAREN)||(LA84_10>=DOUBLE_PIPE && LA84_10<=DOUBLE_AMPER)||LA84_10==LEFT_SQUARE) ) {
-                        alt84=2;
+                    else if ( (LA82_10==ID||LA82_10==STRING||(LA82_10>=BOOL && LA82_10<=INT)||(LA82_10>=FLOAT && LA82_10<=NULL)) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                        alt82=2;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 10, input);
+                            new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 10, input);
 
                         throw nvae;
                     }
                 }
-                else if ( (LA84_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt84=2;
+                else if ( (LA82_1==STRING||(LA82_1>=BOOL && LA82_1<=INT)||(LA82_1>=FLOAT && LA82_1<=NULL)) ) {
+                    alt82=2;
                 }
-                else if ( (LA84_1==STRING||(LA84_1>=BOOL && LA84_1<=INT)||(LA84_1>=FLOAT && LA84_1<=NULL)) ) {
-                    alt84=2;
-                }
-                else if ( (LA84_1==LEFT_PAREN) ) {
+                else if ( (LA82_1==LEFT_PAREN) ) {
                     switch ( input.LA(3) ) {
                     case ID:
                         {
-                        int LA84_23 = input.LA(4);
+                        int LA82_31 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
+                            alt82=1;
                         }
                         else if ( (true) ) {
-                            alt84=2;
+                            alt82=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 23, input);
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 31, input);
 
                             throw nvae;
                         }
                         }
                         break;
+                    case STRING:
+                        {
+                        int LA82_32 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt82=1;
+                        }
+                        else if ( (true) ) {
+                            alt82=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 32, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case INT:
+                        {
+                        int LA82_33 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt82=1;
+                        }
+                        else if ( (true) ) {
+                            alt82=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 33, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case FLOAT:
+                        {
+                        int LA82_34 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt82=1;
+                        }
+                        else if ( (true) ) {
+                            alt82=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 34, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case BOOL:
+                        {
+                        int LA82_35 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt82=1;
+                        }
+                        else if ( (true) ) {
+                            alt82=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 35, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case NULL:
+                        {
+                        int LA82_36 = input.LA(4);
+
+                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
+                            alt82=1;
+                        }
+                        else if ( (true) ) {
+                            alt82=2;
+                        }
+                        else {
+                            if (backtracking>0) {failed=true; return retval;}
+                            NoViableAltException nvae =
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 36, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
                     case LEFT_PAREN:
                         {
-                        int LA84_24 = input.LA(4);
+                        int LA82_37 = input.LA(4);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
+                            alt82=1;
                         }
                         else if ( (true) ) {
-                            alt84=2;
+                            alt82=2;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 24, input);
+                                new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 37, input);
 
                             throw nvae;
                         }
@@ -10518,7 +10798,6 @@
                     case VK_SALIENCE:
                     case VK_ENABLED:
                     case VK_ATTRIBUTES:
-                    case VK_WHEN:
                     case VK_RULE:
                     case VK_IMPORT:
                     case VK_PACKAGE:
@@ -10540,13 +10819,8 @@
                     case VK_AND:
                     case VK_EXISTS:
                     case VK_FORALL:
-                    case VK_FROM:
-                    case VK_ACCUMULATE:
-                    case VK_INIT:
                     case VK_ACTION:
                     case VK_REVERSE:
-                    case VK_RESULT:
-                    case VK_COLLECT:
                     case SEMICOLON:
                     case DOT:
                     case DOT_STAR:
@@ -10556,9 +10830,15 @@
                     case AT:
                     case COLON:
                     case EQUALS:
+                    case WHEN:
                     case DOUBLE_PIPE:
                     case DOUBLE_AMPER:
+                    case FROM:
                     case OVER:
+                    case ACCUMULATE:
+                    case INIT:
+                    case RESULT:
+                    case COLLECT:
                     case ARROW:
                     case EQUAL:
                     case GREATER:
@@ -10583,45 +10863,25 @@
                     case C_STYLE_SINGLE_LINE_COMMENT:
                     case MULTI_LINE_COMMENT:
                         {
-                        alt84=2;
+                        alt82=2;
                         }
                         break;
-                    case STRING:
-                    case BOOL:
-                    case INT:
-                    case FLOAT:
-                    case NULL:
-                        {
-                        int LA84_26 = input.LA(4);
-
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.IN))) ) {
-                            alt84=1;
-                        }
-                        else if ( (true) ) {
-                            alt84=2;
-                        }
-                        else {
-                            if (backtracking>0) {failed=true; return retval;}
-                            NoViableAltException nvae =
-                                new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 26, input);
-
-                            throw nvae;
-                        }
-                        }
-                        break;
                     default:
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 13, input);
+                            new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 16, input);
 
                         throw nvae;
                     }
 
                 }
+                else if ( (LA82_1==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt82=2;
+                }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 1, input);
+                        new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 1, input);
 
                     throw nvae;
                 }
@@ -10635,67 +10895,76 @@
             case NOT_EQUAL:
             case GRAVE_ACCENT:
                 {
-                alt84=2;
+                alt82=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt84=3;
+                alt82=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("786:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 84, 0, input);
+                    new NoViableAltException("1057:1: constraint_expression options {k=3; } : ( compound_operator | simple_operator | LEFT_PAREN or_restr_connective RIGHT_PAREN );", 82, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt84) {
+            switch (alt82) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:5: compound_operator
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1060:5: compound_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3415);
-                    compound_operator245=compound_operator();
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3941);
+                    compound_operator238=compound_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator245.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, compound_operator238.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:790:4: simple_operator
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1061:4: simple_operator
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3420);
-                    simple_operator246=simple_operator();
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3946);
+                    simple_operator239=simple_operator();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator246.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, simple_operator239.getTree());
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:791:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1062:4: LEFT_PAREN or_restr_connective RIGHT_PAREN
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    LEFT_PAREN247=(Token)input.LT(1);
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3425); if (failed) return retval;
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3428);
-                    or_restr_connective248=or_restr_connective();
+                    LEFT_PAREN240=(Token)input.LT(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3951); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                      	emit(LEFT_PAREN240, DroolsEditorType.SYMBOL);	
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	
+                    }
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3963);
+                    or_restr_connective241=or_restr_connective();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, or_restr_connective248.getTree());
-                    RIGHT_PAREN249=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3430); if (failed) return retval;
+                    if ( backtracking==0 ) adaptor.addChild(root_0, or_restr_connective241.getTree());
+                    RIGHT_PAREN242=(Token)input.LT(1);
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3968); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    RIGHT_PAREN249_tree = (Object)adaptor.create(RIGHT_PAREN249);
-                    adaptor.addChild(root_0, RIGHT_PAREN249_tree);
+                    RIGHT_PAREN242_tree = (Object)adaptor.create(RIGHT_PAREN242);
+                    adaptor.addChild(root_0, RIGHT_PAREN242_tree);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(RIGHT_PAREN242, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
@@ -10710,15 +10979,32 @@
         }
         catch ( RecognitionException re ) {
 
-            		if (!lookaheadTest){
-            			reportError(re);
-            			recover(input, re);
-            		} else {
-            			throw re;
-            		}
-            	
+            	if (!lookaheadTest){
+            		reportError(re);
+            		recover(input, re);
+            	} else {
+            		throw re;
+            	}
+
         }
         finally {
+
+            	if (isEditorInterfaceEnabled && input.LA(2) == EOF) {
+            		if (input.LA(1) == ID) {
+            			emit(input.LT(1), DroolsEditorType.KEYWORD);
+            			input.consume();
+            			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+            		}
+            	} else if (isEditorInterfaceEnabled && input.LA(3) == EOF) {
+            		if (input.LA(1) == ID && input.LA(2) == ID && validateLT(1, DroolsSoftKeywords.NOT)) {
+            			emit(input.LT(1), DroolsEditorType.KEYWORD);
+            			emit(input.LT(2), DroolsEditorType.KEYWORD);
+            			input.consume();
+            			input.consume();
+            			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+            		}
+            	}
+
         }
         return retval;
     }
@@ -10730,133 +11016,133 @@
     };
 
     // $ANTLR start simple_operator
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:802:1: simple_operator : ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) expression_value ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1093: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);
 
         Object root_0 = null;
 
-        Token EQUAL250=null;
-        Token GREATER251=null;
-        Token GREATER_EQUAL252=null;
-        Token LESS253=null;
-        Token LESS_EQUAL254=null;
-        Token NOT_EQUAL255=null;
-        Token ID261=null;
-        Token GRAVE_ACCENT262=null;
-        Token ID263=null;
-        Token ID270=null;
-        Token GRAVE_ACCENT271=null;
-        Token ID272=null;
-        not_key_return not_key256 = null;
+        Token id1=null;
+        Token ga1=null;
+        Token id2=null;
+        Token id3=null;
+        Token ga2=null;
+        Token id4=null;
+        Token EQUAL243=null;
+        Token GREATER244=null;
+        Token GREATER_EQUAL245=null;
+        Token LESS246=null;
+        Token LESS_EQUAL247=null;
+        Token NOT_EQUAL248=null;
+        not_key_return not_key249 = null;
 
-        contains_key_return contains_key257 = null;
+        contains_key_return contains_key250 = null;
 
-        soundslike_key_return soundslike_key258 = null;
+        soundslike_key_return soundslike_key251 = null;
 
-        matches_key_return matches_key259 = null;
+        matches_key_return matches_key252 = null;
 
-        memberof_key_return memberof_key260 = null;
+        memberof_key_return memberof_key253 = null;
 
-        square_chunk_return square_chunk264 = null;
+        square_chunk_return square_chunk254 = null;
 
-        contains_key_return contains_key265 = null;
+        contains_key_return contains_key255 = null;
 
-        excludes_key_return excludes_key266 = null;
+        excludes_key_return excludes_key256 = null;
 
-        matches_key_return matches_key267 = null;
+        matches_key_return matches_key257 = null;
 
-        soundslike_key_return soundslike_key268 = null;
+        soundslike_key_return soundslike_key258 = null;
 
-        memberof_key_return memberof_key269 = null;
+        memberof_key_return memberof_key259 = null;
 
-        square_chunk_return square_chunk273 = null;
+        square_chunk_return square_chunk260 = null;
 
-        expression_value_return expression_value274 = null;
+        expression_value_return expression_value261 = null;
 
 
-        Object EQUAL250_tree=null;
-        Object GREATER251_tree=null;
-        Object GREATER_EQUAL252_tree=null;
-        Object LESS253_tree=null;
-        Object LESS_EQUAL254_tree=null;
-        Object NOT_EQUAL255_tree=null;
-        Object ID261_tree=null;
-        Object GRAVE_ACCENT262_tree=null;
-        Object ID263_tree=null;
-        Object ID270_tree=null;
-        Object GRAVE_ACCENT271_tree=null;
-        Object ID272_tree=null;
+        Object id1_tree=null;
+        Object ga1_tree=null;
+        Object id2_tree=null;
+        Object id3_tree=null;
+        Object ga2_tree=null;
+        Object id4_tree=null;
+        Object EQUAL243_tree=null;
+        Object GREATER244_tree=null;
+        Object GREATER_EQUAL245_tree=null;
+        Object LESS246_tree=null;
+        Object LESS_EQUAL247_tree=null;
+        Object NOT_EQUAL248_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:2: ( ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) expression_value )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) expression_value
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094: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 )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094: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();
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )
-            int alt86=14;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094: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 )
+            int alt84=14;
             switch ( input.LA(1) ) {
             case EQUAL:
                 {
-                alt86=1;
+                alt84=1;
                 }
                 break;
             case GREATER:
                 {
-                alt86=2;
+                alt84=2;
                 }
                 break;
             case GREATER_EQUAL:
                 {
-                alt86=3;
+                alt84=3;
                 }
                 break;
             case LESS:
                 {
-                alt86=4;
+                alt84=4;
                 }
                 break;
             case LESS_EQUAL:
                 {
-                alt86=5;
+                alt84=5;
                 }
                 break;
             case NOT_EQUAL:
                 {
-                alt86=6;
+                alt84=6;
                 }
                 break;
             case ID:
                 {
-                int LA86_7 = input.LA(2);
+                int LA84_7 = input.LA(2);
 
-                if ( (LA86_7==ID||LA86_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt86=7;
+                if ( (LA84_7==ID||LA84_7==GRAVE_ACCENT) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt84=7;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                    alt86=8;
+                    alt84=8;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))) ) {
-                    alt86=9;
+                    alt84=9;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                    alt86=10;
+                    alt84=10;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                    alt86=11;
+                    alt84=11;
                 }
                 else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                    alt86=12;
+                    alt84=12;
                 }
                 else if ( (true) ) {
-                    alt86=13;
+                    alt84=13;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("803:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )", 86, 7, input);
+                        new NoViableAltException("1094: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 )", 84, 7, input);
 
                     throw nvae;
                 }
@@ -10864,211 +11150,238 @@
                 break;
             case GRAVE_ACCENT:
                 {
-                alt86=14;
+                alt84=14;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("803:4: ( EQUAL | GREATER | GREATER_EQUAL | LESS | LESS_EQUAL | NOT_EQUAL | not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk ) | contains_key | excludes_key | matches_key | soundslike_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )", 86, 0, input);
+                    new NoViableAltException("1094: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 )", 84, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt86) {
+            switch (alt84) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:803:5: EQUAL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094:5: EQUAL
                     {
-                    EQUAL250=(Token)input.LT(1);
-                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator3449); if (failed) return retval;
+                    EQUAL243=(Token)input.LT(1);
+                    match(input,EQUAL,FOLLOW_EQUAL_in_simple_operator3993); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    EQUAL250_tree = (Object)adaptor.create(EQUAL250);
-                    root_0 = (Object)adaptor.becomeRoot(EQUAL250_tree, root_0);
+                    EQUAL243_tree = (Object)adaptor.create(EQUAL243);
+                    root_0 = (Object)adaptor.becomeRoot(EQUAL243_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(EQUAL243, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:804:4: GREATER
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1095:4: GREATER
                     {
-                    GREATER251=(Token)input.LT(1);
-                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator3455); if (failed) return retval;
+                    GREATER244=(Token)input.LT(1);
+                    match(input,GREATER,FOLLOW_GREATER_in_simple_operator4001); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER251_tree = (Object)adaptor.create(GREATER251);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER251_tree, root_0);
+                    GREATER244_tree = (Object)adaptor.create(GREATER244);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER244_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(GREATER244, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:805:4: GREATER_EQUAL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1096:4: GREATER_EQUAL
                     {
-                    GREATER_EQUAL252=(Token)input.LT(1);
-                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator3461); if (failed) return retval;
+                    GREATER_EQUAL245=(Token)input.LT(1);
+                    match(input,GREATER_EQUAL,FOLLOW_GREATER_EQUAL_in_simple_operator4009); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    GREATER_EQUAL252_tree = (Object)adaptor.create(GREATER_EQUAL252);
-                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL252_tree, root_0);
+                    GREATER_EQUAL245_tree = (Object)adaptor.create(GREATER_EQUAL245);
+                    root_0 = (Object)adaptor.becomeRoot(GREATER_EQUAL245_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(GREATER_EQUAL245, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 4 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:806:4: LESS
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1097:4: LESS
                     {
-                    LESS253=(Token)input.LT(1);
-                    match(input,LESS,FOLLOW_LESS_in_simple_operator3467); if (failed) return retval;
+                    LESS246=(Token)input.LT(1);
+                    match(input,LESS,FOLLOW_LESS_in_simple_operator4017); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS253_tree = (Object)adaptor.create(LESS253);
-                    root_0 = (Object)adaptor.becomeRoot(LESS253_tree, root_0);
+                    LESS246_tree = (Object)adaptor.create(LESS246);
+                    root_0 = (Object)adaptor.becomeRoot(LESS246_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(LESS246, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 5 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:807:4: LESS_EQUAL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1098:4: LESS_EQUAL
                     {
-                    LESS_EQUAL254=(Token)input.LT(1);
-                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator3473); if (failed) return retval;
+                    LESS_EQUAL247=(Token)input.LT(1);
+                    match(input,LESS_EQUAL,FOLLOW_LESS_EQUAL_in_simple_operator4025); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    LESS_EQUAL254_tree = (Object)adaptor.create(LESS_EQUAL254);
-                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL254_tree, root_0);
+                    LESS_EQUAL247_tree = (Object)adaptor.create(LESS_EQUAL247);
+                    root_0 = (Object)adaptor.becomeRoot(LESS_EQUAL247_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(LESS_EQUAL247, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 6 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:808:4: NOT_EQUAL
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1099:4: NOT_EQUAL
                     {
-                    NOT_EQUAL255=(Token)input.LT(1);
-                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator3479); if (failed) return retval;
+                    NOT_EQUAL248=(Token)input.LT(1);
+                    match(input,NOT_EQUAL,FOLLOW_NOT_EQUAL_in_simple_operator4033); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    NOT_EQUAL255_tree = (Object)adaptor.create(NOT_EQUAL255);
-                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL255_tree, root_0);
+                    NOT_EQUAL248_tree = (Object)adaptor.create(NOT_EQUAL248);
+                    root_0 = (Object)adaptor.becomeRoot(NOT_EQUAL248_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(NOT_EQUAL248, DroolsEditorType.SYMBOL);	
+                    }
 
                     }
                     break;
                 case 7 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:4: not_key ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1100: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_operator3485);
-                    not_key256=not_key();
+                    pushFollow(FOLLOW_not_key_in_simple_operator4041);
+                    not_key249=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key256.getTree());
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:12: ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )
-                    int alt85=6;
-                    int LA85_0 = input.LA(1);
+                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key249.getTree());
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1101:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )
+                    int alt83=6;
+                    int LA83_0 = input.LA(1);
 
-                    if ( (LA85_0==ID) ) {
-                        int LA85_1 = input.LA(2);
+                    if ( (LA83_0==ID) ) {
+                        int LA83_1 = input.LA(2);
 
                         if ( ((validateIdentifierKey(DroolsSoftKeywords.CONTAINS))) ) {
-                            alt85=1;
+                            alt83=1;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))) ) {
-                            alt85=2;
+                            alt83=2;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MATCHES))) ) {
-                            alt85=3;
+                            alt83=3;
                         }
                         else if ( ((validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))) ) {
-                            alt85=4;
+                            alt83=4;
                         }
                         else if ( (true) ) {
-                            alt85=5;
+                            alt83=5;
                         }
                         else {
                             if (backtracking>0) {failed=true; return retval;}
                             NoViableAltException nvae =
-                                new NoViableAltException("809:12: ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )", 85, 1, input);
+                                new NoViableAltException("1101:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 83, 1, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( (LA85_0==GRAVE_ACCENT) ) {
-                        alt85=6;
+                    else if ( (LA83_0==GRAVE_ACCENT) ) {
+                        alt83=6;
                     }
                     else {
                         if (backtracking>0) {failed=true; return retval;}
                         NoViableAltException nvae =
-                            new NoViableAltException("809:12: ( contains_key | soundslike_key | matches_key | memberof_key | ID | GRAVE_ACCENT ID square_chunk )", 85, 0, input);
+                            new NoViableAltException("1101:3: ( contains_key | soundslike_key | matches_key | memberof_key | id1= ID | ga1= GRAVE_ACCENT id2= ID square_chunk )", 83, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt85) {
+                    switch (alt83) {
                         case 1 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:13: contains_key
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1101:5: contains_key
                             {
-                            pushFollow(FOLLOW_contains_key_in_simple_operator3488);
-                            contains_key257=contains_key();
+                            pushFollow(FOLLOW_contains_key_in_simple_operator4048);
+                            contains_key250=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_key250.getTree(), root_0);
 
                             }
                             break;
                         case 2 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:27: soundslike_key
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1102:5: soundslike_key
                             {
-                            pushFollow(FOLLOW_soundslike_key_in_simple_operator3491);
-                            soundslike_key258=soundslike_key();
+                            pushFollow(FOLLOW_soundslike_key_in_simple_operator4055);
+                            soundslike_key251=soundslike_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key258.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key251.getTree(), root_0);
 
                             }
                             break;
                         case 3 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:43: matches_key
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1103:5: matches_key
                             {
-                            pushFollow(FOLLOW_matches_key_in_simple_operator3494);
-                            matches_key259=matches_key();
+                            pushFollow(FOLLOW_matches_key_in_simple_operator4062);
+                            matches_key252=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_key252.getTree(), root_0);
 
                             }
                             break;
                         case 4 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:56: memberof_key
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1104:5: memberof_key
                             {
-                            pushFollow(FOLLOW_memberof_key_in_simple_operator3497);
-                            memberof_key260=memberof_key();
+                            pushFollow(FOLLOW_memberof_key_in_simple_operator4069);
+                            memberof_key253=memberof_key();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key260.getTree(), root_0);
+                            if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key253.getTree(), root_0);
 
                             }
                             break;
                         case 5 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:71: ID
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:5: id1= ID
                             {
-                            ID261=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator3501); if (failed) return retval;
+                            id1=(Token)input.LT(1);
+                            match(input,ID,FOLLOW_ID_in_simple_operator4078); if (failed) return retval;
                             if ( backtracking==0 ) {
-                            ID261_tree = (Object)adaptor.create(ID261);
-                            root_0 = (Object)adaptor.becomeRoot(ID261_tree, root_0);
+                            id1_tree = (Object)adaptor.create(id1);
+                            root_0 = (Object)adaptor.becomeRoot(id1_tree, root_0);
                             }
+                            if ( backtracking==0 ) {
+                              	emit(id1, DroolsEditorType.IDENTIFIER);	
+                            }
 
                             }
                             break;
                         case 6 :
-                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:809:77: GRAVE_ACCENT ID square_chunk
+                            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1106:5: ga1= GRAVE_ACCENT id2= ID square_chunk
                             {
-                            GRAVE_ACCENT262=(Token)input.LT(1);
-                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator3506); if (failed) return retval;
-                            ID263=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_simple_operator3509); if (failed) return retval;
+                            ga1=(Token)input.LT(1);
+                            match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4089); if (failed) return retval;
                             if ( backtracking==0 ) {
-                            ID263_tree = (Object)adaptor.create(ID263);
-                            root_0 = (Object)adaptor.becomeRoot(ID263_tree, root_0);
+                              	emit(ga1, DroolsEditorType.SYMBOL);	
                             }
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator3512);
-                            square_chunk264=square_chunk();
+                            id2=(Token)input.LT(1);
+                            match(input,ID,FOLLOW_ID_in_simple_operator4097); if (failed) return retval;
+                            if ( backtracking==0 ) {
+                            id2_tree = (Object)adaptor.create(id2);
+                            root_0 = (Object)adaptor.becomeRoot(id2_tree, root_0);
+                            }
+                            if ( backtracking==0 ) {
+                              	emit(id2, DroolsEditorType.IDENTIFIER);	
+                            }
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4103);
+                            square_chunk254=square_chunk();
                             _fsp--;
                             if (failed) return retval;
-                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk264.getTree());
+                            if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk254.getTree());
 
                             }
                             break;
@@ -11079,99 +11392,111 @@
                     }
                     break;
                 case 8 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:810:4: contains_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1107:4: contains_key
                     {
-                    pushFollow(FOLLOW_contains_key_in_simple_operator3518);
-                    contains_key265=contains_key();
+                    pushFollow(FOLLOW_contains_key_in_simple_operator4109);
+                    contains_key255=contains_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key265.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(contains_key255.getTree(), root_0);
 
                     }
                     break;
                 case 9 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:811:4: excludes_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:4: excludes_key
                     {
-                    pushFollow(FOLLOW_excludes_key_in_simple_operator3524);
-                    excludes_key266=excludes_key();
+                    pushFollow(FOLLOW_excludes_key_in_simple_operator4115);
+                    excludes_key256=excludes_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key266.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(excludes_key256.getTree(), root_0);
 
                     }
                     break;
                 case 10 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:812:4: matches_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1109:4: matches_key
                     {
-                    pushFollow(FOLLOW_matches_key_in_simple_operator3530);
-                    matches_key267=matches_key();
+                    pushFollow(FOLLOW_matches_key_in_simple_operator4121);
+                    matches_key257=matches_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key267.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(matches_key257.getTree(), root_0);
 
                     }
                     break;
                 case 11 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:813:4: soundslike_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1110:4: soundslike_key
                     {
-                    pushFollow(FOLLOW_soundslike_key_in_simple_operator3536);
-                    soundslike_key268=soundslike_key();
+                    pushFollow(FOLLOW_soundslike_key_in_simple_operator4127);
+                    soundslike_key258=soundslike_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key268.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(soundslike_key258.getTree(), root_0);
 
                     }
                     break;
                 case 12 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:814:4: memberof_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1111:4: memberof_key
                     {
-                    pushFollow(FOLLOW_memberof_key_in_simple_operator3542);
-                    memberof_key269=memberof_key();
+                    pushFollow(FOLLOW_memberof_key_in_simple_operator4133);
+                    memberof_key259=memberof_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key269.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(memberof_key259.getTree(), root_0);
 
                     }
                     break;
                 case 13 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:815:4: ID
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1112:4: id3= ID
                     {
-                    ID270=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator3548); if (failed) return retval;
+                    id3=(Token)input.LT(1);
+                    match(input,ID,FOLLOW_ID_in_simple_operator4141); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    ID270_tree = (Object)adaptor.create(ID270);
-                    root_0 = (Object)adaptor.becomeRoot(ID270_tree, root_0);
+                    id3_tree = (Object)adaptor.create(id3);
+                    root_0 = (Object)adaptor.becomeRoot(id3_tree, root_0);
                     }
+                    if ( backtracking==0 ) {
+                      	emit(id3, DroolsEditorType.IDENTIFIER);	
+                    }
 
                     }
                     break;
                 case 14 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:816:4: GRAVE_ACCENT ID square_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1113:4: ga2= GRAVE_ACCENT id4= ID square_chunk
                     {
-                    GRAVE_ACCENT271=(Token)input.LT(1);
-                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator3554); if (failed) return retval;
-                    ID272=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator3557); if (failed) return retval;
+                    ga2=(Token)input.LT(1);
+                    match(input,GRAVE_ACCENT,FOLLOW_GRAVE_ACCENT_in_simple_operator4151); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    ID272_tree = (Object)adaptor.create(ID272);
-                    root_0 = (Object)adaptor.becomeRoot(ID272_tree, root_0);
+                      	emit(ga2, DroolsEditorType.SYMBOL);	
                     }
-                    pushFollow(FOLLOW_square_chunk_in_simple_operator3560);
-                    square_chunk273=square_chunk();
+                    id4=(Token)input.LT(1);
+                    match(input,ID,FOLLOW_ID_in_simple_operator4159); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    id4_tree = (Object)adaptor.create(id4);
+                    root_0 = (Object)adaptor.becomeRoot(id4_tree, root_0);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(id4, DroolsEditorType.IDENTIFIER);	
+                    }
+                    pushFollow(FOLLOW_square_chunk_in_simple_operator4165);
+                    square_chunk260=square_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk273.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk260.getTree());
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_expression_value_in_simple_operator3564);
-            expression_value274=expression_value();
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
+            }
+            pushFollow(FOLLOW_expression_value_in_simple_operator4172);
+            expression_value261=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value274.getTree());
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value261.getTree());
 
             }
 
@@ -11198,54 +11523,54 @@
     };
 
     // $ANTLR start compound_operator
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:1: compound_operator : ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1119: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_PAREN278=null;
-        Token COMMA280=null;
-        Token RIGHT_PAREN282=null;
-        in_key_return in_key275 = null;
+        Token LEFT_PAREN265=null;
+        Token COMMA267=null;
+        Token RIGHT_PAREN269=null;
+        in_key_return in_key262 = null;
 
-        not_key_return not_key276 = null;
+        not_key_return not_key263 = null;
 
-        in_key_return in_key277 = null;
+        in_key_return in_key264 = null;
 
-        expression_value_return expression_value279 = null;
+        expression_value_return expression_value266 = null;
 
-        expression_value_return expression_value281 = null;
+        expression_value_return expression_value268 = null;
 
 
-        Object LEFT_PAREN278_tree=null;
-        Object COMMA280_tree=null;
-        Object RIGHT_PAREN282_tree=null;
+        Object LEFT_PAREN265_tree=null;
+        Object COMMA267_tree=null;
+        Object RIGHT_PAREN269_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:2: ( ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:4: ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:2: ( ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:4: ( in_key | not_key in_key ) LEFT_PAREN expression_value ( COMMA expression_value )* RIGHT_PAREN
             {
             root_0 = (Object)adaptor.nil();
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:4: ( in_key | not_key in_key )
-            int alt87=2;
-            int LA87_0 = input.LA(1);
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:4: ( in_key | not_key in_key )
+            int alt85=2;
+            int LA85_0 = input.LA(1);
 
-            if ( (LA87_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.IN))||(validateIdentifierKey(DroolsSoftKeywords.NOT))))) {
-                int LA87_1 = input.LA(2);
+            if ( (LA85_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.NOT))||(validateIdentifierKey(DroolsSoftKeywords.IN))))) {
+                int LA85_1 = input.LA(2);
 
-                if ( (LA87_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
-                    alt87=2;
+                if ( (LA85_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
+                    alt85=1;
                 }
-                else if ( (LA87_1==LEFT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.IN)))) {
-                    alt87=1;
+                else if ( (LA85_1==ID) && ((validateIdentifierKey(DroolsSoftKeywords.NOT)))) {
+                    alt85=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return retval;}
                     NoViableAltException nvae =
-                        new NoViableAltException("822:4: ( in_key | not_key in_key )", 87, 1, input);
+                        new NoViableAltException("1120:4: ( in_key | not_key in_key )", 85, 1, input);
 
                     throw nvae;
                 }
@@ -11253,85 +11578,100 @@
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("822:4: ( in_key | not_key in_key )", 87, 0, input);
+                    new NoViableAltException("1120:4: ( in_key | not_key in_key )", 85, 0, input);
 
                 throw nvae;
             }
-            switch (alt87) {
+            switch (alt85) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:6: in_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:6: in_key
                     {
-                    pushFollow(FOLLOW_in_key_in_compound_operator3579);
-                    in_key275=in_key();
+                    pushFollow(FOLLOW_in_key_in_compound_operator4187);
+                    in_key262=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key275.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key262.getTree(), root_0);
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:16: not_key in_key
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:16: not_key in_key
                     {
-                    pushFollow(FOLLOW_not_key_in_compound_operator3584);
-                    not_key276=not_key();
+                    pushFollow(FOLLOW_not_key_in_compound_operator4192);
+                    not_key263=not_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key276.getTree());
-                    pushFollow(FOLLOW_in_key_in_compound_operator3586);
-                    in_key277=in_key();
+                    if ( backtracking==0 ) adaptor.addChild(root_0, not_key263.getTree());
+                    pushFollow(FOLLOW_in_key_in_compound_operator4194);
+                    in_key264=in_key();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key277.getTree(), root_0);
+                    if ( backtracking==0 ) root_0 = (Object)adaptor.becomeRoot(in_key264.getTree(), root_0);
 
                     }
                     break;
 
             }
 
-            LEFT_PAREN278=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator3591); if (failed) return retval;
-            pushFollow(FOLLOW_expression_value_in_compound_operator3594);
-            expression_value279=expression_value();
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	
+            }
+            LEFT_PAREN265=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4205); if (failed) return retval;
+            if ( backtracking==0 ) {
+              	emit(LEFT_PAREN265, DroolsEditorType.SYMBOL);	
+            }
+            pushFollow(FOLLOW_expression_value_in_compound_operator4213);
+            expression_value266=expression_value();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value279.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:63: ( COMMA expression_value )*
-            loop88:
+            if ( backtracking==0 ) adaptor.addChild(root_0, expression_value266.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1123:21: ( COMMA expression_value )*
+            loop86:
             do {
-                int alt88=2;
-                int LA88_0 = input.LA(1);
+                int alt86=2;
+                int LA86_0 = input.LA(1);
 
-                if ( (LA88_0==COMMA) ) {
-                    alt88=1;
+                if ( (LA86_0==COMMA) ) {
+                    alt86=1;
                 }
 
 
-                switch (alt88) {
+                switch (alt86) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:65: COMMA expression_value
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1123:23: COMMA expression_value
             	    {
-            	    COMMA280=(Token)input.LT(1);
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator3598); if (failed) return retval;
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator3601);
-            	    expression_value281=expression_value();
+            	    COMMA267=(Token)input.LT(1);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4217); if (failed) return retval;
+            	    if ( backtracking==0 ) {
+            	      	emit(COMMA267, DroolsEditorType.SYMBOL);	
+            	    }
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4222);
+            	    expression_value268=expression_value();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value281.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, expression_value268.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop88;
+            	    break loop86;
                 }
             } while (true);
 
-            RIGHT_PAREN282=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator3606); if (failed) return retval;
+            RIGHT_PAREN269=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4230); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_PAREN282_tree = (Object)adaptor.create(RIGHT_PAREN282);
-            adaptor.addChild(root_0, RIGHT_PAREN282_tree);
+            RIGHT_PAREN269_tree = (Object)adaptor.create(RIGHT_PAREN269);
+            adaptor.addChild(root_0, RIGHT_PAREN269_tree);
             }
+            if ( backtracking==0 ) {
+              	emit(RIGHT_PAREN269, DroolsEditorType.SYMBOL);	
+            }
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	
+            }
 
             }
 
@@ -11347,6 +11687,12 @@
             recover(input,re);
         }
         finally {
+             
+            	if (isEditorInterfaceEnabled && input.LA(2) == EOF && input.LA(1) == DOUBLE_PIPE) {
+            		emit(input.LT(1), DroolsEditorType.SYMBOL);
+            		input.consume();
+            		emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+            	}	
         }
         return retval;
     }
@@ -11358,28 +11704,33 @@
     };
 
     // $ANTLR start expression_value
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:825:1: expression_value : ( accessor_path | literal_constraint | paren_chunk );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1134: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_path283 = null;
+        accessor_path_return accessor_path270 = null;
 
-        literal_constraint_return literal_constraint284 = null;
+        literal_constraint_return literal_constraint271 = null;
 
-        paren_chunk_return paren_chunk285 = null;
+        paren_chunk_return paren_chunk272 = null;
 
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:826:2: ( accessor_path | literal_constraint | paren_chunk )
-            int alt89=3;
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:2: ( ( accessor_path | literal_constraint | paren_chunk ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:4: ( accessor_path | literal_constraint | paren_chunk )
+            {
+            root_0 = (Object)adaptor.nil();
+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:4: ( accessor_path | literal_constraint | paren_chunk )
+            int alt87=3;
             switch ( input.LA(1) ) {
             case ID:
                 {
-                alt89=1;
+                alt87=1;
                 }
                 break;
             case STRING:
@@ -11388,64 +11739,65 @@
             case FLOAT:
             case NULL:
                 {
-                alt89=2;
+                alt87=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt89=3;
+                alt87=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("825:1: expression_value : ( accessor_path | literal_constraint | paren_chunk );", 89, 0, input);
+                    new NoViableAltException("1135:4: ( accessor_path | literal_constraint | paren_chunk )", 87, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt89) {
+            switch (alt87) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:826:4: accessor_path
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1135:5: accessor_path
                     {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_accessor_path_in_expression_value3617);
-                    accessor_path283=accessor_path();
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4251);
+                    accessor_path270=accessor_path();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path283.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, accessor_path270.getTree());
 
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:4: literal_constraint
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1136:4: literal_constraint
                     {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value3622);
-                    literal_constraint284=literal_constraint();
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4256);
+                    literal_constraint271=literal_constraint();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint284.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, literal_constraint271.getTree());
 
                     }
                     break;
                 case 3 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:828:4: paren_chunk
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1137:4: paren_chunk
                     {
-                    root_0 = (Object)adaptor.nil();
-
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value3628);
-                    paren_chunk285=paren_chunk();
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4262);
+                    paren_chunk272=paren_chunk();
                     _fsp--;
                     if (failed) return retval;
-                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk285.getTree());
+                    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk272.getTree());
 
                     }
                     break;
 
             }
+
+            if ( backtracking==0 ) {
+              	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	
+            }
+
+            }
+
             retval.stop = input.LT(-1);
 
             if ( backtracking==0 ) {
@@ -11458,6 +11810,17 @@
             recover(input,re);
         }
         finally {
+             
+            	if (isEditorInterfaceEnabled && input.LA(2) == EOF) {
+            		if (input.LA(1) == DOUBLE_PIPE) {
+            			emit(input.LT(1), DroolsEditorType.SYMBOL);
+            			input.consume();
+            			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+            		} else if (input.LA(1) == EOF && input.get(input.index() - 1).getType() != WS) {
+            			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+            		}
+            	}
+
         }
         return retval;
     }
@@ -11469,39 +11832,150 @@
     };
 
     // $ANTLR start literal_constraint
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1152: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 set286=null;
+        Token STRING273=null;
+        Token INT274=null;
+        Token FLOAT275=null;
+        Token BOOL276=null;
+        Token NULL277=null;
 
-        Object set286_tree=null;
+        Object STRING273_tree=null;
+        Object INT274_tree=null;
+        Object FLOAT275_tree=null;
+        Object BOOL276_tree=null;
+        Object NULL277_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:832:2: ( STRING | INT | FLOAT | BOOL | NULL )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
-            {
-            root_0 = (Object)adaptor.nil();
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1153:2: ( STRING | INT | FLOAT | BOOL | NULL )
+            int alt88=5;
+            switch ( input.LA(1) ) {
+            case STRING:
+                {
+                alt88=1;
+                }
+                break;
+            case INT:
+                {
+                alt88=2;
+                }
+                break;
+            case FLOAT:
+                {
+                alt88=3;
+                }
+                break;
+            case BOOL:
+                {
+                alt88=4;
+                }
+                break;
+            case NULL:
+                {
+                alt88=5;
+                }
+                break;
+            default:
+                if (backtracking>0) {failed=true; return retval;}
+                NoViableAltException nvae =
+                    new NoViableAltException("1152:1: literal_constraint : ( STRING | INT | FLOAT | BOOL | NULL );", 88, 0, input);
 
-            set286=(Token)input.LT(1);
-            if ( input.LA(1)==STRING||(input.LA(1)>=BOOL && input.LA(1)<=INT)||(input.LA(1)>=FLOAT && input.LA(1)<=NULL) ) {
-                input.consume();
-                if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set286));
-                errorRecovery=false;failed=false;
+                throw nvae;
             }
-            else {
-                if (backtracking>0) {failed=true; return retval;}
-                MismatchedSetException mse =
-                    new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_literal_constraint0);    throw mse;
-            }
 
+            switch (alt88) {
+                case 1 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1153:4: STRING
+                    {
+                    root_0 = (Object)adaptor.nil();
 
-            }
+                    STRING273=(Token)input.LT(1);
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4281); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    STRING273_tree = (Object)adaptor.create(STRING273);
+                    adaptor.addChild(root_0, STRING273_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(STRING273, DroolsEditorType.STRING_CONST);	
+                    }
 
+                    }
+                    break;
+                case 2 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1154:4: INT
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    INT274=(Token)input.LT(1);
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4288); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    INT274_tree = (Object)adaptor.create(INT274);
+                    adaptor.addChild(root_0, INT274_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(INT274, DroolsEditorType.NUMERIC_CONST);	
+                    }
+
+                    }
+                    break;
+                case 3 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1155:4: FLOAT
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    FLOAT275=(Token)input.LT(1);
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4295); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    FLOAT275_tree = (Object)adaptor.create(FLOAT275);
+                    adaptor.addChild(root_0, FLOAT275_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(FLOAT275, DroolsEditorType.NUMERIC_CONST);	
+                    }
+
+                    }
+                    break;
+                case 4 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1156:4: BOOL
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    BOOL276=(Token)input.LT(1);
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4302); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    BOOL276_tree = (Object)adaptor.create(BOOL276);
+                    adaptor.addChild(root_0, BOOL276_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(BOOL276, DroolsEditorType.BOOLEAN_CONST);	
+                    }
+
+                    }
+                    break;
+                case 5 :
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1157:4: NULL
+                    {
+                    root_0 = (Object)adaptor.nil();
+
+                    NULL277=(Token)input.LT(1);
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4309); if (failed) return retval;
+                    if ( backtracking==0 ) {
+                    NULL277_tree = (Object)adaptor.create(NULL277);
+                    adaptor.addChild(root_0, NULL277_tree);
+                    }
+                    if ( backtracking==0 ) {
+                      	emit(NULL277, DroolsEditorType.NULL_CONST);	
+                    }
+
+                    }
+                    break;
+
+            }
             retval.stop = input.LT(-1);
 
             if ( backtracking==0 ) {
@@ -11525,7 +11999,7 @@
     };
 
     // $ANTLR start pattern_type
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:839:1: pattern_type : id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160: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);
@@ -11534,7 +12008,7 @@
 
         Token id=null;
         List list_id=null;
-        dimension_definition_return dimension_definition287 = null;
+        dimension_definition_return dimension_definition278 = null;
 
 
         Object id_tree=null;
@@ -11542,40 +12016,40 @@
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_dimension_definition=new RewriteRuleSubtreeStream(adaptor,"rule dimension_definition");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_pattern_type3672); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_pattern_type4324); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
             if (list_id==null) list_id=new ArrayList();
             list_id.add(id);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:11: (id+= DOT id+= ID )*
-            loop90:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:11: (id+= DOT id+= ID )*
+            loop89:
             do {
-                int alt90=2;
-                int LA90_0 = input.LA(1);
+                int alt89=2;
+                int LA89_0 = input.LA(1);
 
-                if ( (LA90_0==DOT) ) {
-                    alt90=1;
+                if ( (LA89_0==DOT) ) {
+                    alt89=1;
                 }
 
 
-                switch (alt90) {
+                switch (alt89) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:13: id+= DOT id+= ID
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:13: id+= DOT id+= ID
             	    {
             	    id=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_pattern_type3678); if (failed) return retval;
+            	    match(input,DOT,FOLLOW_DOT_in_pattern_type4330); 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_type3682); if (failed) return retval;
+            	    match(input,ID,FOLLOW_ID_in_pattern_type4334); if (failed) return retval;
             	    if ( backtracking==0 ) stream_ID.add(id);
 
             	    if (list_id==null) list_id=new ArrayList();
@@ -11586,39 +12060,40 @@
             	    break;
 
             	default :
-            	    break loop90;
+            	    break loop89;
                 }
             } while (true);
 
             if ( backtracking==0 ) {
-              	setParaphrasesValue(DroolsParaphareseTypes.PATTERN, buildStringFromTokens(list_id));	
+              	emit(list_id, DroolsEditorType.IDENTIFIER);
+              		setParaphrasesValue(DroolsParaphraseTypes.PATTERN, buildStringFromTokens(list_id));	
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:6: ( dimension_definition )*
-            loop91:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1164:6: ( dimension_definition )*
+            loop90:
             do {
-                int alt91=2;
-                int LA91_0 = input.LA(1);
+                int alt90=2;
+                int LA90_0 = input.LA(1);
 
-                if ( (LA91_0==LEFT_SQUARE) ) {
-                    alt91=1;
+                if ( (LA90_0==LEFT_SQUARE) ) {
+                    alt90=1;
                 }
 
 
-                switch (alt91) {
+                switch (alt90) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:6: dimension_definition
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1164:6: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type3697);
-            	    dimension_definition287=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_pattern_type4349);
+            	    dimension_definition278=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition287.getTree());
+            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition278.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop91;
+            	    break loop90;
                 }
             } while (true);
 
@@ -11634,9 +12109,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 843:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+            // 1165:3: -> ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:843:6: ^( VT_PATTERN_TYPE ( ID )+ ( dimension_definition )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1165: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);
@@ -11649,7 +12124,7 @@
 
                 }
                 stream_ID.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:843:28: ( dimension_definition )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1165:28: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -11688,94 +12163,103 @@
     };
 
     // $ANTLR start data_type
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:1: data_type : ID ( DOT ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1168: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);
 
         Object root_0 = null;
 
-        Token ID288=null;
-        Token DOT289=null;
-        Token ID290=null;
-        dimension_definition_return dimension_definition291 = null;
+        Token id=null;
+        List list_id=null;
+        dimension_definition_return dimension_definition279 = null;
 
 
-        Object ID288_tree=null;
-        Object DOT289_tree=null;
-        Object ID290_tree=null;
+        Object id_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_dimension_definition=new RewriteRuleSubtreeStream(adaptor,"rule dimension_definition");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:2: ( ID ( DOT ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:4: ID ( DOT ID )* ( dimension_definition )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:2: (id+= ID (id+= DOT id+= ID )* ( dimension_definition )* -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:4: id+= ID (id+= DOT id+= ID )* ( dimension_definition )*
             {
-            ID288=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_data_type3723); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID288);
+            id=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_data_type4377); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:7: ( DOT ID )*
-            loop92:
+            if (list_id==null) list_id=new ArrayList();
+            list_id.add(id);
+
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:11: (id+= DOT id+= ID )*
+            loop91:
             do {
-                int alt92=2;
-                int LA92_0 = input.LA(1);
+                int alt91=2;
+                int LA91_0 = input.LA(1);
 
-                if ( (LA92_0==DOT) ) {
-                    alt92=1;
+                if ( (LA91_0==DOT) ) {
+                    alt91=1;
                 }
 
 
-                switch (alt92) {
+                switch (alt91) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:9: DOT ID
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:13: id+= DOT id+= ID
             	    {
-            	    DOT289=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_data_type3727); if (failed) return retval;
-            	    if ( backtracking==0 ) stream_DOT.add(DOT289);
+            	    id=(Token)input.LT(1);
+            	    match(input,DOT,FOLLOW_DOT_in_data_type4383); if (failed) return retval;
+            	    if ( backtracking==0 ) stream_DOT.add(id);
 
-            	    ID290=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_data_type3729); if (failed) return retval;
-            	    if ( backtracking==0 ) stream_ID.add(ID290);
+            	    if (list_id==null) list_id=new ArrayList();
+            	    list_id.add(id);
 
+            	    id=(Token)input.LT(1);
+            	    match(input,ID,FOLLOW_ID_in_data_type4387); if (failed) return retval;
+            	    if ( backtracking==0 ) stream_ID.add(id);
 
+            	    if (list_id==null) list_id=new ArrayList();
+            	    list_id.add(id);
+
+
             	    }
             	    break;
 
             	default :
-            	    break loop92;
+            	    break loop91;
                 }
             } while (true);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:19: ( dimension_definition )*
-            loop93:
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:31: ( dimension_definition )*
+            loop92:
             do {
-                int alt93=2;
-                int LA93_0 = input.LA(1);
+                int alt92=2;
+                int LA92_0 = input.LA(1);
 
-                if ( (LA93_0==LEFT_SQUARE) ) {
-                    alt93=1;
+                if ( (LA92_0==LEFT_SQUARE) ) {
+                    alt92=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt92) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:19: dimension_definition
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:31: dimension_definition
             	    {
-            	    pushFollow(FOLLOW_dimension_definition_in_data_type3734);
-            	    dimension_definition291=dimension_definition();
+            	    pushFollow(FOLLOW_dimension_definition_in_data_type4392);
+            	    dimension_definition279=dimension_definition();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition291.getTree());
+            	    if ( backtracking==0 ) stream_dimension_definition.add(dimension_definition279.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop92;
                 }
             } while (true);
 
+            if ( backtracking==0 ) {
+              	emit(list_id, DroolsEditorType.IDENTIFIER);	
+            }
 
             // AST REWRITE
             // elements: dimension_definition, ID
@@ -11788,9 +12272,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 848:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+            // 1171:3: -> ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:6: ^( VT_DATA_TYPE ( ID )+ ( dimension_definition )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1171: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);
@@ -11803,7 +12287,7 @@
 
                 }
                 stream_ID.reset();
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:25: ( dimension_definition )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1171:25: ( dimension_definition )*
                 while ( stream_dimension_definition.hasNext() ) {
                     adaptor.addChild(root_1, stream_dimension_definition.next());
 
@@ -11842,37 +12326,43 @@
     };
 
     // $ANTLR start dimension_definition
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:851:1: dimension_definition : LEFT_SQUARE RIGHT_SQUARE ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1174: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_SQUARE292=null;
-        Token RIGHT_SQUARE293=null;
+        Token LEFT_SQUARE280=null;
+        Token RIGHT_SQUARE281=null;
 
-        Object LEFT_SQUARE292_tree=null;
-        Object RIGHT_SQUARE293_tree=null;
+        Object LEFT_SQUARE280_tree=null;
+        Object RIGHT_SQUARE281_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:852:2: ( LEFT_SQUARE RIGHT_SQUARE )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:852:4: LEFT_SQUARE RIGHT_SQUARE
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1175:2: ( LEFT_SQUARE RIGHT_SQUARE )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1175:4: LEFT_SQUARE RIGHT_SQUARE
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_SQUARE292=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition3760); if (failed) return retval;
+            LEFT_SQUARE280=(Token)input.LT(1);
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dimension_definition4421); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_SQUARE292_tree = (Object)adaptor.create(LEFT_SQUARE292);
-            adaptor.addChild(root_0, LEFT_SQUARE292_tree);
+            LEFT_SQUARE280_tree = (Object)adaptor.create(LEFT_SQUARE280);
+            adaptor.addChild(root_0, LEFT_SQUARE280_tree);
             }
-            RIGHT_SQUARE293=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition3762); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_SQUARE293_tree = (Object)adaptor.create(RIGHT_SQUARE293);
-            adaptor.addChild(root_0, RIGHT_SQUARE293_tree);
+              	emit(LEFT_SQUARE280, DroolsEditorType.SYMBOL);	
             }
+            RIGHT_SQUARE281=(Token)input.LT(1);
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dimension_definition4428); if (failed) return retval;
+            if ( backtracking==0 ) {
+            RIGHT_SQUARE281_tree = (Object)adaptor.create(RIGHT_SQUARE281);
+            adaptor.addChild(root_0, RIGHT_SQUARE281_tree);
+            }
+            if ( backtracking==0 ) {
+              	emit(RIGHT_SQUARE281, DroolsEditorType.SYMBOL);	
+            }
 
             }
 
@@ -11899,61 +12389,64 @@
     };
 
     // $ANTLR start accessor_path
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:855:1: accessor_path : accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1179: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 DOT295=null;
-        accessor_element_return accessor_element294 = null;
+        Token DOT283=null;
+        accessor_element_return accessor_element282 = null;
 
-        accessor_element_return accessor_element296 = null;
+        accessor_element_return accessor_element284 = null;
 
 
-        Object DOT295_tree=null;
+        Object DOT283_tree=null;
         RewriteRuleTokenStream stream_DOT=new RewriteRuleTokenStream(adaptor,"token DOT");
         RewriteRuleSubtreeStream stream_accessor_element=new RewriteRuleSubtreeStream(adaptor,"rule accessor_element");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:2: ( accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:4: accessor_element ( DOT accessor_element )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:2: ( accessor_element ( DOT accessor_element )* -> ^( VT_ACCESSOR_PATH ( accessor_element )+ ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:4: accessor_element ( DOT accessor_element )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path3773);
-            accessor_element294=accessor_element();
+            pushFollow(FOLLOW_accessor_element_in_accessor_path4442);
+            accessor_element282=accessor_element();
             _fsp--;
             if (failed) return retval;
-            if ( backtracking==0 ) stream_accessor_element.add(accessor_element294.getTree());
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:21: ( DOT accessor_element )*
-            loop94:
+            if ( backtracking==0 ) stream_accessor_element.add(accessor_element282.getTree());
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:21: ( DOT accessor_element )*
+            loop93:
             do {
-                int alt94=2;
-                int LA94_0 = input.LA(1);
+                int alt93=2;
+                int LA93_0 = input.LA(1);
 
-                if ( (LA94_0==DOT) ) {
-                    alt94=1;
+                if ( (LA93_0==DOT) ) {
+                    alt93=1;
                 }
 
 
-                switch (alt94) {
+                switch (alt93) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:23: DOT accessor_element
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180:23: DOT accessor_element
             	    {
-            	    DOT295=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path3777); if (failed) return retval;
-            	    if ( backtracking==0 ) stream_DOT.add(DOT295);
+            	    DOT283=(Token)input.LT(1);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4446); if (failed) return retval;
+            	    if ( backtracking==0 ) stream_DOT.add(DOT283);
 
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path3779);
-            	    accessor_element296=accessor_element();
+            	    if ( backtracking==0 ) {
+            	      	emit(DOT283, DroolsEditorType.IDENTIFIER);	
+            	    }
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4450);
+            	    accessor_element284=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element296.getTree());
+            	    if ( backtracking==0 ) stream_accessor_element.add(accessor_element284.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop94;
+            	    break loop93;
                 }
             } while (true);
 
@@ -11969,9 +12462,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 857:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+            // 1181:2: -> ^( VT_ACCESSOR_PATH ( accessor_element )+ )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:5: ^( VT_ACCESSOR_PATH ( accessor_element )+ )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1181: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);
@@ -12017,54 +12510,57 @@
     };
 
     // $ANTLR start accessor_element
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:860:1: accessor_element : ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1184: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 ID297=null;
-        square_chunk_return square_chunk298 = null;
+        Token ID285=null;
+        square_chunk_return square_chunk286 = null;
 
 
-        Object ID297_tree=null;
+        Object ID285_tree=null;
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
         RewriteRuleSubtreeStream stream_square_chunk=new RewriteRuleSubtreeStream(adaptor,"rule square_chunk");
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:861:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:861:4: ID ( square_chunk )*
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1185:2: ( ID ( square_chunk )* -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1185:4: ID ( square_chunk )*
             {
-            ID297=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accessor_element3803); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID297);
+            ID285=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_accessor_element4474); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(ID285);
 
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:861:7: ( square_chunk )*
-            loop95:
+            if ( backtracking==0 ) {
+              	emit(ID285, DroolsEditorType.IDENTIFIER);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1186:3: ( square_chunk )*
+            loop94:
             do {
-                int alt95=2;
-                int LA95_0 = input.LA(1);
+                int alt94=2;
+                int LA94_0 = input.LA(1);
 
-                if ( (LA95_0==LEFT_SQUARE) ) {
-                    alt95=1;
+                if ( (LA94_0==LEFT_SQUARE) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt95) {
+                switch (alt94) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:861:7: square_chunk
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1186:3: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element3805);
-            	    square_chunk298=square_chunk();
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4480);
+            	    square_chunk286=square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk298.getTree());
+            	    if ( backtracking==0 ) stream_square_chunk.add(square_chunk286.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop95;
+            	    break loop94;
                 }
             } while (true);
 
@@ -12080,15 +12576,15 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 862:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+            // 1187:2: -> ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
             {
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:5: ^( VT_ACCESSOR_ELEMENT ID ( square_chunk )* )
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1187: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());
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:30: ( square_chunk )*
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1187:30: ( square_chunk )*
                 while ( stream_square_chunk.hasNext() ) {
                     adaptor.addChild(root_1, stream_square_chunk.next());
 
@@ -12127,7 +12623,7 @@
     };
 
     // $ANTLR start rhs_chunk
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:1: rhs_chunk : rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1190: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);
@@ -12142,10 +12638,10 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:868:3: (rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:868:5: rc= rhs_chunk_data
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1193:3: (rc= rhs_chunk_data -> VT_RHS_CHUNK[$rc.start,text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1193:5: rc= rhs_chunk_data
             {
-            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk3834);
+            pushFollow(FOLLOW_rhs_chunk_data_in_rhs_chunk4509);
             rc=rhs_chunk_data();
             _fsp--;
             if (failed) return retval;
@@ -12165,7 +12661,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 869:2: -> VT_RHS_CHUNK[$rc.start,text]
+            // 1194:2: -> VT_RHS_CHUNK[$rc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_RHS_CHUNK, ((Token)rc.start), text));
 
@@ -12198,94 +12694,106 @@
     };
 
     // $ANTLR start rhs_chunk_data
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:872:1: rhs_chunk_data : THEN (~ END )* END ( SEMICOLON )? ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1197: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);
 
         Object root_0 = null;
 
-        Token THEN299=null;
-        Token set300=null;
-        Token END301=null;
-        Token SEMICOLON302=null;
+        Token any=null;
+        Token end1=null;
+        Token THEN287=null;
+        Token SEMICOLON288=null;
 
-        Object THEN299_tree=null;
-        Object set300_tree=null;
-        Object END301_tree=null;
-        Object SEMICOLON302_tree=null;
+        Object any_tree=null;
+        Object end1_tree=null;
+        Object THEN287_tree=null;
+        Object SEMICOLON288_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:2: ( THEN (~ END )* END ( SEMICOLON )? )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:4: THEN (~ END )* END ( SEMICOLON )?
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1198:2: ( THEN (any=~ END )* end1= END ( SEMICOLON )? )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1198:4: THEN (any=~ END )* end1= END ( SEMICOLON )?
             {
             root_0 = (Object)adaptor.nil();
 
-            THEN299=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data3853); if (failed) return retval;
+            THEN287=(Token)input.LT(1);
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk_data4528); if (failed) return retval;
             if ( backtracking==0 ) {
-            THEN299_tree = (Object)adaptor.create(THEN299);
-            adaptor.addChild(root_0, THEN299_tree);
+            THEN287_tree = (Object)adaptor.create(THEN287);
+            adaptor.addChild(root_0, THEN287_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:9: (~ END )*
-            loop96:
+            if ( backtracking==0 ) {
+              	if (THEN287.getText().equalsIgnoreCase("then")){
+              			emit(THEN287, DroolsEditorType.KEYWORD);
+              			emit(Location.LOCATION_RHS);
+              		}	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1203:4: (any=~ END )*
+            loop95:
             do {
-                int alt96=2;
-                int LA96_0 = input.LA(1);
+                int alt95=2;
+                int LA95_0 = input.LA(1);
 
-                if ( ((LA96_0>=VT_COMPILATION_UNIT && LA96_0<=DOT_STAR)||(LA96_0>=STRING && LA96_0<=MULTI_LINE_COMMENT)) ) {
-                    alt96=1;
+                if ( ((LA95_0>=VT_COMPILATION_UNIT && LA95_0<=DOT_STAR)||(LA95_0>=STRING && LA95_0<=MULTI_LINE_COMMENT)) ) {
+                    alt95=1;
                 }
 
 
-                switch (alt96) {
+                switch (alt95) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:11: ~ END
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1203:6: any=~ END
             	    {
-            	    set300=(Token)input.LT(1);
+            	    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) ) {
             	        input.consume();
-            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set300));
+            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(any));
             	        errorRecovery=false;failed=false;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data3857);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk_data4541);    throw mse;
             	    }
 
+            	    if ( backtracking==0 ) {
+            	       emit(any, DroolsEditorType.CODE_CHUNK); 
+            	    }
 
             	    }
             	    break;
 
             	default :
-            	    break loop96;
+            	    break loop95;
                 }
             } while (true);
 
-            END301=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk_data3863); if (failed) return retval;
+            end1=(Token)input.LT(1);
+            match(input,END,FOLLOW_END_in_rhs_chunk_data4554); if (failed) return retval;
             if ( backtracking==0 ) {
-            END301_tree = (Object)adaptor.create(END301);
-            adaptor.addChild(root_0, END301_tree);
+            end1_tree = (Object)adaptor.create(end1);
+            adaptor.addChild(root_0, end1_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:23: ( SEMICOLON )?
-            int alt97=2;
-            int LA97_0 = input.LA(1);
+            if ( backtracking==0 ) {
+              	emit(end1, DroolsEditorType.KEYWORD);	
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1205:3: ( SEMICOLON )?
+            int alt96=2;
+            int LA96_0 = input.LA(1);
 
-            if ( (LA97_0==SEMICOLON) ) {
-                alt97=1;
+            if ( (LA96_0==SEMICOLON) ) {
+                alt96=1;
             }
-            switch (alt97) {
+            switch (alt96) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:23: SEMICOLON
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1205:3: SEMICOLON
                     {
-                    SEMICOLON302=(Token)input.LT(1);
-                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data3865); if (failed) return retval;
+                    SEMICOLON288=(Token)input.LT(1);
+                    match(input,SEMICOLON,FOLLOW_SEMICOLON_in_rhs_chunk_data4560); if (failed) return retval;
                     if ( backtracking==0 ) {
-                    SEMICOLON302_tree = (Object)adaptor.create(SEMICOLON302);
-                    adaptor.addChild(root_0, SEMICOLON302_tree);
+                    SEMICOLON288_tree = (Object)adaptor.create(SEMICOLON288);
+                    adaptor.addChild(root_0, SEMICOLON288_tree);
                     }
 
                     }
@@ -12293,6 +12801,9 @@
 
             }
 
+            if ( backtracking==0 ) {
+              	emit(SEMICOLON288, DroolsEditorType.KEYWORD);	
+            }
 
             }
 
@@ -12319,7 +12830,7 @@
     };
 
     // $ANTLR start curly_chunk
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:876:1: curly_chunk : cc= curly_chunk_data -> VT_CURLY_CHUNK[$cc.start,text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1208: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);
@@ -12334,11 +12845,11 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:879:3: (cc= curly_chunk_data -> VT_CURLY_CHUNK[$cc.start,text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:879:5: cc= curly_chunk_data
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1211:3: (cc= curly_chunk_data[false] -> VT_CURLY_CHUNK[$cc.start,text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1211:5: cc= curly_chunk_data[false]
             {
-            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk3882);
-            cc=curly_chunk_data();
+            pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk4579);
+            cc=curly_chunk_data(false);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_curly_chunk_data.add(cc.getTree());
@@ -12357,7 +12868,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 880:2: -> VT_CURLY_CHUNK[$cc.start,text]
+            // 1212:2: -> VT_CURLY_CHUNK[$cc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_CURLY_CHUNK, ((Token)cc.start), text));
 
@@ -12390,92 +12901,111 @@
     };
 
     // $ANTLR start curly_chunk_data
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:883:1: curly_chunk_data : LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data )* RIGHT_CURLY ;
-    public final curly_chunk_data_return curly_chunk_data() throws RecognitionException {
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1215: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);
 
         Object root_0 = null;
 
-        Token LEFT_CURLY303=null;
-        Token set304=null;
-        Token RIGHT_CURLY306=null;
-        curly_chunk_data_return curly_chunk_data305 = null;
+        Token lc1=null;
+        Token any=null;
+        Token rc1=null;
+        curly_chunk_data_return curly_chunk_data289 = null;
 
 
-        Object LEFT_CURLY303_tree=null;
-        Object set304_tree=null;
-        Object RIGHT_CURLY306_tree=null;
+        Object lc1_tree=null;
+        Object any_tree=null;
+        Object rc1_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data )* RIGHT_CURLY )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:4: LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data )* RIGHT_CURLY
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1216:2: (lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1216:4: lc1= LEFT_CURLY (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )* rc1= RIGHT_CURLY
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_CURLY303=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk_data3901); if (failed) return retval;
+            lc1=(Token)input.LT(1);
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk_data4602); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_CURLY303_tree = (Object)adaptor.create(LEFT_CURLY303);
-            adaptor.addChild(root_0, LEFT_CURLY303_tree);
+            lc1_tree = (Object)adaptor.create(lc1);
+            adaptor.addChild(root_0, lc1_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:15: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data )*
-            loop98:
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(lc1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(lc1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1223:4: (any=~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data[true] )*
+            loop97:
             do {
-                int alt98=3;
-                int LA98_0 = input.LA(1);
+                int alt97=3;
+                int LA97_0 = input.LA(1);
 
-                if ( ((LA98_0>=VT_COMPILATION_UNIT && LA98_0<=THEN)||(LA98_0>=MISC && LA98_0<=MULTI_LINE_COMMENT)) ) {
-                    alt98=1;
+                if ( ((LA97_0>=VT_COMPILATION_UNIT && LA97_0<=THEN)||(LA97_0>=MISC && LA97_0<=MULTI_LINE_COMMENT)) ) {
+                    alt97=1;
                 }
-                else if ( (LA98_0==LEFT_CURLY) ) {
-                    alt98=2;
+                else if ( (LA97_0==LEFT_CURLY) ) {
+                    alt97=2;
                 }
 
 
-                switch (alt98) {
+                switch (alt97) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1223:5: any=~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
-            	    set304=(Token)input.LT(1);
+            	    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) ) {
             	        input.consume();
-            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set304));
+            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(any));
             	        errorRecovery=false;failed=false;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data3904);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk_data4614);    throw mse;
             	    }
 
+            	    if ( backtracking==0 ) {
+            	       emit(any, DroolsEditorType.CODE_CHUNK); 
+            	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:49: curly_chunk_data
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1223:87: curly_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data3918);
-            	    curly_chunk_data305=curly_chunk_data();
+            	    pushFollow(FOLLOW_curly_chunk_data_in_curly_chunk_data4630);
+            	    curly_chunk_data289=curly_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data305.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, curly_chunk_data289.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop98;
+            	    break loop97;
                 }
             } while (true);
 
-            RIGHT_CURLY306=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data3923); if (failed) return retval;
+            rc1=(Token)input.LT(1);
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk_data4641); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_CURLY306_tree = (Object)adaptor.create(RIGHT_CURLY306);
-            adaptor.addChild(root_0, RIGHT_CURLY306_tree);
+            rc1_tree = (Object)adaptor.create(rc1);
+            adaptor.addChild(root_0, rc1_tree);
             }
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(rc1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(rc1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
 
             }
 
@@ -12502,7 +13032,7 @@
     };
 
     // $ANTLR start paren_chunk
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:887:1: paren_chunk : pc= paren_chunk_data -> VT_PAREN_CHUNK[$pc.start,text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1233: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);
@@ -12517,11 +13047,11 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:890:3: (pc= paren_chunk_data -> VT_PAREN_CHUNK[$pc.start,text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:890:5: pc= paren_chunk_data
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:3: (pc= paren_chunk_data[false] -> VT_PAREN_CHUNK[$pc.start,text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:5: pc= paren_chunk_data[false]
             {
-            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk3939);
-            pc=paren_chunk_data();
+            pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk4662);
+            pc=paren_chunk_data(false);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_paren_chunk_data.add(pc.getTree());
@@ -12540,7 +13070,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 891:2: -> VT_PAREN_CHUNK[$pc.start,text]
+            // 1237:2: -> VT_PAREN_CHUNK[$pc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_PAREN_CHUNK, ((Token)pc.start), text));
 
@@ -12573,92 +13103,111 @@
     };
 
     // $ANTLR start paren_chunk_data
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:894:1: paren_chunk_data : LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data )* RIGHT_PAREN ;
-    public final paren_chunk_data_return paren_chunk_data() throws RecognitionException {
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1240: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);
 
         Object root_0 = null;
 
-        Token LEFT_PAREN307=null;
-        Token set308=null;
-        Token RIGHT_PAREN310=null;
-        paren_chunk_data_return paren_chunk_data309 = null;
+        Token lp1=null;
+        Token any=null;
+        Token rp1=null;
+        paren_chunk_data_return paren_chunk_data290 = null;
 
 
-        Object LEFT_PAREN307_tree=null;
-        Object set308_tree=null;
-        Object RIGHT_PAREN310_tree=null;
+        Object lp1_tree=null;
+        Object any_tree=null;
+        Object rp1_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data )* RIGHT_PAREN )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895:4: LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data )* RIGHT_PAREN
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1241:2: (lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1241:4: lp1= LEFT_PAREN (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )* rp1= RIGHT_PAREN
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_PAREN307=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk_data3959); if (failed) return retval;
+            lp1=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk_data4686); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_PAREN307_tree = (Object)adaptor.create(LEFT_PAREN307);
-            adaptor.addChild(root_0, LEFT_PAREN307_tree);
+            lp1_tree = (Object)adaptor.create(lp1);
+            adaptor.addChild(root_0, lp1_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895:15: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data )*
-            loop99:
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(lp1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(lp1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1248:4: (any=~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data[true] )*
+            loop98:
             do {
-                int alt99=3;
-                int LA99_0 = input.LA(1);
+                int alt98=3;
+                int LA98_0 = input.LA(1);
 
-                if ( ((LA99_0>=VT_COMPILATION_UNIT && LA99_0<=STRING)||LA99_0==COMMA||(LA99_0>=AT && LA99_0<=MULTI_LINE_COMMENT)) ) {
-                    alt99=1;
+                if ( ((LA98_0>=VT_COMPILATION_UNIT && LA98_0<=STRING)||LA98_0==COMMA||(LA98_0>=AT && LA98_0<=MULTI_LINE_COMMENT)) ) {
+                    alt98=1;
                 }
-                else if ( (LA99_0==LEFT_PAREN) ) {
-                    alt99=2;
+                else if ( (LA98_0==LEFT_PAREN) ) {
+                    alt98=2;
                 }
 
 
-                switch (alt99) {
+                switch (alt98) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895:16: ~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1248:5: any=~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
-            	    set308=(Token)input.LT(1);
+            	    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) ) {
             	        input.consume();
-            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set308));
+            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(any));
             	        errorRecovery=false;failed=false;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data3962);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk_data4698);    throw mse;
             	    }
 
+            	    if ( backtracking==0 ) {
+            	       emit(any, DroolsEditorType.CODE_CHUNK); 
+            	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:895:49: paren_chunk_data
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1248:87: paren_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data3976);
-            	    paren_chunk_data309=paren_chunk_data();
+            	    pushFollow(FOLLOW_paren_chunk_data_in_paren_chunk_data4714);
+            	    paren_chunk_data290=paren_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data309.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, paren_chunk_data290.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop99;
+            	    break loop98;
                 }
             } while (true);
 
-            RIGHT_PAREN310=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data3981); if (failed) return retval;
+            rp1=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk_data4725); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_PAREN310_tree = (Object)adaptor.create(RIGHT_PAREN310);
-            adaptor.addChild(root_0, RIGHT_PAREN310_tree);
+            rp1_tree = (Object)adaptor.create(rp1);
+            adaptor.addChild(root_0, rp1_tree);
             }
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(rp1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(rp1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
 
             }
 
@@ -12685,7 +13234,7 @@
     };
 
     // $ANTLR start square_chunk
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:898:1: square_chunk : sc= square_chunk_data -> VT_SQUARE_CHUNK[$sc.start,text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1258: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);
@@ -12700,11 +13249,11 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:901:3: (sc= square_chunk_data -> VT_SQUARE_CHUNK[$sc.start,text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:901:5: sc= square_chunk_data
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1261:3: (sc= square_chunk_data[false] -> VT_SQUARE_CHUNK[$sc.start,text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1261:5: sc= square_chunk_data[false]
             {
-            pushFollow(FOLLOW_square_chunk_data_in_square_chunk3998);
-            sc=square_chunk_data();
+            pushFollow(FOLLOW_square_chunk_data_in_square_chunk4746);
+            sc=square_chunk_data(false);
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_square_chunk_data.add(sc.getTree());
@@ -12723,7 +13272,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 902:2: -> VT_SQUARE_CHUNK[$sc.start,text]
+            // 1262:2: -> VT_SQUARE_CHUNK[$sc.start,text]
             {
                 adaptor.addChild(root_0, adaptor.create(VT_SQUARE_CHUNK, ((Token)sc.start), text));
 
@@ -12756,92 +13305,111 @@
     };
 
     // $ANTLR start square_chunk_data
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:905:1: square_chunk_data : LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data )* RIGHT_SQUARE ;
-    public final square_chunk_data_return square_chunk_data() throws RecognitionException {
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1265: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);
 
         Object root_0 = null;
 
-        Token LEFT_SQUARE311=null;
-        Token set312=null;
-        Token RIGHT_SQUARE314=null;
-        square_chunk_data_return square_chunk_data313 = null;
+        Token ls1=null;
+        Token any=null;
+        Token rs1=null;
+        square_chunk_data_return square_chunk_data291 = null;
 
 
-        Object LEFT_SQUARE311_tree=null;
-        Object set312_tree=null;
-        Object RIGHT_SQUARE314_tree=null;
+        Object ls1_tree=null;
+        Object any_tree=null;
+        Object rs1_tree=null;
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:906:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data )* RIGHT_SQUARE )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:906:4: LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data )* RIGHT_SQUARE
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:2: (ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:4: ls1= LEFT_SQUARE (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )* rs1= RIGHT_SQUARE
             {
             root_0 = (Object)adaptor.nil();
 
-            LEFT_SQUARE311=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk_data4017); if (failed) return retval;
+            ls1=(Token)input.LT(1);
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk_data4769); if (failed) return retval;
             if ( backtracking==0 ) {
-            LEFT_SQUARE311_tree = (Object)adaptor.create(LEFT_SQUARE311);
-            adaptor.addChild(root_0, LEFT_SQUARE311_tree);
+            ls1_tree = (Object)adaptor.create(ls1);
+            adaptor.addChild(root_0, ls1_tree);
             }
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:906:16: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data )*
-            loop100:
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(ls1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(ls1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1273:4: (any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data[true] )*
+            loop99:
             do {
-                int alt100=3;
-                int LA100_0 = input.LA(1);
+                int alt99=3;
+                int LA99_0 = input.LA(1);
 
-                if ( ((LA100_0>=VT_COMPILATION_UNIT && LA100_0<=NULL)||(LA100_0>=THEN && LA100_0<=MULTI_LINE_COMMENT)) ) {
-                    alt100=1;
+                if ( ((LA99_0>=VT_COMPILATION_UNIT && LA99_0<=NULL)||(LA99_0>=THEN && LA99_0<=MULTI_LINE_COMMENT)) ) {
+                    alt99=1;
                 }
-                else if ( (LA100_0==LEFT_SQUARE) ) {
-                    alt100=2;
+                else if ( (LA99_0==LEFT_SQUARE) ) {
+                    alt99=2;
                 }
 
 
-                switch (alt100) {
+                switch (alt99) {
             	case 1 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:906:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1273:5: any=~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
-            	    set312=(Token)input.LT(1);
+            	    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) ) {
             	        input.consume();
-            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set312));
+            	        if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(any));
             	        errorRecovery=false;failed=false;
             	    }
             	    else {
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4020);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk_data4781);    throw mse;
             	    }
 
+            	    if ( backtracking==0 ) {
+            	       emit(any, DroolsEditorType.CODE_CHUNK); 
+            	    }
 
             	    }
             	    break;
             	case 2 :
-            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:906:52: square_chunk_data
+            	    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1273:88: square_chunk_data[true]
             	    {
-            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4034);
-            	    square_chunk_data313=square_chunk_data();
+            	    pushFollow(FOLLOW_square_chunk_data_in_square_chunk_data4796);
+            	    square_chunk_data291=square_chunk_data(true);
             	    _fsp--;
             	    if (failed) return retval;
-            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data313.getTree());
+            	    if ( backtracking==0 ) adaptor.addChild(root_0, square_chunk_data291.getTree());
 
             	    }
             	    break;
 
             	default :
-            	    break loop100;
+            	    break loop99;
                 }
             } while (true);
 
-            RIGHT_SQUARE314=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4039); if (failed) return retval;
+            rs1=(Token)input.LT(1);
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk_data4807); if (failed) return retval;
             if ( backtracking==0 ) {
-            RIGHT_SQUARE314_tree = (Object)adaptor.create(RIGHT_SQUARE314);
-            adaptor.addChild(root_0, RIGHT_SQUARE314_tree);
+            rs1_tree = (Object)adaptor.create(rs1);
+            adaptor.addChild(root_0, rs1_tree);
             }
+            if ( backtracking==0 ) {
+              	if (!isRecursive) {
+              				emit(rs1, DroolsEditorType.SYMBOL);
+              			} else {
+              				emit(rs1, DroolsEditorType.CODE_CHUNK);
+              			}	
+              		
+            }
 
             }
 
@@ -12862,26 +13430,30 @@
     }
     // $ANTLR end square_chunk_data
 
-    public static class date_effective_key_return extends ParserRuleReturnScope {
+    public static class lock_on_active_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start date_effective_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:910:1: date_effective_key : {...}? => ID MISC 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();
+    // $ANTLR start lock_on_active_key
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1283: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);
 
         Object root_0 = null;
 
-        Token ID315=null;
-        Token MISC316=null;
-        Token ID317=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
+        Token mis2=null;
+        Token id3=null;
 
-        Object ID315_tree=null;
-        Object MISC316_tree=null;
-        Object ID317_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
+        Object mis2_tree=null;
+        Object id3_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -12889,28 +13461,43 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:913:3: ({...}? => ID MISC ID -> VK_DATE_EFFECTIVE[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:913:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1286:3: ({...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID -> VK_LOCK_ON_ACTIVE[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1286:5: {...}? =>id1= ID mis1= MISC id2= ID mis2= MISC id3= ID
             {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {
+            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, "date_effective_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))");
+                throw new FailedPredicateException(input, "lock_on_active_key", "(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, \"-\") && validateLT(5, DroolsSoftKeywords.ACTIVE))");
             }
-            ID315=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_effective_key4058); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID315);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4831); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC316=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_effective_key4060); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC316);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4835); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID317=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_effective_key4062); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID317);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_lock_on_active_key4839); 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_key4843); 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_key4847); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id3);
+
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);
+              		emit(mis2, DroolsEditorType.KEYWORD);
+              		emit(id3, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -12923,9 +13510,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 914:2: -> VK_DATE_EFFECTIVE[$start, text]
+            // 1292:3: -> VK_LOCK_ON_ACTIVE[$start, text]
             {
-                adaptor.addChild(root_0, adaptor.create(VK_DATE_EFFECTIVE, ((Token)retval.start),  text));
+                adaptor.addChild(root_0, adaptor.create(VK_LOCK_ON_ACTIVE, ((Token)retval.start),  text));
 
             }
 
@@ -12948,28 +13535,28 @@
         }
         return retval;
     }
-    // $ANTLR end date_effective_key
+    // $ANTLR end lock_on_active_key
 
-    public static class date_expires_key_return extends ParserRuleReturnScope {
+    public static class date_effective_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start date_expires_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:917:1: date_expires_key : {...}? => ID MISC 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();
+    // $ANTLR start date_effective_key
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295: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);
 
         Object root_0 = null;
 
-        Token ID318=null;
-        Token MISC319=null;
-        Token ID320=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID318_tree=null;
-        Object MISC319_tree=null;
-        Object ID320_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -12977,28 +13564,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:920:3: ({...}? => ID MISC ID -> VK_DATE_EXPIRES[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:920:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1298:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EFFECTIVE[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1298:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {
+            if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))) ) {
                 if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "date_expires_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EXPIRES))");
+                throw new FailedPredicateException(input, "date_effective_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))");
             }
-            ID318=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_expires_key4088); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID318);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_date_effective_key4879); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC319=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_date_expires_key4090); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC319);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_date_effective_key4883); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID320=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_date_expires_key4092); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID320);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_date_effective_key4887); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13011,9 +13603,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 921:2: -> VK_DATE_EXPIRES[$start, text]
+            // 1302:3: -> VK_DATE_EFFECTIVE[$start, text]
             {
-                adaptor.addChild(root_0, adaptor.create(VK_DATE_EXPIRES, ((Token)retval.start),  text));
+                adaptor.addChild(root_0, adaptor.create(VK_DATE_EFFECTIVE, ((Token)retval.start),  text));
 
             }
 
@@ -13036,32 +13628,28 @@
         }
         return retval;
     }
-    // $ANTLR end date_expires_key
+    // $ANTLR end date_effective_key
 
-    public static class lock_on_active_key_return extends ParserRuleReturnScope {
+    public static class date_expires_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
-    // $ANTLR start lock_on_active_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:924:1: lock_on_active_key : {...}? => ID MISC ID MISC 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();
+    // $ANTLR start date_expires_key
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1305: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);
 
         Object root_0 = null;
 
-        Token ID321=null;
-        Token MISC322=null;
-        Token ID323=null;
-        Token MISC324=null;
-        Token ID325=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID321_tree=null;
-        Object MISC322_tree=null;
-        Object ID323_tree=null;
-        Object MISC324_tree=null;
-        Object ID325_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13069,36 +13657,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:3: ({...}? => ID MISC ID MISC ID -> VK_LOCK_ON_ACTIVE[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:927:5: {...}? => ID MISC ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1308:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_DATE_EXPIRES[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1308:5: {...}? =>id1= ID mis1= MISC id2= ID
             {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))) ) {
+            if ( !((validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))) ) {
                 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))");
+                throw new FailedPredicateException(input, "date_expires_key", "(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, \"-\") && validateLT(3, DroolsSoftKeywords.EXPIRES))");
             }
-            ID321=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4118); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID321);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_date_expires_key4919); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC322=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4120); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC322);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_date_expires_key4923); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID323=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4122); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID323);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_date_expires_key4927); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
-            MISC324=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_lock_on_active_key4124); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC324);
-
-            ID325=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_lock_on_active_key4126); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID325);
-
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13111,9 +13696,9 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 928:2: -> VK_LOCK_ON_ACTIVE[$start, text]
+            // 1312:3: -> VK_DATE_EXPIRES[$start, text]
             {
-                adaptor.addChild(root_0, adaptor.create(VK_LOCK_ON_ACTIVE, ((Token)retval.start),  text));
+                adaptor.addChild(root_0, adaptor.create(VK_DATE_EXPIRES, ((Token)retval.start),  text));
 
             }
 
@@ -13136,7 +13721,7 @@
         }
         return retval;
     }
-    // $ANTLR end lock_on_active_key
+    // $ANTLR end date_expires_key
 
     public static class no_loop_key_return extends ParserRuleReturnScope {
         Object tree;
@@ -13144,20 +13729,20 @@
     };
 
     // $ANTLR start no_loop_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:931:1: no_loop_key : {...}? => ID MISC ID -> VK_NO_LOOP[$start, text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1315: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);
 
         Object root_0 = null;
 
-        Token ID326=null;
-        Token MISC327=null;
-        Token ID328=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID326_tree=null;
-        Object MISC327_tree=null;
-        Object ID328_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13165,28 +13750,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:934:3: ({...}? => ID MISC ID -> VK_NO_LOOP[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:934:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1318:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_NO_LOOP[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1318: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))");
             }
-            ID326=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_no_loop_key4152); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID326);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_no_loop_key4959); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC327=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_no_loop_key4154); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC327);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_no_loop_key4963); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID328=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_no_loop_key4156); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID328);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_no_loop_key4967); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13199,7 +13789,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 935:2: -> VK_NO_LOOP[$start, text]
+            // 1322:3: -> VK_NO_LOOP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NO_LOOP, ((Token)retval.start),  text));
 
@@ -13232,20 +13822,20 @@
     };
 
     // $ANTLR start auto_focus_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:938:1: auto_focus_key : {...}? => ID MISC ID -> VK_AUTO_FOCUS[$start, text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1325: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);
 
         Object root_0 = null;
 
-        Token ID329=null;
-        Token MISC330=null;
-        Token ID331=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID329_tree=null;
-        Object MISC330_tree=null;
-        Object ID331_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13253,28 +13843,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:941:3: ({...}? => ID MISC ID -> VK_AUTO_FOCUS[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:941:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1328:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AUTO_FOCUS[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1328: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))");
             }
-            ID329=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_auto_focus_key4182); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID329);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_auto_focus_key4999); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC330=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_auto_focus_key4184); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC330);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_auto_focus_key5003); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID331=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_auto_focus_key4186); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID331);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_auto_focus_key5007); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13287,7 +13882,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 942:2: -> VK_AUTO_FOCUS[$start, text]
+            // 1332:3: -> VK_AUTO_FOCUS[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AUTO_FOCUS, ((Token)retval.start),  text));
 
@@ -13320,20 +13915,20 @@
     };
 
     // $ANTLR start activation_group_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:945:1: activation_group_key : {...}? => ID MISC ID -> VK_ACTIVATION_GROUP[$start, text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1335: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);
 
         Object root_0 = null;
 
-        Token ID332=null;
-        Token MISC333=null;
-        Token ID334=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID332_tree=null;
-        Object MISC333_tree=null;
-        Object ID334_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13341,28 +13936,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:3: ({...}? => ID MISC ID -> VK_ACTIVATION_GROUP[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1338:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ACTIVATION_GROUP[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1338: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))");
             }
-            ID332=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_activation_group_key4212); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID332);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_activation_group_key5039); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC333=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_activation_group_key4214); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC333);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_activation_group_key5043); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID334=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_activation_group_key4216); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID334);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_activation_group_key5047); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13375,7 +13975,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 949:2: -> VK_ACTIVATION_GROUP[$start, text]
+            // 1342:3: -> VK_ACTIVATION_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTIVATION_GROUP, ((Token)retval.start),  text));
 
@@ -13408,20 +14008,20 @@
     };
 
     // $ANTLR start agenda_group_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:952:1: agenda_group_key : {...}? => ID MISC ID -> VK_AGENDA_GROUP[$start, text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1345: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);
 
         Object root_0 = null;
 
-        Token ID335=null;
-        Token MISC336=null;
-        Token ID337=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID335_tree=null;
-        Object MISC336_tree=null;
-        Object ID337_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13429,28 +14029,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:955:3: ({...}? => ID MISC ID -> VK_AGENDA_GROUP[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:955:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1348:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_AGENDA_GROUP[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1348: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))");
             }
-            ID335=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_agenda_group_key4242); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID335);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5079); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC336=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_agenda_group_key4244); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC336);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_agenda_group_key5083); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID337=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_agenda_group_key4246); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID337);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_agenda_group_key5087); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13463,7 +14068,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 956:2: -> VK_AGENDA_GROUP[$start, text]
+            // 1352:3: -> VK_AGENDA_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AGENDA_GROUP, ((Token)retval.start),  text));
 
@@ -13496,20 +14101,20 @@
     };
 
     // $ANTLR start ruleflow_group_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:959:1: ruleflow_group_key : {...}? => ID MISC ID -> VK_RULEFLOW_GROUP[$start, text] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1355: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);
 
         Object root_0 = null;
 
-        Token ID338=null;
-        Token MISC339=null;
-        Token ID340=null;
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
 
-        Object ID338_tree=null;
-        Object MISC339_tree=null;
-        Object ID340_tree=null;
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
         RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
@@ -13517,28 +14122,33 @@
         	String text = "";
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:962:3: ({...}? => ID MISC ID -> VK_RULEFLOW_GROUP[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:962:5: {...}? => ID MISC ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1358:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_RULEFLOW_GROUP[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1358: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))");
             }
-            ID338=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_ruleflow_group_key4272); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID338);
+            id1=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5119); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
 
-            MISC339=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key4274); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC339);
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_ruleflow_group_key5123); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
 
-            ID340=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_ruleflow_group_key4276); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID340);
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_ruleflow_group_key5127); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
 
             if ( backtracking==0 ) {
               text = input.toString(retval.start,input.LT(-1));
             }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13551,7 +14161,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 963:2: -> VK_RULEFLOW_GROUP[$start, text]
+            // 1362:3: -> VK_RULEFLOW_GROUP[$start, text]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULEFLOW_GROUP, ((Token)retval.start),  text));
 
@@ -13578,13 +14188,106 @@
     }
     // $ANTLR end ruleflow_group_key
 
+    public static class entry_point_key_return extends ParserRuleReturnScope {
+        Object tree;
+        public Object getTree() { return tree; }
+    };
+
+    // $ANTLR start entry_point_key
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1365: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);
+
+        Object root_0 = null;
+
+        Token id1=null;
+        Token mis1=null;
+        Token id2=null;
+
+        Object id1_tree=null;
+        Object mis1_tree=null;
+        Object id2_tree=null;
+        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
+        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
+
+
+        	String text = "";
+
+        try {
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1368:3: ({...}? =>id1= ID mis1= MISC id2= ID -> VK_ENTRY_POINT[$start, text] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1368: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_key5159); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id1);
+
+            mis1=(Token)input.LT(1);
+            match(input,MISC,FOLLOW_MISC_in_entry_point_key5163); if (failed) return retval;
+            if ( backtracking==0 ) stream_MISC.add(mis1);
+
+            id2=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_entry_point_key5167); if (failed) return retval;
+            if ( backtracking==0 ) stream_ID.add(id2);
+
+            if ( backtracking==0 ) {
+              text = input.toString(retval.start,input.LT(-1));
+            }
+            if ( backtracking==0 ) {
+              	emit(id1, DroolsEditorType.KEYWORD);
+              		emit(mis1, DroolsEditorType.KEYWORD);
+              		emit(id2, 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();
+            // 1372:3: -> VK_ENTRY_POINT[$start, text]
+            {
+                adaptor.addChild(root_0, adaptor.create(VK_ENTRY_POINT, ((Token)retval.start),  text));
+
+            }
+
+            }
+
+            }
+
+            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 entry_point_key
+
     public static class duration_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
     // $ANTLR start duration_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:966:1: duration_key : {...}? =>id= ID -> VK_DURATION[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1375: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);
@@ -13597,17 +14300,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:967:2: ({...}? =>id= ID -> VK_DURATION[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:967:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1376:2: ({...}? =>id= ID -> VK_DURATION[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1376: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_key4301); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_duration_key5196); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13620,7 +14326,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 967:69: -> VK_DURATION[$id]
+            // 1378:3: -> VK_DURATION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DURATION, id));
 
@@ -13653,7 +14359,7 @@
     };
 
     // $ANTLR start package_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:1: package_key : {...}? =>id= ID -> VK_PACKAGE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1381: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);
@@ -13666,17 +14372,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:971:2: ({...}? =>id= ID -> VK_PACKAGE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:971:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1382:2: ({...}? =>id= ID -> VK_PACKAGE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1382: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_key4323); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_package_key5223); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13689,7 +14398,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 971:68: -> VK_PACKAGE[$id]
+            // 1384:3: -> VK_PACKAGE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_PACKAGE, id));
 
@@ -13722,7 +14431,7 @@
     };
 
     // $ANTLR start import_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:974:1: import_key : {...}? =>id= ID -> VK_IMPORT[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1387: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);
@@ -13735,17 +14444,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:975:2: ({...}? =>id= ID -> VK_IMPORT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:975:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1388:2: ({...}? =>id= ID -> VK_IMPORT[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1388: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_key4345); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_import_key5250); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13758,7 +14470,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 975:67: -> VK_IMPORT[$id]
+            // 1390:3: -> VK_IMPORT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IMPORT, id));
 
@@ -13791,7 +14503,7 @@
     };
 
     // $ANTLR start dialect_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:978:1: dialect_key : {...}? =>id= ID -> VK_DIALECT[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1393: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);
@@ -13804,17 +14516,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:2: ({...}? =>id= ID -> VK_DIALECT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1394:2: ({...}? =>id= ID -> VK_DIALECT[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1394: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_key4367); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_dialect_key5277); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13827,7 +14542,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 979:68: -> VK_DIALECT[$id]
+            // 1396:3: -> VK_DIALECT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DIALECT, id));
 
@@ -13860,7 +14575,7 @@
     };
 
     // $ANTLR start salience_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:982:1: salience_key : {...}? =>id= ID -> VK_SALIENCE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1399: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);
@@ -13873,17 +14588,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:983:2: ({...}? =>id= ID -> VK_SALIENCE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:983:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400:2: ({...}? =>id= ID -> VK_SALIENCE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400: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_key4389); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_salience_key5304); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13896,7 +14614,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 983:69: -> VK_SALIENCE[$id]
+            // 1402:3: -> VK_SALIENCE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SALIENCE, id));
 
@@ -13929,7 +14647,7 @@
     };
 
     // $ANTLR start enabled_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:986:1: enabled_key : {...}? =>id= ID -> VK_ENABLED[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1405: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);
@@ -13942,17 +14660,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:987:2: ({...}? =>id= ID -> VK_ENABLED[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:987:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1406:2: ({...}? =>id= ID -> VK_ENABLED[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1406: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_key4411); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_enabled_key5331); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -13965,7 +14686,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 987:68: -> VK_ENABLED[$id]
+            // 1408:3: -> VK_ENABLED[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ENABLED, id));
 
@@ -13998,7 +14719,7 @@
     };
 
     // $ANTLR start attributes_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:990:1: attributes_key : {...}? =>id= ID -> VK_ATTRIBUTES[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411: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);
@@ -14011,17 +14732,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:991:2: ({...}? =>id= ID -> VK_ATTRIBUTES[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:991:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1412:2: ({...}? =>id= ID -> VK_ATTRIBUTES[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1412: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_key4433); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_attributes_key5358); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14034,7 +14758,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 991:71: -> VK_ATTRIBUTES[$id]
+            // 1414:3: -> VK_ATTRIBUTES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ATTRIBUTES, id));
 
@@ -14061,82 +14785,13 @@
     }
     // $ANTLR end attributes_key
 
-    public static class when_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start when_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:994:1: when_key : {...}? =>id= ID -> VK_WHEN[$id] ;
-    public final when_key_return when_key() throws RecognitionException {
-        when_key_return retval = new when_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:995:2: ({...}? =>id= ID -> VK_WHEN[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:995:4: {...}? =>id= ID
-            {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.WHEN))) ) {
-                if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "when_key", "(validateIdentifierKey(DroolsSoftKeywords.WHEN))");
-            }
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_when_key4455); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 995:65: -> VK_WHEN[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_WHEN, 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 when_key
-
     public static class rule_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
     // $ANTLR start rule_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:998:1: rule_key : {...}? =>id= ID -> VK_RULE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1417: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);
@@ -14149,17 +14804,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:2: ({...}? =>id= ID -> VK_RULE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1418:2: ({...}? =>id= ID -> VK_RULE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1418: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_key4477); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_rule_key5385); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14172,7 +14830,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 999:65: -> VK_RULE[$id]
+            // 1420:3: -> VK_RULE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_RULE, id));
 
@@ -14205,7 +14863,7 @@
     };
 
     // $ANTLR start template_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1002:1: template_key : {...}? =>id= ID -> VK_TEMPLATE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1423: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);
@@ -14218,17 +14876,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1003:2: ({...}? =>id= ID -> VK_TEMPLATE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1003:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1424:2: ({...}? =>id= ID -> VK_TEMPLATE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1424: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_key4499); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_template_key5412); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14241,7 +14902,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1003:69: -> VK_TEMPLATE[$id]
+            // 1426:3: -> VK_TEMPLATE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_TEMPLATE, id));
 
@@ -14274,7 +14935,7 @@
     };
 
     // $ANTLR start query_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1006:1: query_key : {...}? =>id= ID -> VK_QUERY[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1429: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);
@@ -14287,17 +14948,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:2: ({...}? =>id= ID -> VK_QUERY[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1430:2: ({...}? =>id= ID -> VK_QUERY[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1430: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_key4521); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_query_key5439); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14310,7 +14974,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1007:66: -> VK_QUERY[$id]
+            // 1432:3: -> VK_QUERY[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_QUERY, id));
 
@@ -14343,7 +15007,7 @@
     };
 
     // $ANTLR start declare_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1010:1: declare_key : {...}? =>id= ID -> VK_DECLARE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1435: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);
@@ -14356,17 +15020,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1011:2: ({...}? =>id= ID -> VK_DECLARE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1011:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436:2: ({...}? =>id= ID -> VK_DECLARE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436: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_key4543); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_declare_key5466); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14379,7 +15046,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1011:68: -> VK_DECLARE[$id]
+            // 1438:3: -> VK_DECLARE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_DECLARE, id));
 
@@ -14412,7 +15079,7 @@
     };
 
     // $ANTLR start function_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:1: function_key : {...}? =>id= ID -> VK_FUNCTION[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1441: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);
@@ -14425,17 +15092,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1015:2: ({...}? =>id= ID -> VK_FUNCTION[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1015:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1442:2: ({...}? =>id= ID -> VK_FUNCTION[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1442: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_key4565); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_function_key5493); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14448,7 +15118,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1015:69: -> VK_FUNCTION[$id]
+            // 1444:3: -> VK_FUNCTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FUNCTION, id));
 
@@ -14481,7 +15151,7 @@
     };
 
     // $ANTLR start global_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1018:1: global_key : {...}? =>id= ID -> VK_GLOBAL[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1447: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);
@@ -14494,17 +15164,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1019:2: ({...}? =>id= ID -> VK_GLOBAL[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1019:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1448:2: ({...}? =>id= ID -> VK_GLOBAL[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1448: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_key4587); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_global_key5520); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14517,7 +15190,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1019:67: -> VK_GLOBAL[$id]
+            // 1450:3: -> VK_GLOBAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_GLOBAL, id));
 
@@ -14550,7 +15223,7 @@
     };
 
     // $ANTLR start eval_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:1: eval_key : {...}? =>id= ID -> VK_EVAL[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1453: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);
@@ -14563,17 +15236,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1023:2: ({...}? =>id= ID -> VK_EVAL[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1023:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1454:2: ({...}? =>id= ID -> VK_EVAL[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1454: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_key4609); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_eval_key5547); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14586,7 +15262,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1023:65: -> VK_EVAL[$id]
+            // 1456:3: -> VK_EVAL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EVAL, id));
 
@@ -14619,7 +15295,7 @@
     };
 
     // $ANTLR start contains_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1026:1: contains_key : {...}? =>id= ID -> VK_CONTAINS[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1459: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);
@@ -14632,17 +15308,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1027:2: ({...}? =>id= ID -> VK_CONTAINS[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1027:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1460:2: ({...}? =>id= ID -> VK_CONTAINS[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1460: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_key4631); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_contains_key5574); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14655,7 +15334,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1027:69: -> VK_CONTAINS[$id]
+            // 1462:3: -> VK_CONTAINS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_CONTAINS, id));
 
@@ -14688,7 +15367,7 @@
     };
 
     // $ANTLR start matches_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1030:1: matches_key : {...}? =>id= ID -> VK_MATCHES[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1465: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);
@@ -14701,17 +15380,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1031:2: ({...}? =>id= ID -> VK_MATCHES[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1031:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:2: ({...}? =>id= ID -> VK_MATCHES[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466: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_key4653); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_matches_key5601); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14724,7 +15406,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1031:68: -> VK_MATCHES[$id]
+            // 1468:3: -> VK_MATCHES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MATCHES, id));
 
@@ -14757,7 +15439,7 @@
     };
 
     // $ANTLR start excludes_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1034:1: excludes_key : {...}? =>id= ID -> VK_EXCLUDES[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1471: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);
@@ -14770,17 +15452,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1035:2: ({...}? =>id= ID -> VK_EXCLUDES[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1035:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1472:2: ({...}? =>id= ID -> VK_EXCLUDES[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1472: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_key4675); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_excludes_key5628); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14793,7 +15478,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1035:69: -> VK_EXCLUDES[$id]
+            // 1474:3: -> VK_EXCLUDES[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXCLUDES, id));
 
@@ -14826,7 +15511,7 @@
     };
 
     // $ANTLR start soundslike_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1038:1: soundslike_key : {...}? =>id= ID -> VK_SOUNDSLIKE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1477: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);
@@ -14839,17 +15524,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1039:2: ({...}? =>id= ID -> VK_SOUNDSLIKE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1039:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1478:2: ({...}? =>id= ID -> VK_SOUNDSLIKE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1478: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_key4697); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_soundslike_key5655); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14862,7 +15550,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1039:71: -> VK_SOUNDSLIKE[$id]
+            // 1480:3: -> VK_SOUNDSLIKE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_SOUNDSLIKE, id));
 
@@ -14895,7 +15583,7 @@
     };
 
     // $ANTLR start memberof_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1042:1: memberof_key : {...}? =>id= ID -> VK_MEMBEROF[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483: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);
@@ -14908,17 +15596,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1043:2: ({...}? =>id= ID -> VK_MEMBEROF[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1043:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1484:2: ({...}? =>id= ID -> VK_MEMBEROF[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1484: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_key4719); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_memberof_key5682); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -14931,7 +15622,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1043:69: -> VK_MEMBEROF[$id]
+            // 1486:3: -> VK_MEMBEROF[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_MEMBEROF, id));
 
@@ -14964,7 +15655,7 @@
     };
 
     // $ANTLR start not_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1046:1: not_key : {...}? =>id= ID -> VK_NOT[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1489: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);
@@ -14977,17 +15668,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1047:2: ({...}? =>id= ID -> VK_NOT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1047:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1490:2: ({...}? =>id= ID -> VK_NOT[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1490: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_key4741); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_not_key5709); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15000,7 +15694,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1047:64: -> VK_NOT[$id]
+            // 1492:3: -> VK_NOT[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_NOT, id));
 
@@ -15033,7 +15727,7 @@
     };
 
     // $ANTLR start in_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1050:1: in_key : {...}? =>id= ID -> VK_IN[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1495: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);
@@ -15046,17 +15740,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1051:2: ({...}? =>id= ID -> VK_IN[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1051:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1496:2: ({...}? =>id= ID -> VK_IN[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1496: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_key4763); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_in_key5736); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15069,7 +15766,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1051:63: -> VK_IN[$id]
+            // 1498:3: -> VK_IN[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_IN, id));
 
@@ -15102,7 +15799,7 @@
     };
 
     // $ANTLR start or_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1054:1: or_key : {...}? =>id= ID -> VK_OR[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1501: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);
@@ -15115,17 +15812,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1055:2: ({...}? =>id= ID -> VK_OR[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1055:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502:2: ({...}? =>id= ID -> VK_OR[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502: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_key4785); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_or_key5763); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15138,7 +15838,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1055:63: -> VK_OR[$id]
+            // 1504:3: -> VK_OR[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_OR, id));
 
@@ -15171,7 +15871,7 @@
     };
 
     // $ANTLR start and_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1058:1: and_key : {...}? =>id= ID -> VK_AND[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507: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);
@@ -15184,17 +15884,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:2: ({...}? =>id= ID -> VK_AND[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:2: ({...}? =>id= ID -> VK_AND[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508: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_key4807); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_and_key5790); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15207,7 +15910,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1059:64: -> VK_AND[$id]
+            // 1510:3: -> VK_AND[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_AND, id));
 
@@ -15240,7 +15943,7 @@
     };
 
     // $ANTLR start exists_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1062:1: exists_key : {...}? =>id= ID -> VK_EXISTS[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1513: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);
@@ -15253,17 +15956,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1063:2: ({...}? =>id= ID -> VK_EXISTS[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1063:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1514:2: ({...}? =>id= ID -> VK_EXISTS[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1514: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_key4829); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_exists_key5817); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15276,7 +15982,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1063:67: -> VK_EXISTS[$id]
+            // 1516:3: -> VK_EXISTS[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_EXISTS, id));
 
@@ -15309,7 +16015,7 @@
     };
 
     // $ANTLR start forall_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1066:1: forall_key : {...}? =>id= ID -> VK_FORALL[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1519: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);
@@ -15322,17 +16028,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1067:2: ({...}? =>id= ID -> VK_FORALL[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1067:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1520:2: ({...}? =>id= ID -> VK_FORALL[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1520: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_key4851); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_forall_key5844); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15345,7 +16054,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1067:67: -> VK_FORALL[$id]
+            // 1522:3: -> VK_FORALL[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_FORALL, id));
 
@@ -15372,308 +16081,13 @@
     }
     // $ANTLR end forall_key
 
-    public static class from_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start from_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1070:1: from_key : {...}? =>id= ID -> VK_FROM[$id] ;
-    public final from_key_return from_key() throws RecognitionException {
-        from_key_return retval = new from_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1071:2: ({...}? =>id= ID -> VK_FROM[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1071:4: {...}? =>id= ID
-            {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.FROM))) ) {
-                if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "from_key", "(validateIdentifierKey(DroolsSoftKeywords.FROM))");
-            }
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_from_key4873); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 1071:65: -> VK_FROM[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_FROM, 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 from_key
-
-    public static class entry_point_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start entry_point_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1074:1: entry_point_key : {...}? => ID MISC 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);
-
-        Object root_0 = null;
-
-        Token ID341=null;
-        Token MISC342=null;
-        Token ID343=null;
-
-        Object ID341_tree=null;
-        Object MISC342_tree=null;
-        Object ID343_tree=null;
-        RewriteRuleTokenStream stream_MISC=new RewriteRuleTokenStream(adaptor,"token MISC");
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-
-
-        	String text = "";
-
-        try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1077:3: ({...}? => ID MISC ID -> VK_ENTRY_POINT[$start, text] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1077:5: {...}? => ID MISC 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))");
-            }
-            ID341=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_entry_point_key4896); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID341);
-
-            MISC342=(Token)input.LT(1);
-            match(input,MISC,FOLLOW_MISC_in_entry_point_key4898); if (failed) return retval;
-            if ( backtracking==0 ) stream_MISC.add(MISC342);
-
-            ID343=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_entry_point_key4900); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(ID343);
-
-            if ( backtracking==0 ) {
-              text = input.toString(retval.start,input.LT(-1));
-            }
-
-            // 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();
-            // 1078:2: -> VK_ENTRY_POINT[$start, text]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_ENTRY_POINT, ((Token)retval.start),  text));
-
-            }
-
-            }
-
-            }
-
-            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 entry_point_key
-
-    public static class accumulate_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start accumulate_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1081:1: accumulate_key : {...}? =>id= ID -> VK_ACCUMULATE[$id] ;
-    public final accumulate_key_return accumulate_key() throws RecognitionException {
-        accumulate_key_return retval = new accumulate_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1082:2: ({...}? =>id= ID -> VK_ACCUMULATE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1082:4: {...}? =>id= ID
-            {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.ACCUMULATE))) ) {
-                if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "accumulate_key", "(validateIdentifierKey(DroolsSoftKeywords.ACCUMULATE))");
-            }
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_accumulate_key4925); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 1082:71: -> VK_ACCUMULATE[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_ACCUMULATE, 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 accumulate_key
-
-    public static class init_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start init_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1085:1: init_key : {...}? =>id= ID -> VK_INIT[$id] ;
-    public final init_key_return init_key() throws RecognitionException {
-        init_key_return retval = new init_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1086:2: ({...}? =>id= ID -> VK_INIT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1086:4: {...}? =>id= ID
-            {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.INIT))) ) {
-                if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "init_key", "(validateIdentifierKey(DroolsSoftKeywords.INIT))");
-            }
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_init_key4947); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 1086:65: -> VK_INIT[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_INIT, 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 init_key
-
     public static class action_key_return extends ParserRuleReturnScope {
         Object tree;
         public Object getTree() { return tree; }
     };
 
     // $ANTLR start action_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1089:1: action_key : {...}? =>id= ID -> VK_ACTION[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1525: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);
@@ -15686,17 +16100,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1090:2: ({...}? =>id= ID -> VK_ACTION[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1090:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526:2: ({...}? =>id= ID -> VK_ACTION[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526: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_key4969); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_action_key5871); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15709,7 +16126,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1090:67: -> VK_ACTION[$id]
+            // 1528:3: -> VK_ACTION[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_ACTION, id));
 
@@ -15742,7 +16159,7 @@
     };
 
     // $ANTLR start reverse_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1093:1: reverse_key : {...}? =>id= ID -> VK_REVERSE[$id] ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1531: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);
@@ -15755,17 +16172,20 @@
         RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094:2: ({...}? =>id= ID -> VK_REVERSE[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094:4: {...}? =>id= ID
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1532:2: ({...}? =>id= ID -> VK_REVERSE[$id] )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1532: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_key4991); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_reverse_key5898); if (failed) return retval;
             if ( backtracking==0 ) stream_ID.add(id);
 
+            if ( backtracking==0 ) {
+              	emit(id, DroolsEditorType.KEYWORD);	
+            }
 
             // AST REWRITE
             // elements: 
@@ -15778,7 +16198,7 @@
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"token retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 1094:68: -> VK_REVERSE[$id]
+            // 1534:3: -> VK_REVERSE[$id]
             {
                 adaptor.addChild(root_0, adaptor.create(VK_REVERSE, id));
 
@@ -15805,151 +16225,13 @@
     }
     // $ANTLR end reverse_key
 
-    public static class result_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start result_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1097: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);
-
-        Object root_0 = null;
-
-        Token id=null;
-
-        Object id_tree=null;
-        RewriteRuleTokenStream stream_ID=new RewriteRuleTokenStream(adaptor,"token ID");
-
-        try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1098:2: ({...}? =>id= ID -> VK_RESULT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1098: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_key5013); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 1098:67: -> VK_RESULT[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_RESULT, 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 result_key
-
-    public static class collect_key_return extends ParserRuleReturnScope {
-        Object tree;
-        public Object getTree() { return tree; }
-    };
-
-    // $ANTLR start collect_key
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1101:1: collect_key : {...}? =>id= ID -> VK_COLLECT[$id] ;
-    public final collect_key_return collect_key() throws RecognitionException {
-        collect_key_return retval = new collect_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 {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1102:2: ({...}? =>id= ID -> VK_COLLECT[$id] )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1102:4: {...}? =>id= ID
-            {
-            if ( !((validateIdentifierKey(DroolsSoftKeywords.COLLECT))) ) {
-                if (backtracking>0) {failed=true; return retval;}
-                throw new FailedPredicateException(input, "collect_key", "(validateIdentifierKey(DroolsSoftKeywords.COLLECT))");
-            }
-            id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_collect_key5035); if (failed) return retval;
-            if ( backtracking==0 ) stream_ID.add(id);
-
-
-            // 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();
-            // 1102:68: -> VK_COLLECT[$id]
-            {
-                adaptor.addChild(root_0, adaptor.create(VK_COLLECT, 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 collect_key
-
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:5: ( LEFT_PAREN or_key )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:6: LEFT_PAREN or_key
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718:5: ( LEFT_PAREN or_key )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718:6: LEFT_PAREN or_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred11852); if (failed) return ;
-        pushFollow(FOLLOW_or_key_in_synpred11854);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred12007); if (failed) return ;
+        pushFollow(FOLLOW_or_key_in_synpred12009);
         or_key();
         _fsp--;
         if (failed) return ;
@@ -15960,28 +16242,28 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:5: ( or_key | DOUBLE_PIPE )
-        int alt101=2;
-        int LA101_0 = input.LA(1);
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:5: ( or_key | DOUBLE_PIPE )
+        int alt100=2;
+        int LA100_0 = input.LA(1);
 
-        if ( (LA101_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
-            alt101=1;
+        if ( (LA100_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.OR)))) {
+            alt100=1;
         }
-        else if ( (LA101_0==DOUBLE_PIPE) ) {
-            alt101=2;
+        else if ( (LA100_0==DOUBLE_PIPE) ) {
+            alt100=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("573:5: synpred2 : ( or_key | DOUBLE_PIPE );", 101, 0, input);
+                new NoViableAltException("726:5: synpred2 : ( or_key | DOUBLE_PIPE );", 100, 0, input);
 
             throw nvae;
         }
-        switch (alt101) {
+        switch (alt100) {
             case 1 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:6: or_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:6: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred21901);
+                pushFollow(FOLLOW_or_key_in_synpred22076);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -15989,9 +16271,9 @@
                 }
                 break;
             case 2 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:573:13: DOUBLE_PIPE
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:13: DOUBLE_PIPE
                 {
-                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred21903); if (failed) return ;
+                match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred22078); if (failed) return ;
 
                 }
                 break;
@@ -16001,11 +16283,11 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:5: ( LEFT_PAREN and_key )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:6: LEFT_PAREN and_key
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735:5: ( LEFT_PAREN and_key )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735:6: LEFT_PAREN and_key
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred31954); if (failed) return ;
-        pushFollow(FOLLOW_and_key_in_synpred31956);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred32135); if (failed) return ;
+        pushFollow(FOLLOW_and_key_in_synpred32137);
         and_key();
         _fsp--;
         if (failed) return ;
@@ -16016,28 +16298,28 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:5: ( and_key | DOUBLE_AMPER )
-        int alt102=2;
-        int LA102_0 = input.LA(1);
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:5: ( and_key | DOUBLE_AMPER )
+        int alt101=2;
+        int LA101_0 = input.LA(1);
 
-        if ( (LA102_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
-            alt102=1;
+        if ( (LA101_0==ID) && ((validateIdentifierKey(DroolsSoftKeywords.AND)))) {
+            alt101=1;
         }
-        else if ( (LA102_0==DOUBLE_AMPER) ) {
-            alt102=2;
+        else if ( (LA101_0==DOUBLE_AMPER) ) {
+            alt101=2;
         }
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("583:5: synpred4 : ( and_key | DOUBLE_AMPER );", 102, 0, input);
+                new NoViableAltException("743:5: synpred4 : ( and_key | DOUBLE_AMPER );", 101, 0, input);
 
             throw nvae;
         }
-        switch (alt102) {
+        switch (alt101) {
             case 1 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:6: and_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:6: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred42003);
+                pushFollow(FOLLOW_and_key_in_synpred42205);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16045,9 +16327,9 @@
                 }
                 break;
             case 2 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:14: DOUBLE_AMPER
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743:14: DOUBLE_AMPER
                 {
-                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42005); if (failed) return ;
+                match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred42207); if (failed) return ;
 
                 }
                 break;
@@ -16057,10 +16339,10 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:4: ( SEMICOLON )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:597:5: SEMICOLON
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:4: ( SEMICOLON )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:5: SEMICOLON
         {
-        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52115); if (failed) return ;
+        match(input,SEMICOLON,FOLLOW_SEMICOLON_in_synpred52330); if (failed) return ;
 
         }
     }
@@ -16068,27 +16350,27 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:12: ( LEFT_PAREN ( or_key | and_key ) )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:13: LEFT_PAREN ( or_key | and_key )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:12: ( LEFT_PAREN ( or_key | and_key ) )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:13: LEFT_PAREN ( or_key | and_key )
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred62147); if (failed) return ;
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:24: ( or_key | and_key )
-        int alt103=2;
-        int LA103_0 = input.LA(1);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred62367); if (failed) return ;
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:24: ( or_key | and_key )
+        int alt102=2;
+        int LA102_0 = input.LA(1);
 
-        if ( (LA103_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-            int LA103_1 = input.LA(2);
+        if ( (LA102_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
+            int LA102_1 = input.LA(2);
 
             if ( ((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
-                alt103=1;
+                alt102=1;
             }
             else if ( ((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
-                alt103=2;
+                alt102=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("602:24: ( or_key | and_key )", 103, 1, input);
+                    new NoViableAltException("766:24: ( or_key | and_key )", 102, 1, input);
 
                 throw nvae;
             }
@@ -16096,15 +16378,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("602:24: ( or_key | and_key )", 103, 0, input);
+                new NoViableAltException("766:24: ( or_key | and_key )", 102, 0, input);
 
             throw nvae;
         }
-        switch (alt103) {
+        switch (alt102) {
             case 1 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:25: or_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:25: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred62150);
+                pushFollow(FOLLOW_or_key_in_synpred62370);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16112,9 +16394,9 @@
                 }
                 break;
             case 2 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:32: and_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:766:32: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred62152);
+                pushFollow(FOLLOW_and_key_in_synpred62372);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16131,27 +16413,27 @@
 
     // $ANTLR start synpred7
     public final void synpred7_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:5: ( LEFT_PAREN ( or_key | and_key ) )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:6: LEFT_PAREN ( or_key | and_key )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:5: ( LEFT_PAREN ( or_key | and_key ) )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:6: LEFT_PAREN ( or_key | and_key )
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred72259); if (failed) return ;
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:17: ( or_key | and_key )
-        int alt104=2;
-        int LA104_0 = input.LA(1);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred72495); if (failed) return ;
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:17: ( or_key | and_key )
+        int alt103=2;
+        int LA103_0 = input.LA(1);
 
-        if ( (LA104_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
-            int LA104_1 = input.LA(2);
+        if ( (LA103_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.AND))||(validateIdentifierKey(DroolsSoftKeywords.OR))))) {
+            int LA103_1 = input.LA(2);
 
             if ( ((validateIdentifierKey(DroolsSoftKeywords.OR))) ) {
-                alt104=1;
+                alt103=1;
             }
             else if ( ((validateIdentifierKey(DroolsSoftKeywords.AND))) ) {
-                alt104=2;
+                alt103=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("615:17: ( or_key | and_key )", 104, 1, input);
+                    new NoViableAltException("782:17: ( or_key | and_key )", 103, 1, input);
 
                 throw nvae;
             }
@@ -16159,15 +16441,15 @@
         else {
             if (backtracking>0) {failed=true; return ;}
             NoViableAltException nvae =
-                new NoViableAltException("615:17: ( or_key | and_key )", 104, 0, input);
+                new NoViableAltException("782:17: ( or_key | and_key )", 103, 0, input);
 
             throw nvae;
         }
-        switch (alt104) {
+        switch (alt103) {
             case 1 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:18: or_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:18: or_key
                 {
-                pushFollow(FOLLOW_or_key_in_synpred72262);
+                pushFollow(FOLLOW_or_key_in_synpred72498);
                 or_key();
                 _fsp--;
                 if (failed) return ;
@@ -16175,9 +16457,9 @@
                 }
                 break;
             case 2 :
-                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:25: and_key
+                // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:782:25: and_key
                 {
-                pushFollow(FOLLOW_and_key_in_synpred72264);
+                pushFollow(FOLLOW_and_key_in_synpred72500);
                 and_key();
                 _fsp--;
                 if (failed) return ;
@@ -16194,10 +16476,10 @@
 
     // $ANTLR start synpred8
     public final void synpred8_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:5: ( LEFT_PAREN )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:6: LEFT_PAREN
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:928:5: ( LEFT_PAREN )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:928:6: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred82817); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred83230); if (failed) return ;
 
         }
     }
@@ -16205,10 +16487,10 @@
 
     // $ANTLR start synpred9
     public final void synpred9_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:707:6: ( LEFT_SQUARE )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:707:8: LEFT_SQUARE
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:6: ( LEFT_SQUARE )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:8: LEFT_SQUARE
         {
-        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred92878); if (failed) return ;
+        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred93299); if (failed) return ;
 
         }
     }
@@ -16216,10 +16498,10 @@
 
     // $ANTLR start synpred10
     public final void synpred10_fragment() throws RecognitionException {   
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:6: ( LEFT_PAREN )
-        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:8: LEFT_PAREN
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:945:6: ( LEFT_PAREN )
+        // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g:945:8: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred102900); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred103321); if (failed) return ;
 
         }
     }
@@ -16369,22 +16651,20 @@
 
     protected DFA12 dfa12 = new DFA12(this);
     protected DFA17 dfa17 = new DFA17(this);
-    protected DFA28 dfa28 = new DFA28(this);
-    protected DFA36 dfa36 = new DFA36(this);
-    protected DFA53 dfa53 = new DFA53(this);
-    protected DFA54 dfa54 = new DFA54(this);
-    protected DFA61 dfa61 = new DFA61(this);
+    protected DFA51 dfa51 = new DFA51(this);
+    protected DFA52 dfa52 = new DFA52(this);
     protected DFA65 dfa65 = new DFA65(this);
-    protected DFA82 dfa82 = new DFA82(this);
-    protected DFA83 dfa83 = new DFA83(this);
+    protected DFA80 dfa80 = new DFA80(this);
+    protected DFA81 dfa81 = new DFA81(this);
     static final String DFA12_eotS =
         "\16\uffff";
     static final String DFA12_eofS =
         "\16\uffff";
     static final String DFA12_minS =
-        "\2\130\1\uffff\1\130\1\uffff\1\130\1\163\3\130\2\163\1\135\1\130";
+        "\2\122\1\uffff\1\122\1\uffff\2\122\2\163\2\122\1\127\1\163\1\122";
     static final String DFA12_maxS =
-        "\1\135\1\137\1\uffff\1\162\1\uffff\1\130\1\163\3\162\2\163\2\162";
+        "\1\127\1\131\1\uffff\1\162\1\uffff\1\162\1\122\2\163\3\162\1\163"+
+        "\1\162";
     static final String DFA12_acceptS =
         "\2\uffff\1\2\1\uffff\1\1\11\uffff";
     static final String DFA12_specialS =
@@ -16393,17 +16673,17 @@
             "\1\2\2\uffff\1\2\1\uffff\1\1",
             "\1\3\4\uffff\1\2\1\uffff\1\4",
             "",
-            "\1\7\1\5\3\uffff\1\2\2\4\1\uffff\1\2\20\uffff\1\6",
+            "\1\5\1\6\3\uffff\1\2\2\4\1\uffff\1\2\26\uffff\1\7",
             "",
-            "\1\10",
+            "\2\2\3\uffff\1\2\2\4\1\uffff\1\2\26\uffff\1\10",
             "\1\11",
-            "\2\2\3\uffff\1\2\2\4\1\uffff\1\2\20\uffff\1\12",
-            "\1\4\1\5\3\uffff\1\2\24\uffff\1\13",
-            "\1\4\4\uffff\1\2\2\4\22\uffff\1\6",
-            "\1\14",
+            "\1\12",
+            "\1\13",
+            "\1\4\1\6\3\uffff\1\2\32\uffff\1\14",
+            "\1\4\4\uffff\1\2\2\4\30\uffff\1\7",
+            "\1\2\2\4\30\uffff\1\10",
             "\1\15",
-            "\1\2\2\4\22\uffff\1\12",
-            "\1\4\4\uffff\1\2\24\uffff\1\13"
+            "\1\4\4\uffff\1\2\32\uffff\1\14"
     };
 
     static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
@@ -16436,7 +16716,7 @@
             this.transition = DFA12_transition;
         }
         public String getDescription() {
-            return "383:23: ( parameters )?";
+            return "481:3: ( parameters )?";
         }
     }
     static final String DFA17_eotS =
@@ -16444,20 +16724,20 @@
     static final String DFA17_eofS =
         "\6\uffff";
     static final String DFA17_minS =
-        "\2\130\1\uffff\1\163\1\uffff\1\130";
+        "\2\122\1\163\2\uffff\1\122";
     static final String DFA17_maxS =
-        "\1\130\1\162\1\uffff\1\163\1\uffff\1\162";
+        "\1\122\1\162\1\163\2\uffff\1\162";
     static final String DFA17_acceptS =
-        "\2\uffff\1\1\1\uffff\1\2\1\uffff";
+        "\3\uffff\1\2\1\1\1\uffff";
     static final String DFA17_specialS =
         "\6\uffff}>";
     static final String[] DFA17_transitionS = {
             "\1\1",
-            "\2\2\4\uffff\2\4\22\uffff\1\3",
-            "",
+            "\2\4\4\uffff\2\3\30\uffff\1\2",
             "\1\5",
             "",
-            "\1\2\5\uffff\2\4\22\uffff\1\3"
+            "",
+            "\1\4\5\uffff\2\3\30\uffff\1\2"
     };
 
     static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
@@ -16490,1021 +16770,423 @@
             this.transition = DFA17_transition;
         }
         public String getDescription() {
-            return "402:4: ( data_type )?";
+            return "507:4: ( data_type )?";
         }
     }
-    static final String DFA28_eotS =
-        "\40\uffff";
-    static final String DFA28_eofS =
-        "\40\uffff";
-    static final String DFA28_minS =
-        "\2\130\4\uffff\1\4\1\130\2\uffff\1\4\1\0\1\uffff\1\0\1\4\1\0\2\4"+
-        "\1\0\1\4\1\0\3\4\1\0\1\4\2\0\2\4\2\0";
-    static final String DFA28_maxS =
-        "\1\164\1\167\4\uffff\1\u0080\1\164\2\uffff\1\u0080\1\0\1\uffff\1"+
-        "\0\1\u0080\1\0\2\u0080\1\0\1\u0080\1\0\3\u0080\1\0\1\u0080\2\0\2"+
-        "\u0080\2\0";
-    static final String DFA28_acceptS =
-        "\2\uffff\1\2\3\1\2\uffff\1\2\1\1\2\uffff\1\1\23\uffff";
-    static final String DFA28_specialS =
-        "\1\10\1\24\4\uffff\1\30\1\23\2\uffff\1\20\1\16\1\uffff\1\11\1\25"+
-        "\1\15\1\21\1\7\1\1\1\5\1\17\1\4\1\2\1\22\1\14\1\6\1\27\1\26\1\3"+
-        "\1\0\1\13\1\12}>";
-    static final String[] DFA28_transitionS = {
-            "\1\1\33\uffff\1\2",
-            "\1\10\3\uffff\1\11\1\6\3\uffff\1\7\1\uffff\1\4\1\5\17\uffff"+
-            "\1\10\2\uffff\1\3",
+    static final String DFA51_eotS =
+        "\u0082\uffff";
+    static final String DFA51_eofS =
+        "\u0082\uffff";
+    static final String DFA51_minS =
+        "\3\122\2\0\2\122\1\163\1\0\3\uffff\1\123\1\122\1\123\1\127\1\uffff"+
+        "\1\122\1\163\1\122\1\123\1\122\1\123\1\127\1\122\2\0\1\122\1\163"+
+        "\2\122\2\0\1\122\1\4\11\122\1\0\2\uffff\1\123\1\127\1\122\1\0\2"+
+        "\122\1\4\11\122\1\0\1\uffff\1\122\1\4\16\0\1\uffff\14\0\1\uffff"+
+        "\23\0\1\uffff\17\0";
+    static final String DFA51_maxS =
+        "\2\127\1\162\2\0\1\127\1\122\1\163\1\0\3\uffff\1\162\1\122\2\162"+
+        "\1\uffff\1\122\1\163\1\131\1\162\1\131\3\162\2\0\1\122\1\163\1\131"+
+        "\1\162\2\0\1\122\1\u0080\1\122\7\161\1\122\1\0\2\uffff\3\162\1\0"+
+        "\1\140\1\122\1\u0080\1\122\7\161\1\122\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 DFA51_acceptS =
+        "\11\uffff\1\1\2\2\4\uffff\1\3\34\uffff\2\3\21\uffff\1\3\20\uffff"+
+        "\1\3\14\uffff\1\3\23\uffff\1\3\17\uffff";
+    static final String DFA51_specialS =
+        "\2\uffff\1\7\1\6\1\3\3\uffff\1\1\20\uffff\1\10\1\12\4\uffff\1\2"+
+        "\1\0\13\uffff\1\5\5\uffff\1\11\14\uffff\1\4\102\uffff}>";
+    static final String[] DFA51_transitionS = {
+            "\1\2\4\uffff\1\1",
+            "\1\3\4\uffff\1\4",
+            "\1\11\1\6\3\uffff\1\10\3\uffff\1\5\26\uffff\1\7",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\14\4\uffff\1\15",
+            "\1\16",
+            "\1\17",
+            "\1\uffff",
             "",
             "",
             "",
+            "\1\21\3\uffff\1\23\32\uffff\1\22",
+            "\1\24",
+            "\1\6\3\uffff\1\25\32\uffff\1\7",
+            "\1\25\32\uffff\1\7",
             "",
-            "\124\14\1\12\4\14\1\13\43\14",
-            "\1\15\4\uffff\1\10\26\uffff\1\10",
+            "\1\26",
+            "\1\27",
+            "\1\30\4\uffff\1\31\1\uffff\1\32",
+            "\1\33\3\uffff\1\35\32\uffff\1\34",
+            "\1\36\4\uffff\1\37\1\uffff\1\40",
+            "\1\21\3\uffff\1\23\32\uffff\1\22",
+            "\1\23\32\uffff\1\22",
+            "\1\44\1\43\3\uffff\1\54\3\uffff\1\41\15\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\15\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",
+            "\156\102\1\103\1\104\15\102",
+            "\1\105",
+            "\1\107\3\uffff\1\110\1\106\6\uffff\1\113\1\111\17\uffff\1\115"+
+            "\1\112\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\116\3\uffff\1\110\1\117\6\uffff\1\113\1\111\20\uffff\1\112"+
+            "\1\114",
+            "\1\120",
+            "\1\uffff",
             "",
             "",
-            "\124\14\1\17\1\20\3\14\1\22\3\14\1\16\20\14\1\21\16\14",
+            "\1\33\3\uffff\1\35\32\uffff\1\34",
+            "\1\35\32\uffff\1\34",
+            "\1\125\1\124\3\uffff\1\135\3\uffff\1\122\15\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",
+            "\1\146",
+            "\1\147\3\uffff\1\150\1\155\6\uffff\1\153\1\151\17\uffff\1\156"+
+            "\1\152\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\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"+
+            "\6\uffff\1\176\1\166\1\167\1\170\1\171\1\172\1\173\1\174\2\uffff"+
+            "\1\163",
+            "\156\102\1\103\1\104\15\102",
             "\1\uffff",
-            "\124\14\1\23\4\14\1\24\43\14",
             "\1\uffff",
-            "\124\14\1\25\50\14",
-            "\157\14\1\26\15\14",
             "\1\uffff",
-            "\125\14\1\27\3\14\1\30\24\14\1\31\16\14",
             "\1\uffff",
-            "\125\14\1\20\3\14\1\32\24\14\1\21\16\14",
-            "\131\14\1\33\24\14\1\21\16\14",
-            "\124\14\1\34\50\14",
             "\1\uffff",
-            "\157\14\1\35\15\14",
             "\1\uffff",
             "\1\uffff",
-            "\125\14\1\27\3\14\1\36\24\14\1\31\16\14",
-            "\131\14\1\37\24\14\1\31\16\14",
             "\1\uffff",
-            "\1\uffff"
-    };
-
-    static final short[] DFA28_eot = DFA.unpackEncodedString(DFA28_eotS);
-    static final short[] DFA28_eof = DFA.unpackEncodedString(DFA28_eofS);
-    static final char[] DFA28_min = DFA.unpackEncodedStringToUnsignedChars(DFA28_minS);
-    static final char[] DFA28_max = DFA.unpackEncodedStringToUnsignedChars(DFA28_maxS);
-    static final short[] DFA28_accept = DFA.unpackEncodedString(DFA28_acceptS);
-    static final short[] DFA28_special = DFA.unpackEncodedString(DFA28_specialS);
-    static final short[][] DFA28_transition;
-
-    static {
-        int numStates = DFA28_transitionS.length;
-        DFA28_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA28_transition[i] = DFA.unpackEncodedString(DFA28_transitionS[i]);
-        }
-    }
-
-    class DFA28 extends DFA {
-
-        public DFA28(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 28;
-            this.eot = DFA28_eot;
-            this.eof = DFA28_eof;
-            this.min = DFA28_min;
-            this.max = DFA28_max;
-            this.accept = DFA28_accept;
-            this.special = DFA28_special;
-            this.transition = DFA28_transition;
-        }
-        public String getDescription() {
-            return "468:21: ( rule_attributes )?";
-        }
-        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA28_29 = input.LA(1);
-
-                         
-                        int index28_29 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_29==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 31;}
-
-                        else if ( (LA28_29==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 25;}
-
-                        else if ( ((LA28_29>=VT_COMPILATION_UNIT && LA28_29<=STRING)||(LA28_29>=COMMA && LA28_29<=NULL)||(LA28_29>=RIGHT_SQUARE && LA28_29<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_29);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA28_18 = input.LA(1);
-
-                         
-                        int index28_18 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_18);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA28_22 = input.LA(1);
-
-                         
-                        int index28_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_22==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 27;}
-
-                        else if ( (LA28_22==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 17;}
-
-                        else if ( ((LA28_22>=VT_COMPILATION_UNIT && LA28_22<=STRING)||(LA28_22>=COMMA && LA28_22<=NULL)||(LA28_22>=RIGHT_SQUARE && LA28_22<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA28_28 = input.LA(1);
-
-                         
-                        int index28_28 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_28==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 25;}
-
-                        else if ( (LA28_28==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 30;}
-
-                        else if ( (LA28_28==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 23;}
-
-                        else if ( ((LA28_28>=VT_COMPILATION_UNIT && LA28_28<=ID)||(LA28_28>=DOT_STAR && LA28_28<=STRING)||(LA28_28>=COMMA && LA28_28<=NULL)||(LA28_28>=RIGHT_SQUARE && LA28_28<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_28);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA28_21 = input.LA(1);
-
-                         
-                        int index28_21 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((LA28_21>=VT_COMPILATION_UNIT && LA28_21<=ID)||(LA28_21>=DOT_STAR && LA28_21<=STRING)||(LA28_21>=COMMA && LA28_21<=NULL)||(LA28_21>=RIGHT_SQUARE && LA28_21<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                        else if ( (LA28_21==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 17;}
-
-                        else if ( (LA28_21==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 26;}
-
-                        else if ( (LA28_21==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 16;}
-
-                         
-                        input.seek(index28_21);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA28_19 = input.LA(1);
-
-                         
-                        int index28_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((LA28_19>=VT_COMPILATION_UNIT && LA28_19<=ID)||(LA28_19>=DOT_STAR && LA28_19<=STRING)||(LA28_19>=COMMA && LA28_19<=NULL)||(LA28_19>=RIGHT_SQUARE && LA28_19<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                        else if ( (LA28_19==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 23;}
-
-                        else if ( (LA28_19==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 24;}
-
-                        else if ( (LA28_19==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 25;}
-
-                         
-                        input.seek(index28_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA28_25 = input.LA(1);
-
-                         
-                        int index28_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_25==RIGHT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 29;}
-
-                        else if ( ((LA28_25>=VT_COMPILATION_UNIT && LA28_25<=LEFT_SQUARE)||(LA28_25>=THEN && LA28_25<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 7 : 
-                        int LA28_17 = input.LA(1);
-
-                         
-                        int index28_17 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_17==RIGHT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 22;}
-
-                        else if ( ((LA28_17>=VT_COMPILATION_UNIT && LA28_17<=LEFT_SQUARE)||(LA28_17>=THEN && LA28_17<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_17);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 8 : 
-                        int LA28_0 = input.LA(1);
-
-                         
-                        int index28_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DIALECT))||(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))||(validateIdentifierK!
 ey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {s = 1;}
-
-                        else if ( (LA28_0==THEN) ) {s = 2;}
-
-                         
-                        input.seek(index28_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 9 : 
-                        int LA28_13 = input.LA(1);
-
-                         
-                        int index28_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 10 : 
-                        int LA28_31 = input.LA(1);
-
-                         
-                        int index28_31 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_31);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 11 : 
-                        int LA28_30 = input.LA(1);
-
-                         
-                        int index28_30 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_30);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA28_24 = input.LA(1);
-
-                         
-                        int index28_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA28_15 = input.LA(1);
-
-                         
-                        int index28_15 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_15);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA28_11 = input.LA(1);
-
-                         
-                        int index28_11 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_11);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA28_20 = input.LA(1);
-
-                         
-                        int index28_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_20);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA28_10 = input.LA(1);
-
-                         
-                        int index28_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_10==COLON) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 14;}
-
-                        else if ( (LA28_10==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 15;}
-
-                        else if ( (LA28_10==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 16;}
-
-                        else if ( (LA28_10==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 17;}
-
-                        else if ( (LA28_10==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 18;}
-
-                        else if ( ((LA28_10>=VT_COMPILATION_UNIT && LA28_10<=SEMICOLON)||(LA28_10>=DOT_STAR && LA28_10<=STRING)||(LA28_10>=COMMA && LA28_10<=AT)||(LA28_10>=EQUALS && LA28_10<=NULL)||(LA28_10>=RIGHT_SQUARE && LA28_10<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA28_16 = input.LA(1);
-
-                         
-                        int index28_16 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_16==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 21;}
-
-                        else if ( ((LA28_16>=VT_COMPILATION_UNIT && LA28_16<=SEMICOLON)||(LA28_16>=DOT && LA28_16<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_16);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA28_23 = input.LA(1);
-
-                         
-                        int index28_23 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_23==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 28;}
-
-                        else if ( ((LA28_23>=VT_COMPILATION_UNIT && LA28_23<=SEMICOLON)||(LA28_23>=DOT && LA28_23<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_23);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA28_7 = input.LA(1);
-
-                         
-                        int index28_7 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_7==LEFT_PAREN||LA28_7==THEN) && ((validateIdentifierKey(DroolsSoftKeywords.WHEN)))) {s = 8;}
-
-                        else if ( (LA28_7==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))))) {s = 13;}
-
-                         
-                        input.seek(index28_7);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA28_1 = input.LA(1);
-
-                         
-                        int index28_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_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 = 3;}
-
-                        else if ( (LA28_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {s = 4;}
-
-                        else if ( (LA28_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {s = 5;}
-
-                        else if ( (LA28_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 6;}
-
-                        else if ( (LA28_1==COLON) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))))) {s = 7;}
-
-                        else if ( (LA28_1==ID||LA28_1==THEN) && ((validateIdentifierKey(DroolsSoftKeywords.WHEN)))) {s = 8;}
-
-                        else if ( (LA28_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {s = 9;}
-
-                         
-                        input.seek(index28_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA28_14 = input.LA(1);
-
-                         
-                        int index28_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_14==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 19;}
-
-                        else if ( (LA28_14==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 20;}
-
-                        else if ( ((LA28_14>=VT_COMPILATION_UNIT && LA28_14<=SEMICOLON)||(LA28_14>=DOT && LA28_14<=STRING)||(LA28_14>=COMMA && LA28_14<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA28_27 = input.LA(1);
-
-                         
-                        int index28_27 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_27);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 23 : 
-                        int LA28_26 = input.LA(1);
-
-                         
-                        int index28_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 8;}
-
-                         
-                        input.seek(index28_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 24 : 
-                        int LA28_6 = input.LA(1);
-
-                         
-                        int index28_6 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA28_6==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 10;}
-
-                        else if ( (LA28_6==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 11;}
-
-                        else if ( ((LA28_6>=VT_COMPILATION_UNIT && LA28_6<=SEMICOLON)||(LA28_6>=DOT && LA28_6<=STRING)||(LA28_6>=COMMA && LA28_6<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index28_6);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (backtracking>0) {failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 28, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA36_eotS =
-        "\37\uffff";
-    static final String DFA36_eofS =
-        "\37\uffff";
-    static final String DFA36_minS =
-        "\2\130\6\uffff\1\4\1\uffff\1\4\1\0\1\uffff\1\4\1\0\2\4\1\0\1\4\1"+
-        "\0\4\4\3\0\2\4\2\0";
-    static final String DFA36_maxS =
-        "\1\164\1\167\6\uffff\1\u0080\1\uffff\1\u0080\1\0\1\uffff\1\u0080"+
-        "\1\0\2\u0080\1\0\1\u0080\1\0\4\u0080\3\0\2\u0080\2\0";
-    static final String DFA36_acceptS =
-        "\2\uffff\1\2\4\1\1\2\1\uffff\1\1\2\uffff\1\1\22\uffff";
-    static final String DFA36_specialS =
-        "\1\15\1\17\6\uffff\1\26\1\uffff\1\20\1\10\1\uffff\1\23\1\14\1\21"+
-        "\1\6\1\1\1\5\1\16\1\4\1\2\1\22\1\7\1\13\1\25\1\24\1\3\1\0\1\12\1"+
-        "\11}>";
-    static final String[] DFA36_transitionS = {
-            "\1\1\5\uffff\1\3\25\uffff\1\2",
-            "\1\7\3\uffff\1\5\1\10\3\uffff\1\7\1\uffff\1\6\1\11\17\uffff"+
-            "\1\7\2\uffff\1\4",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "",
-            "",
-            "",
-            "",
-            "",
-            "\124\14\1\12\4\14\1\13\43\14",
-            "",
-            "\124\14\1\16\1\17\3\14\1\21\3\14\1\15\20\14\1\20\16\14",
             "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "",
-            "\124\14\1\22\4\14\1\23\43\14",
             "\1\uffff",
-            "\124\14\1\24\50\14",
-            "\157\14\1\25\15\14",
             "\1\uffff",
-            "\125\14\1\26\3\14\1\30\24\14\1\27\16\14",
             "\1\uffff",
-            "\125\14\1\17\3\14\1\31\24\14\1\20\16\14",
-            "\131\14\1\32\24\14\1\20\16\14",
-            "\124\14\1\33\50\14",
-            "\157\14\1\34\15\14",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\125\14\1\26\3\14\1\35\24\14\1\27\16\14",
-            "\131\14\1\36\24\14\1\27\16\14",
             "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "\1\uffff"
     };
 
-    static final short[] DFA36_eot = DFA.unpackEncodedString(DFA36_eotS);
-    static final short[] DFA36_eof = DFA.unpackEncodedString(DFA36_eofS);
-    static final char[] DFA36_min = DFA.unpackEncodedStringToUnsignedChars(DFA36_minS);
-    static final char[] DFA36_max = DFA.unpackEncodedStringToUnsignedChars(DFA36_maxS);
-    static final short[] DFA36_accept = DFA.unpackEncodedString(DFA36_acceptS);
-    static final short[] DFA36_special = DFA.unpackEncodedString(DFA36_specialS);
-    static final short[][] DFA36_transition;
+    static final short[] DFA51_eot = DFA.unpackEncodedString(DFA51_eotS);
+    static final short[] DFA51_eof = DFA.unpackEncodedString(DFA51_eofS);
+    static final char[] DFA51_min = DFA.unpackEncodedStringToUnsignedChars(DFA51_minS);
+    static final char[] DFA51_max = DFA.unpackEncodedStringToUnsignedChars(DFA51_maxS);
+    static final short[] DFA51_accept = DFA.unpackEncodedString(DFA51_acceptS);
+    static final short[] DFA51_special = DFA.unpackEncodedString(DFA51_specialS);
+    static final short[][] DFA51_transition;
 
     static {
-        int numStates = DFA36_transitionS.length;
-        DFA36_transition = new short[numStates][];
+        int numStates = DFA51_transitionS.length;
+        DFA51_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA36_transition[i] = DFA.unpackEncodedString(DFA36_transitionS[i]);
+            DFA51_transition[i] = DFA.unpackEncodedString(DFA51_transitionS[i]);
         }
     }
 
-    class DFA36 extends DFA {
+    class DFA51 extends DFA {
 
-        public DFA36(BaseRecognizer recognizer) {
+        public DFA51(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 = 51;
+            this.eot = DFA51_eot;
+            this.eof = DFA51_eof;
+            this.min = DFA51_min;
+            this.max = DFA51_max;
+            this.accept = DFA51_accept;
+            this.special = DFA51_special;
+            this.transition = DFA51_transition;
         }
         public String getDescription() {
-            return "()* loopback of 487:45: ( ( COMMA )? attr= rule_attribute )*";
+            return "766: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 LA36_28 = input.LA(1);
+                        int LA51_32 = input.LA(1);
 
                          
-                        int index36_28 = input.index();
+                        int index51_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_28==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 30;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA36_28==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 23;}
+                        else if ( (true) ) {s = 46;}
 
-                        else if ( ((LA36_28>=VT_COMPILATION_UNIT && LA36_28<=STRING)||(LA36_28>=COMMA && LA36_28<=NULL)||(LA36_28>=RIGHT_SQUARE && LA36_28<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
                          
-                        input.seek(index36_28);
+                        input.seek(index51_32);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA36_17 = input.LA(1);
+                        int LA51_8 = input.LA(1);
 
                          
-                        int index36_17 = input.index();
+                        int index51_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
+                        if ( ((synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 9;}
 
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
+                        else if ( (true) ) {s = 16;}
 
                          
-                        input.seek(index36_17);
+                        input.seek(index51_8);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA36_21 = input.LA(1);
+                        int LA51_31 = input.LA(1);
 
                          
-                        int index36_21 = input.index();
+                        int index51_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_21==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 26;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA36_21==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 16;}
+                        else if ( (true) ) {s = 64;}
 
-                        else if ( ((LA36_21>=VT_COMPILATION_UNIT && LA36_21<=STRING)||(LA36_21>=COMMA && LA36_21<=NULL)||(LA36_21>=RIGHT_SQUARE && LA36_21<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
                          
-                        input.seek(index36_21);
+                        input.seek(index51_31);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA36_27 = input.LA(1);
+                        int LA51_4 = input.LA(1);
 
                          
-                        int index36_27 = input.index();
+                        int index51_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_27==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 23;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA36_27==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 29;}
+                        else if ( (true) ) {s = 11;}
 
-                        else if ( (LA36_27==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 22;}
-
-                        else if ( ((LA36_27>=VT_COMPILATION_UNIT && LA36_27<=ID)||(LA36_27>=DOT_STAR && LA36_27<=STRING)||(LA36_27>=COMMA && LA36_27<=NULL)||(LA36_27>=RIGHT_SQUARE && LA36_27<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
                          
-                        input.seek(index36_27);
+                        input.seek(index51_4);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA36_20 = input.LA(1);
+                        int LA51_63 = input.LA(1);
 
                          
-                        int index36_20 = input.index();
+                        int index51_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_20==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 16;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA36_20==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 25;}
+                        else if ( (true) ) {s = 114;}
 
-                        else if ( (LA36_20==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 15;}
-
-                        else if ( ((LA36_20>=VT_COMPILATION_UNIT && LA36_20<=ID)||(LA36_20>=DOT_STAR && LA36_20<=STRING)||(LA36_20>=COMMA && LA36_20<=NULL)||(LA36_20>=RIGHT_SQUARE && LA36_20<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
                          
-                        input.seek(index36_20);
+                        input.seek(index51_63);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA36_18 = input.LA(1);
+                        int LA51_44 = input.LA(1);
 
                          
-                        int index36_18 = input.index();
+                        int index51_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_18==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 22;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (LA36_18==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 23;}
+                        else if ( (true) ) {s = 81;}
 
-                        else if ( (LA36_18==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 24;}
-
-                        else if ( ((LA36_18>=VT_COMPILATION_UNIT && LA36_18<=ID)||(LA36_18>=DOT_STAR && LA36_18<=STRING)||(LA36_18>=COMMA && LA36_18<=NULL)||(LA36_18>=RIGHT_SQUARE && LA36_18<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
                          
-                        input.seek(index36_18);
+                        input.seek(index51_44);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA36_16 = input.LA(1);
+                        int LA51_3 = input.LA(1);
 
                          
-                        int index36_16 = input.index();
+                        int index51_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_16==RIGHT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 21;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( ((LA36_16>=VT_COMPILATION_UNIT && LA36_16<=LEFT_SQUARE)||(LA36_16>=THEN && LA36_16<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
+                        else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index36_16);
+                        input.seek(index51_3);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA36_23 = input.LA(1);
+                        int LA51_2 = input.LA(1);
 
                          
-                        int index36_23 = input.index();
+                        int index51_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA36_23==RIGHT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 28;}
+                        if ( (LA51_2==COLON) ) {s = 5;}
 
-                        else if ( ((LA36_23>=VT_COMPILATION_UNIT && LA36_23<=LEFT_SQUARE)||(LA36_23>=THEN && LA36_23<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
+                        else if ( (LA51_2==DOT) ) {s = 6;}
 
+                        else if ( (LA51_2==LEFT_SQUARE) ) {s = 7;}
+
+                        else if ( (LA51_2==LEFT_PAREN) ) {s = 8;}
+
+                        else if ( (LA51_2==ID) && (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||((synpred6()&&validateNotWithBinding())&&(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.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synp!
 red6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))))) {s = 9;}
+
                          
-                        input.seek(index36_23);
+                        input.seek(index51_2);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA36_11 = input.LA(1);
+                        int LA51_25 = input.LA(1);
 
                          
-                        int index36_11 = input.index();
+                        int index51_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index36_11);
+                        input.seek(index51_25);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA36_30 = input.LA(1);
+                        int LA51_50 = input.LA(1);
 
                          
-                        int index36_30 = input.index();
+                        int index51_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
+                        else if ( (true) ) {s = 94;}
 
                          
-                        input.seek(index36_30);
+                        input.seek(index51_50);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA36_29 = input.LA(1);
+                        int LA51_26 = input.LA(1);
 
                          
-                        int index36_29 = input.index();
+                        int index51_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
+                        if ( (synpred6()) ) {s = 9;}
 
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index36_29);
+                        input.seek(index51_26);
                         if ( s>=0 ) return s;
                         break;
-                    case 11 : 
-                        int LA36_24 = input.LA(1);
-
-                         
-                        int index36_24 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
-
-                         
-                        input.seek(index36_24);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 12 : 
-                        int LA36_14 = input.LA(1);
-
-                         
-                        int index36_14 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
-
-                         
-                        input.seek(index36_14);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 13 : 
-                        int LA36_0 = input.LA(1);
-
-                         
-                        int index36_0 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(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))||(validateIdentifierK!
 ey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.ENABLED))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))))) {s = 1;}
-
-                        else if ( (LA36_0==THEN) ) {s = 2;}
-
-                        else if ( (LA36_0==COMMA) ) {s = 3;}
-
-                         
-                        input.seek(index36_0);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 14 : 
-                        int LA36_19 = input.LA(1);
-
-                         
-                        int index36_19 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
-
-                         
-                        input.seek(index36_19);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 15 : 
-                        int LA36_1 = input.LA(1);
-
-                         
-                        int index36_1 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_1==MISC) && (((validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))||(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))||(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))||(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))||(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))||(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateL!
 T(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))))) {s = 4;}
-
-                        else if ( (LA36_1==STRING) && ((validateIdentifierKey(DroolsSoftKeywords.DIALECT)))) {s = 5;}
-
-                        else if ( (LA36_1==BOOL) && ((validateIdentifierKey(DroolsSoftKeywords.ENABLED)))) {s = 6;}
-
-                        else if ( (LA36_1==ID||LA36_1==COLON||LA36_1==THEN) && ((validateIdentifierKey(DroolsSoftKeywords.WHEN)))) {s = 7;}
-
-                        else if ( (LA36_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 8;}
-
-                        else if ( (LA36_1==INT) && (((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))||(validateIdentifierKey(DroolsSoftKeywords.DURATION))))) {s = 9;}
-
-                         
-                        input.seek(index36_1);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 16 : 
-                        int LA36_10 = input.LA(1);
-
-                         
-                        int index36_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_10==COLON) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 13;}
-
-                        else if ( (LA36_10==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 14;}
-
-                        else if ( (LA36_10==DOT) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 15;}
-
-                        else if ( (LA36_10==LEFT_SQUARE) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 16;}
-
-                        else if ( (LA36_10==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 17;}
-
-                        else if ( ((LA36_10>=VT_COMPILATION_UNIT && LA36_10<=SEMICOLON)||(LA36_10>=DOT_STAR && LA36_10<=STRING)||(LA36_10>=COMMA && LA36_10<=AT)||(LA36_10>=EQUALS && LA36_10<=NULL)||(LA36_10>=RIGHT_SQUARE && LA36_10<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index36_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 17 : 
-                        int LA36_15 = input.LA(1);
-
-                         
-                        int index36_15 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_15==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 20;}
-
-                        else if ( ((LA36_15>=VT_COMPILATION_UNIT && LA36_15<=SEMICOLON)||(LA36_15>=DOT && LA36_15<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index36_15);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 18 : 
-                        int LA36_22 = input.LA(1);
-
-                         
-                        int index36_22 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_22==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 27;}
-
-                        else if ( ((LA36_22>=VT_COMPILATION_UNIT && LA36_22<=SEMICOLON)||(LA36_22>=DOT && LA36_22<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index36_22);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 19 : 
-                        int LA36_13 = input.LA(1);
-
-                         
-                        int index36_13 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_13==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 18;}
-
-                        else if ( (LA36_13==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 19;}
-
-                        else if ( ((LA36_13>=VT_COMPILATION_UNIT && LA36_13<=SEMICOLON)||(LA36_13>=DOT && LA36_13<=STRING)||(LA36_13>=COMMA && LA36_13<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index36_13);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 20 : 
-                        int LA36_26 = input.LA(1);
-
-                         
-                        int index36_26 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
-
-                         
-                        input.seek(index36_26);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 21 : 
-                        int LA36_25 = input.LA(1);
-
-                         
-                        int index36_25 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE))) ) {s = 12;}
-
-                        else if ( (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateWhenWithParenthesis()&&(validateIdentifierKey(DroolsSoftKeywords.WHEN))))) ) {s = 7;}
-
-                         
-                        input.seek(index36_25);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 22 : 
-                        int LA36_8 = input.LA(1);
-
-                         
-                        int index36_8 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA36_8==ID) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 10;}
-
-                        else if ( (LA36_8==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.WHEN))||(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))))) {s = 11;}
-
-                        else if ( ((LA36_8>=VT_COMPILATION_UNIT && LA36_8<=SEMICOLON)||(LA36_8>=DOT && LA36_8<=STRING)||(LA36_8>=COMMA && LA36_8<=MULTI_LINE_COMMENT)) && ((validateIdentifierKey(DroolsSoftKeywords.SALIENCE)))) {s = 12;}
-
-                         
-                        input.seek(index36_8);
-                        if ( s>=0 ) return s;
-                        break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 36, _s, input);
+                new NoViableAltException(getDescription(), 51, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA53_eotS =
-        "\172\uffff";
-    static final String DFA53_eofS =
-        "\172\uffff";
-    static final String DFA53_minS =
-        "\3\130\2\0\1\130\1\0\1\uffff\1\130\1\163\2\uffff\1\131\1\130\1\uffff"+
-        "\1\131\1\135\1\130\1\163\1\130\1\131\1\130\1\131\1\135\1\130\2\0"+
-        "\1\130\1\163\2\130\2\0\1\130\1\0\1\4\11\130\2\uffff\1\131\1\135"+
-        "\1\130\1\0\2\130\1\4\11\130\1\0\1\uffff\1\130\1\uffff\1\4\26\0\1"+
-        "\uffff\17\0\1\uffff\17\0";
-    static final String DFA53_maxS =
-        "\2\135\1\162\2\0\1\135\1\0\1\uffff\1\130\1\163\2\uffff\1\162\1\130"+
-        "\1\uffff\2\162\1\130\1\163\1\137\1\162\1\137\3\162\2\0\1\130\1\163"+
-        "\1\137\1\162\2\0\1\130\1\0\1\u0080\1\130\7\161\1\130\2\uffff\3\162"+
-        "\1\0\1\145\1\130\1\u0080\1\130\7\161\1\130\1\0\1\uffff\1\162\1\uffff"+
-        "\1\u0080\26\0\1\uffff\17\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\27\uffff\1\3\17\uffff\1\3\17\uffff";
-    static final String DFA53_specialS =
-        "\2\uffff\1\7\1\0\1\3\1\uffff\1\10\22\uffff\1\2\1\1\4\uffff\1\5\1"+
-        "\11\1\uffff\1\4\17\uffff\1\6\14\uffff\1\12\72\uffff}>";
-    static final String[] DFA53_transitionS = {
+    static final String DFA52_eotS =
+        "\u0082\uffff";
+    static final String DFA52_eofS =
+        "\u0082\uffff";
+    static final String DFA52_minS =
+        "\3\122\2\0\1\122\1\0\1\uffff\1\122\1\163\2\uffff\1\123\1\122\1\uffff"+
+        "\1\123\1\127\1\122\1\163\1\122\1\123\1\122\1\123\1\127\1\122\2\0"+
+        "\1\122\1\163\2\122\2\0\1\122\1\4\11\122\1\0\2\uffff\1\123\1\127"+
+        "\1\122\1\0\2\122\1\4\11\122\1\0\1\uffff\1\122\1\4\16\0\1\uffff\14"+
+        "\0\1\uffff\23\0\1\uffff\17\0";
+    static final String DFA52_maxS =
+        "\2\127\1\162\2\0\1\127\1\0\1\uffff\1\122\1\163\2\uffff\1\162\1\122"+
+        "\1\uffff\2\162\1\122\1\163\1\131\1\162\1\131\3\162\2\0\1\122\1\163"+
+        "\1\131\1\162\2\0\1\122\1\u0080\1\122\7\161\1\122\1\0\2\uffff\3\162"+
+        "\1\0\1\140\1\122\1\u0080\1\122\7\161\1\122\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 DFA52_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 DFA52_specialS =
+        "\2\uffff\1\4\1\12\1\1\1\uffff\1\10\22\uffff\1\6\1\11\4\uffff\1\2"+
+        "\1\5\13\uffff\1\3\5\uffff\1\7\14\uffff\1\0\102\uffff}>";
+    static final String[] DFA52_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\20\uffff\1\11",
+            "\1\4\4\uffff\1\3",
+            "\1\7\1\10\3\uffff\1\6\3\uffff\1\5\26\uffff\1\11",
             "\1\uffff",
             "\1\uffff",
             "\1\14\4\uffff\1\15",
@@ -17514,67 +17196,80 @@
             "\1\20",
             "",
             "",
-            "\1\21\3\uffff\1\23\24\uffff\1\22",
+            "\1\21\3\uffff\1\23\32\uffff\1\22",
             "\1\24",
             "",
-            "\1\10\3\uffff\1\25\24\uffff\1\11",
-            "\1\25\24\uffff\1\11",
+            "\1\10\3\uffff\1\25\32\uffff\1\11",
+            "\1\25\32\uffff\1\11",
             "\1\26",
             "\1\27",
             "\1\30\4\uffff\1\31\1\uffff\1\32",
-            "\1\33\3\uffff\1\35\24\uffff\1\34",
+            "\1\33\3\uffff\1\35\32\uffff\1\34",
             "\1\36\4\uffff\1\37\1\uffff\1\40",
-            "\1\21\3\uffff\1\23\24\uffff\1\22",
-            "\1\23\24\uffff\1\22",
-            "\1\45\1\44\3\uffff\1\42\3\uffff\1\41\7\uffff\1\46\1\47\1\50"+
-            "\1\51\1\52\1\53\1\54\2\uffff\1\43",
+            "\1\21\3\uffff\1\23\32\uffff\1\22",
+            "\1\23\32\uffff\1\22",
+            "\1\44\1\43\3\uffff\1\54\3\uffff\1\41\15\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\7\uffff\1\70\1\71\1\72"+
+            "\1\67\1\66\3\uffff\1\77\3\uffff\1\64\15\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",
+            "\156\102\1\103\1\104\15\102",
+            "\1\105",
+            "\1\106\3\uffff\1\107\1\114\6\uffff\1\112\1\110\17\uffff\1\115"+
+            "\1\111\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\116\3\uffff\1\107\1\117\6\uffff\1\112\1\110\20\uffff\1\111"+
+            "\1\113",
+            "\1\120",
             "\1\uffff",
-            "\156\103\1\104\1\105\15\103",
-            "\1\106",
-            "\1\107\3\uffff\1\110\1\111\5\uffff\2\110\12\uffff\1\112\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\115",
             "",
             "",
-            "\1\33\3\uffff\1\35\24\uffff\1\34",
-            "\1\35\24\uffff\1\34",
-            "\1\121\1\120\3\uffff\1\131\3\uffff\1\116\7\uffff\1\122\1\123"+
-            "\1\124\1\125\1\126\1\127\1\130\2\uffff\1\117",
+            "\1\33\3\uffff\1\35\32\uffff\1\34",
+            "\1\35\32\uffff\1\34",
+            "\1\126\1\125\3\uffff\1\123\3\uffff\1\122\15\uffff\1\127\1\130"+
+            "\1\131\1\132\1\133\1\134\1\135\2\uffff\1\124",
             "\1\uffff",
-            "\1\133\6\uffff\1\135\5\uffff\1\134",
-            "\1\136",
-            "\156\137\1\140\1\141\15\137",
+            "\1\137\6\uffff\1\141\6\uffff\1\140",
             "\1\142",
-            "\1\144\3\uffff\1\145\1\143\5\uffff\2\145\12\uffff\1\146\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\151",
+            "\156\143\1\144\1\145\15\143",
+            "\1\146",
+            "\1\147\3\uffff\1\150\1\155\6\uffff\1\153\1\151\17\uffff\1\156"+
+            "\1\152\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\157\3\uffff\1\150\1\160\6\uffff\1\153\1\151\20\uffff\1\152"+
+            "\1\154",
+            "\1\161",
             "\1\uffff",
             "",
-            "\1\155\1\154\3\uffff\1\165\1\171\1\32\5\uffff\1\170\1\167\1"+
-            "\uffff\1\166\1\156\1\157\1\160\1\161\1\162\1\163\1\164\2\uffff"+
-            "\1\153",
-            "",
-            "\156\103\1\104\1\105\15\103",
+            "\1\165\1\164\3\uffff\1\175\1\u0081\1\32\6\uffff\1\u0080\1\177"+
+            "\6\uffff\1\176\1\166\1\167\1\170\1\171\1\172\1\173\1\174\2\uffff"+
+            "\1\163",
+            "\156\102\1\103\1\104\15\102",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17589,6 +17284,7 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -17597,6 +17293,10 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -17613,6 +17313,10 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -17631,978 +17335,760 @@
             "\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[] DFA52_eot = DFA.unpackEncodedString(DFA52_eotS);
+    static final short[] DFA52_eof = DFA.unpackEncodedString(DFA52_eofS);
+    static final char[] DFA52_min = DFA.unpackEncodedStringToUnsignedChars(DFA52_minS);
+    static final char[] DFA52_max = DFA.unpackEncodedStringToUnsignedChars(DFA52_maxS);
+    static final short[] DFA52_accept = DFA.unpackEncodedString(DFA52_acceptS);
+    static final short[] DFA52_special = DFA.unpackEncodedString(DFA52_specialS);
+    static final short[][] DFA52_transition;
 
     static {
-        int numStates = DFA53_transitionS.length;
-        DFA53_transition = new short[numStates][];
+        int numStates = DFA52_transitionS.length;
+        DFA52_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA53_transition[i] = DFA.unpackEncodedString(DFA53_transitionS[i]);
+            DFA52_transition[i] = DFA.unpackEncodedString(DFA52_transitionS[i]);
         }
     }
 
-    class DFA53 extends DFA {
+    class DFA52 extends DFA {
 
-        public DFA53(BaseRecognizer recognizer) {
+        public DFA52(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 = 52;
+            this.eot = DFA52_eot;
+            this.eof = DFA52_eof;
+            this.min = DFA52_min;
+            this.max = DFA52_max;
+            this.accept = DFA52_accept;
+            this.special = DFA52_special;
+            this.transition = DFA52_transition;
         }
         public String getDescription() {
-            return "602:10: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "782:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA53_3 = input.LA(1);
+                        int LA52_63 = input.LA(1);
 
                          
-                        int index53_3 = input.index();
+                        int index52_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 10;}
+                        else if ( (true) ) {s = 114;}
 
                          
-                        input.seek(index53_3);
+                        input.seek(index52_63);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA53_26 = input.LA(1);
+                        int LA52_4 = input.LA(1);
 
                          
-                        int index53_26 = input.index();
+                        int index52_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 11;}
 
                          
-                        input.seek(index53_26);
+                        input.seek(index52_4);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA53_25 = input.LA(1);
+                        int LA52_31 = input.LA(1);
 
                          
-                        int index53_25 = input.index();
+                        int index52_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 64;}
 
                          
-                        input.seek(index53_25);
+                        input.seek(index52_31);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA53_4 = input.LA(1);
+                        int LA52_44 = input.LA(1);
 
                          
-                        int index53_4 = input.index();
+                        int index52_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (true) ) {s = 81;}
 
                          
-                        input.seek(index53_4);
+                        input.seek(index52_44);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA53_34 = input.LA(1);
+                        int LA52_2 = input.LA(1);
 
                          
-                        int index53_34 = input.index();
+                        int index52_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (LA52_2==COLON) ) {s = 5;}
 
-                        else if ( (true) ) {s = 66;}
+                        else if ( (LA52_2==LEFT_PAREN) ) {s = 6;}
 
+                        else if ( (LA52_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.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierK!
 ey(DroolsSoftKeywords.NOT)))||((synpred7()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))))) {s = 7;}
+
+                        else if ( (LA52_2==DOT) ) {s = 8;}
+
+                        else if ( (LA52_2==LEFT_SQUARE) ) {s = 9;}
+
                          
-                        input.seek(index53_34);
+                        input.seek(index52_2);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA53_31 = input.LA(1);
+                        int LA52_32 = input.LA(1);
 
                          
-                        int index53_31 = input.index();
+                        int index52_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_31);
+                        input.seek(index52_32);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA53_50 = input.LA(1);
+                        int LA52_25 = input.LA(1);
 
                          
-                        int index53_50 = input.index();
+                        int index52_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 90;}
+                        else if ( (true) ) {s = 45;}
 
                          
-                        input.seek(index53_50);
+                        input.seek(index52_25);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA53_2 = input.LA(1);
+                        int LA52_50 = input.LA(1);
 
                          
-                        int index53_2 = input.index();
+                        int index52_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA53_2==COLON) ) {s = 5;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (LA53_2==LEFT_PAREN) ) {s = 6;}
+                        else if ( (true) ) {s = 94;}
 
-                        else if ( (LA53_2==ID) && (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierK!
 ey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||((synpred6()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))))) {s = 7;}
-
-                        else if ( (LA53_2==DOT) ) {s = 8;}
-
-                        else if ( (LA53_2==LEFT_SQUARE) ) {s = 9;}
-
                          
-                        input.seek(index53_2);
+                        input.seek(index52_50);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA53_6 = input.LA(1);
+                        int LA52_6 = input.LA(1);
 
                          
-                        int index53_6 = input.index();
+                        int index52_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (((synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||synpred6()||(synpred6()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL))))) ) {s = 7;}
+                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS))))) ) {s = 7;}
 
                         else if ( (true) ) {s = 14;}
 
                          
-                        input.seek(index53_6);
+                        input.seek(index52_6);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA53_32 = input.LA(1);
+                        int LA52_26 = input.LA(1);
 
                          
-                        int index53_32 = input.index();
+                        int index52_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
                         else if ( (true) ) {s = 46;}
 
                          
-                        input.seek(index53_32);
+                        input.seek(index52_26);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA53_63 = input.LA(1);
+                        int LA52_3 = input.LA(1);
 
                          
-                        int index53_63 = input.index();
+                        int index52_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred6()) ) {s = 7;}
+                        if ( (synpred7()) ) {s = 7;}
 
-                        else if ( (true) ) {s = 106;}
+                        else if ( (true) ) {s = 10;}
 
                          
-                        input.seek(index53_63);
+                        input.seek(index52_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(), 52, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA54_eotS =
-        "\172\uffff";
-    static final String DFA54_eofS =
-        "\172\uffff";
-    static final String DFA54_minS =
-        "\3\130\2\0\1\130\1\0\1\uffff\1\130\1\163\2\uffff\1\131\1\130\1\uffff"+
-        "\1\131\1\135\1\130\1\163\1\130\1\131\1\130\1\131\1\135\1\130\2\0"+
-        "\1\130\1\163\2\130\2\0\1\130\1\0\1\4\11\130\2\uffff\1\131\1\135"+
-        "\1\130\1\0\2\130\1\4\11\130\1\0\1\uffff\1\130\1\uffff\1\4\26\0\1"+
-        "\uffff\17\0\1\uffff\17\0";
-    static final String DFA54_maxS =
-        "\2\135\1\162\2\0\1\135\1\0\1\uffff\1\130\1\163\2\uffff\1\162\1\130"+
-        "\1\uffff\2\162\1\130\1\163\1\137\1\162\1\137\3\162\2\0\1\130\1\163"+
-        "\1\137\1\162\2\0\1\130\1\0\1\u0080\1\130\7\161\1\130\2\uffff\3\162"+
-        "\1\0\1\145\1\130\1\u0080\1\130\7\161\1\130\1\0\1\uffff\1\162\1\uffff"+
-        "\1\u0080\26\0\1\uffff\17\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\1"+
-        "\uffff\1\3\27\uffff\1\3\17\uffff\1\3\17\uffff";
-    static final String DFA54_specialS =
-        "\2\uffff\1\10\1\11\1\1\1\uffff\1\2\22\uffff\1\4\1\0\4\uffff\1\6"+
-        "\1\7\1\uffff\1\3\17\uffff\1\5\14\uffff\1\12\72\uffff}>";
-    static final String[] DFA54_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\20\uffff\1\11",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\14\4\uffff\1\15",
-            "\1\uffff",
+    static final String DFA65_eotS =
+        "\25\uffff";
+    static final String DFA65_eofS =
+        "\25\uffff";
+    static final String DFA65_minS =
+        "\1\121\1\4\1\uffff\1\4\1\uffff\1\0\1\uffff\1\4\2\0\3\4\1\0\1\4\1"+
+        "\uffff\1\4\4\0";
+    static final String DFA65_maxS =
+        "\1\164\1\u0080\1\uffff\1\u0080\1\uffff\1\0\1\uffff\1\u0080\2\0\3"+
+        "\u0080\1\0\1\u0080\1\uffff\1\u0080\4\0";
+    static final String DFA65_acceptS =
+        "\2\uffff\1\2\1\uffff\1\1\1\uffff\1\1\10\uffff\1\1\5\uffff";
+    static final String DFA65_specialS =
+        "\1\uffff\1\10\1\uffff\1\3\1\uffff\1\7\1\uffff\1\1\1\5\1\2\1\6\1"+
+        "\13\1\0\1\4\1\12\1\uffff\1\11\4\uffff}>";
+    static final String[] DFA65_transitionS = {
+            "\3\2\1\uffff\1\2\1\uffff\1\1\2\2\6\uffff\2\2\3\uffff\1\2\16"+
+            "\uffff\1\2",
+            "\116\4\1\3\4\4\1\5\1\4\1\6\47\4",
             "",
-            "\1\17",
-            "\1\20",
+            "\116\4\1\11\1\12\3\4\1\10\1\4\1\6\1\4\1\7\26\4\1\13\16\4",
             "",
-            "",
-            "\1\21\3\uffff\1\23\24\uffff\1\22",
-            "\1\24",
-            "",
-            "\1\10\3\uffff\1\25\24\uffff\1\11",
-            "\1\25\24\uffff\1\11",
-            "\1\26",
-            "\1\27",
-            "\1\30\4\uffff\1\31\1\uffff\1\32",
-            "\1\33\3\uffff\1\35\24\uffff\1\34",
-            "\1\36\4\uffff\1\37\1\uffff\1\40",
-            "\1\21\3\uffff\1\23\24\uffff\1\22",
-            "\1\23\24\uffff\1\22",
-            "\1\45\1\44\3\uffff\1\42\3\uffff\1\41\7\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\7\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",
-            "\1\106",
-            "\1\107\3\uffff\1\110\1\111\5\uffff\2\110\12\uffff\1\112\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\113\3\uffff\1\110\1\114\5\uffff\2\110\13\uffff\2\110",
-            "\1\115",
             "",
-            "",
-            "\1\33\3\uffff\1\35\24\uffff\1\34",
-            "\1\35\24\uffff\1\34",
-            "\1\121\1\120\3\uffff\1\131\3\uffff\1\116\7\uffff\1\122\1\123"+
-            "\1\124\1\125\1\126\1\127\1\130\2\uffff\1\117",
+            "\116\4\1\14\4\4\1\15\1\4\1\6\47\4",
             "\1\uffff",
-            "\1\133\6\uffff\1\135\5\uffff\1\134",
-            "\1\136",
-            "\156\137\1\140\1\141\15\137",
-            "\1\142",
-            "\1\144\3\uffff\1\145\1\143\5\uffff\2\145\12\uffff\1\146\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\147\3\uffff\1\145\1\150\5\uffff\2\145\13\uffff\2\145",
-            "\1\151",
             "\1\uffff",
-            "",
-            "\1\155\1\154\3\uffff\1\165\1\171\1\32\5\uffff\1\170\1\167\1"+
-            "\uffff\1\166\1\156\1\157\1\160\1\161\1\162\1\163\1\164\2\uffff"+
-            "\1\153",
-            "",
-            "\156\103\1\104\1\105\15\103",
+            "\116\4\1\16\4\4\1\17\1\4\1\6\47\4",
+            "\123\4\1\17\1\4\1\6\31\4\1\20\15\4",
+            "\117\4\1\21\3\4\1\23\1\4\1\6\30\4\1\22\16\4",
             "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
+            "\117\4\1\12\3\4\1\24\1\4\1\6\30\4\1\13\16\4",
             "",
+            "\123\4\1\24\1\4\1\6\30\4\1\13\16\4",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
             "\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[] DFA65_eot = DFA.unpackEncodedString(DFA65_eotS);
+    static final short[] DFA65_eof = DFA.unpackEncodedString(DFA65_eofS);
+    static final char[] DFA65_min = DFA.unpackEncodedStringToUnsignedChars(DFA65_minS);
+    static final char[] DFA65_max = DFA.unpackEncodedStringToUnsignedChars(DFA65_maxS);
+    static final short[] DFA65_accept = DFA.unpackEncodedString(DFA65_acceptS);
+    static final short[] DFA65_special = DFA.unpackEncodedString(DFA65_specialS);
+    static final short[][] DFA65_transition;
 
     static {
-        int numStates = DFA54_transitionS.length;
-        DFA54_transition = new short[numStates][];
+        int numStates = DFA65_transitionS.length;
+        DFA65_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
+            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
         }
     }
 
-    class DFA54 extends DFA {
+    class DFA65 extends DFA {
 
-        public DFA54(BaseRecognizer recognizer) {
+        public DFA65(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 = 65;
+            this.eot = DFA65_eot;
+            this.eof = DFA65_eof;
+            this.min = DFA65_min;
+            this.max = DFA65_max;
+            this.accept = DFA65_accept;
+            this.special = DFA65_special;
+            this.transition = DFA65_transition;
         }
         public String getDescription() {
-            return "615:3: ( ( LEFT_PAREN ( or_key | and_key ) )=> lhs_or | LEFT_PAREN lhs_or RIGHT_PAREN | lhs_pattern )";
+            return "928:3: ( ( LEFT_PAREN )=>args= paren_chunk )?";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA54_26 = input.LA(1);
+                        int LA65_12 = input.LA(1);
 
                          
-                        int index54_26 = input.index();
+                        int index65_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_12==DOT) ) {s = 17;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (LA65_12==LEFT_SQUARE) ) {s = 18;}
 
+                        else if ( (LA65_12==LEFT_PAREN) ) {s = 19;}
+
+                        else if ( (LA65_12==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( ((LA65_12>=VT_COMPILATION_UNIT && LA65_12<=ID)||(LA65_12>=DOT_STAR && LA65_12<=STRING)||LA65_12==COMMA||(LA65_12>=AT && LA65_12<=NULL)||(LA65_12>=RIGHT_SQUARE && LA65_12<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
+
                          
-                        input.seek(index54_26);
+                        input.seek(index65_12);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA54_4 = input.LA(1);
+                        int LA65_7 = input.LA(1);
 
                          
-                        int index54_4 = input.index();
+                        int index65_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_7==ID) ) {s = 12;}
 
-                        else if ( (true) ) {s = 11;}
+                        else if ( (LA65_7==LEFT_PAREN) ) {s = 13;}
 
+                        else if ( (LA65_7==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( ((LA65_7>=VT_COMPILATION_UNIT && LA65_7<=SEMICOLON)||(LA65_7>=DOT && LA65_7<=STRING)||LA65_7==COMMA||(LA65_7>=AT && LA65_7<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
+
                          
-                        input.seek(index54_4);
+                        input.seek(index65_7);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA54_6 = input.LA(1);
+                        int LA65_9 = input.LA(1);
 
                          
-                        int index54_6 = input.index();
+                        int index65_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.FORALL)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||synpred7()||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EVAL))))) ) {s = 7;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 14;}
+                        else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index54_6);
+                        input.seek(index65_9);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA54_34 = input.LA(1);
+                        int LA65_3 = input.LA(1);
 
                          
-                        int index54_34 = input.index();
+                        int index65_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_3==COLON) ) {s = 7;}
 
-                        else if ( (true) ) {s = 66;}
+                        else if ( (LA65_3==LEFT_PAREN) ) {s = 8;}
 
+                        else if ( (LA65_3==ID) ) {s = 9;}
+
+                        else if ( (LA65_3==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( (LA65_3==DOT) ) {s = 10;}
+
+                        else if ( (LA65_3==LEFT_SQUARE) ) {s = 11;}
+
+                        else if ( ((LA65_3>=VT_COMPILATION_UNIT && LA65_3<=SEMICOLON)||(LA65_3>=DOT_STAR && LA65_3<=STRING)||LA65_3==COMMA||LA65_3==AT||(LA65_3>=EQUALS && LA65_3<=NULL)||(LA65_3>=RIGHT_SQUARE && LA65_3<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
+
                          
-                        input.seek(index54_34);
+                        input.seek(index65_3);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA54_25 = input.LA(1);
+                        int LA65_13 = input.LA(1);
 
                          
-                        int index54_25 = input.index();
+                        int index65_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred8()) ) {s = 15;}
 
-                        else if ( (true) ) {s = 45;}
+                        else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index54_25);
+                        input.seek(index65_13);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA54_50 = input.LA(1);
+                        int LA65_8 = input.LA(1);
 
                          
-                        int index54_50 = input.index();
+                        int index65_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 90;}
+                        else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index54_50);
+                        input.seek(index65_8);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA54_31 = input.LA(1);
+                        int LA65_10 = input.LA(1);
 
                          
-                        int index54_31 = input.index();
+                        int index65_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_10==ID) ) {s = 14;}
 
-                        else if ( (true) ) {s = 64;}
+                        else if ( (LA65_10==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
+                        else if ( ((LA65_10>=VT_COMPILATION_UNIT && LA65_10<=SEMICOLON)||(LA65_10>=DOT && LA65_10<=STRING)||LA65_10==COMMA||(LA65_10>=AT && LA65_10<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
+
+                        else if ( (LA65_10==LEFT_PAREN) && (synpred8())) {s = 15;}
+
                          
-                        input.seek(index54_31);
+                        input.seek(index65_10);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA54_32 = input.LA(1);
+                        int LA65_5 = input.LA(1);
 
                          
-                        int index54_32 = input.index();
+                        int index65_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (synpred8()) ) {s = 6;}
 
-                        else if ( (true) ) {s = 46;}
+                        else if ( (true) ) {s = 2;}
 
                          
-                        input.seek(index54_32);
+                        input.seek(index65_5);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA54_2 = input.LA(1);
+                        int LA65_1 = input.LA(1);
 
                          
-                        int index54_2 = input.index();
+                        int index65_1 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_2==COLON) ) {s = 5;}
+                        if ( (LA65_1==ID) ) {s = 3;}
 
-                        else if ( (LA54_2==LEFT_PAREN) ) {s = 6;}
+                        else if ( ((LA65_1>=VT_COMPILATION_UNIT && LA65_1<=SEMICOLON)||(LA65_1>=DOT && LA65_1<=STRING)||LA65_1==COMMA||(LA65_1>=AT && LA65_1<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
 
-                        else if ( (LA54_2==ID) && (((synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(!
 DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))||((synpred7()&&validateNotWithBinding())&&(validateIdentifierKey(DroolsSoftKeywords.NOT)))||(synpred7()&&(validateIdentifierKey(DroolsSoftKeywords.EXISTS)))))) {s = 7;}
+                        else if ( (LA65_1==LEFT_PAREN) ) {s = 5;}
 
-                        else if ( (LA54_2==DOT) ) {s = 8;}
+                        else if ( (LA65_1==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                        else if ( (LA54_2==LEFT_SQUARE) ) {s = 9;}
-
                          
-                        input.seek(index54_2);
+                        input.seek(index65_1);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA54_3 = input.LA(1);
+                        int LA65_16 = input.LA(1);
 
                          
-                        int index54_3 = input.index();
+                        int index65_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_16==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (true) ) {s = 10;}
+                        else if ( (LA65_16==LEFT_SQUARE) ) {s = 11;}
 
+                        else if ( (LA65_16==RIGHT_PAREN) && (synpred8())) {s = 6;}
+
+                        else if ( ((LA65_16>=VT_COMPILATION_UNIT && LA65_16<=STRING)||LA65_16==COMMA||(LA65_16>=AT && LA65_16<=NULL)||(LA65_16>=RIGHT_SQUARE && LA65_16<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
+
                          
-                        input.seek(index54_3);
+                        input.seek(index65_16);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA54_63 = input.LA(1);
+                        int LA65_14 = input.LA(1);
 
                          
-                        int index54_63 = input.index();
+                        int index65_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 7;}
+                        if ( (LA65_14==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                        else if ( (true) ) {s = 106;}
+                        else if ( (LA65_14==LEFT_SQUARE) ) {s = 11;}
 
-                         
-                        input.seek(index54_63);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (backtracking>0) {failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 54, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA61_eotS =
-        "\13\uffff";
-    static final String DFA61_eofS =
-        "\13\uffff";
-    static final String DFA61_minS =
-        "\1\130\1\135\2\4\1\0\1\130\1\0\4\uffff";
-    static final String DFA61_maxS =
-        "\1\130\1\135\2\u0080\1\0\1\137\1\0\4\uffff";
-    static final String DFA61_acceptS =
-        "\7\uffff\1\1\2\2\1\1";
-    static final String DFA61_specialS =
-        "\4\uffff\1\2\1\0\1\1\4\uffff}>";
-    static final String[] DFA61_transitionS = {
-            "\1\1",
-            "\1\2",
-            "\131\3\1\4\1\3\1\5\41\3",
-            "\131\3\1\6\1\3\1\5\41\3",
-            "\1\uffff",
-            "\1\12\5\uffff\1\12\1\11",
-            "\1\uffff",
-            "",
-            "",
-            "",
-            ""
-    };
+                        else if ( (LA65_14==LEFT_PAREN) ) {s = 20;}
 
-    static final short[] DFA61_eot = DFA.unpackEncodedString(DFA61_eotS);
-    static final short[] DFA61_eof = DFA.unpackEncodedString(DFA61_eofS);
-    static final char[] DFA61_min = DFA.unpackEncodedStringToUnsignedChars(DFA61_minS);
-    static final char[] DFA61_max = DFA.unpackEncodedStringToUnsignedChars(DFA61_maxS);
-    static final short[] DFA61_accept = DFA.unpackEncodedString(DFA61_acceptS);
-    static final short[] DFA61_special = DFA.unpackEncodedString(DFA61_specialS);
-    static final short[][] DFA61_transition;
+                        else if ( (LA65_14==DOT) ) {s = 10;}
 
-    static {
-        int numStates = DFA61_transitionS.length;
-        DFA61_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA61_transition[i] = DFA.unpackEncodedString(DFA61_transitionS[i]);
-        }
-    }
+                        else if ( ((LA65_14>=VT_COMPILATION_UNIT && LA65_14<=ID)||(LA65_14>=DOT_STAR && LA65_14<=STRING)||LA65_14==COMMA||(LA65_14>=AT && LA65_14<=NULL)||(LA65_14>=RIGHT_SQUARE && LA65_14<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
 
-    class DFA61 extends DFA {
-
-        public DFA61(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 61;
-            this.eot = DFA61_eot;
-            this.eof = DFA61_eof;
-            this.min = DFA61_min;
-            this.max = DFA61_max;
-            this.accept = DFA61_accept;
-            this.special = DFA61_special;
-            this.transition = DFA61_transition;
-        }
-        public String getDescription() {
-            return "659:3: ( accumulate_init_clause | accumulate_id_clause )";
-        }
-        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA61_5 = input.LA(1);
-
                          
-                        int index61_5 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA61_5==RIGHT_PAREN) ) {s = 9;}
-
-                        else if ( (LA61_5==ID||LA61_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.INIT)))) {s = 10;}
-
-                         
-                        input.seek(index61_5);
+                        input.seek(index65_14);
                         if ( s>=0 ) return s;
                         break;
-                    case 1 : 
-                        int LA61_6 = input.LA(1);
+                    case 11 : 
+                        int LA65_11 = input.LA(1);
 
                          
-                        int index61_6 = input.index();
+                        int index65_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.INIT))) ) {s = 10;}
+                        if ( (LA65_11==RIGHT_SQUARE) ) {s = 16;}
 
-                        else if ( (true) ) {s = 9;}
+                        else if ( (LA65_11==RIGHT_PAREN) && (synpred8())) {s = 6;}
 
-                         
-                        input.seek(index61_6);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA61_4 = input.LA(1);
+                        else if ( ((LA65_11>=VT_COMPILATION_UNIT && LA65_11<=STRING)||LA65_11==COMMA||(LA65_11>=AT && LA65_11<=LEFT_SQUARE)||(LA65_11>=THEN && LA65_11<=MULTI_LINE_COMMENT)) && (synpred8())) {s = 4;}
 
-                         
-                        int index61_4 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.INIT))) ) {s = 7;}
+                        else if ( (LA65_11==LEFT_PAREN) && (synpred8())) {s = 15;}
 
-                        else if ( (true) ) {s = 8;}
-
                          
-                        input.seek(index61_4);
+                        input.seek(index65_11);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 61, _s, input);
+                new NoViableAltException(getDescription(), 65, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA65_eotS =
-        "\13\uffff";
-    static final String DFA65_eofS =
-        "\13\uffff";
-    static final String DFA65_minS =
-        "\1\130\1\135\2\4\1\0\1\130\1\0\4\uffff";
-    static final String DFA65_maxS =
-        "\1\130\1\135\2\u0080\1\0\1\137\1\0\4\uffff";
-    static final String DFA65_acceptS =
-        "\7\uffff\1\1\2\2\1\1";
-    static final String DFA65_specialS =
-        "\1\5\1\4\1\2\1\6\1\0\1\1\1\3\4\uffff}>";
-    static final String[] DFA65_transitionS = {
-            "\1\1",
-            "\1\2",
-            "\131\3\1\4\1\3\1\5\41\3",
-            "\131\3\1\6\1\3\1\5\41\3",
-            "\1\uffff",
-            "\1\12\5\uffff\1\12\1\11",
-            "\1\uffff",
+    static final String DFA80_eotS =
+        "\40\uffff";
+    static final String DFA80_eofS =
+        "\40\uffff";
+    static final String DFA80_minS =
+        "\1\130\1\uffff\2\122\1\uffff\1\0\2\122\1\0\1\4\6\0\1\162\1\4\2\0"+
+        "\1\4\13\0";
+    static final String DFA80_maxS =
+        "\1\141\1\uffff\1\157\1\162\1\uffff\1\0\1\162\1\122\1\0\1\u0080\6"+
+        "\0\1\162\1\u0080\2\0\1\u0080\13\0";
+    static final String DFA80_acceptS =
+        "\1\uffff\1\2\2\uffff\1\1\33\uffff";
+    static final String DFA80_specialS =
+        "\2\uffff\1\6\1\0\1\uffff\1\10\1\2\1\uffff\1\14\1\uffff\1\5\1\3\1"+
+        "\12\1\4\1\11\1\1\2\uffff\1\13\1\7\14\uffff}>";
+    static final String[] DFA80_transitionS = {
+            "\2\1\6\uffff\1\2\1\1",
             "",
+            "\1\3\4\uffff\1\5\21\uffff\7\4",
+            "\1\6\1\1\2\uffff\1\4\1\10\3\uffff\1\1\2\uffff\2\4\11\uffff\6"+
+            "\1\1\7\2\4\1\1",
             "",
-            "",
-            ""
+            "\1\uffff",
+            "\1\12\1\4\2\uffff\1\13\1\11\2\4\4\uffff\1\16\1\14\2\4\15\uffff"+
+            "\1\1\1\15\1\17\1\4",
+            "\1\20",
+            "\1\uffff",
+            "\116\31\1\21\3\31\1\24\1\22\1\31\1\23\4\31\1\27\1\25\20\31\1"+
+            "\26\1\30\17\31",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\32",
+            "\117\31\1\34\3\31\1\37\1\35\1\36\30\31\1\33\16\31",
+            "\1\uffff",
+            "\1\uffff",
+            "\123\31\1\37\1\35\1\36\47\31",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff"
     };
 
-    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[] DFA80_eot = DFA.unpackEncodedString(DFA80_eotS);
+    static final short[] DFA80_eof = DFA.unpackEncodedString(DFA80_eofS);
+    static final char[] DFA80_min = DFA.unpackEncodedStringToUnsignedChars(DFA80_minS);
+    static final char[] DFA80_max = DFA.unpackEncodedStringToUnsignedChars(DFA80_maxS);
+    static final short[] DFA80_accept = DFA.unpackEncodedString(DFA80_acceptS);
+    static final short[] DFA80_special = DFA.unpackEncodedString(DFA80_specialS);
+    static final short[][] DFA80_transition;
 
     static {
-        int numStates = DFA65_transitionS.length;
-        DFA65_transition = new short[numStates][];
+        int numStates = DFA80_transitionS.length;
+        DFA80_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA65_transition[i] = DFA.unpackEncodedString(DFA65_transitionS[i]);
+            DFA80_transition[i] = DFA.unpackEncodedString(DFA80_transitionS[i]);
         }
     }
 
-    class DFA65 extends DFA {
+    class DFA80 extends DFA {
 
-        public DFA65(BaseRecognizer recognizer) {
+        public DFA80(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 = 80;
+            this.eot = DFA80_eot;
+            this.eof = DFA80_eof;
+            this.min = DFA80_min;
+            this.max = DFA80_max;
+            this.accept = DFA80_accept;
+            this.special = DFA80_special;
+            this.transition = DFA80_transition;
         }
         public String getDescription() {
-            return "670:2: ( reverse_key pc3= paren_chunk ( COMMA )? )?";
+            return "()* loopback of 1046:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA65_4 = input.LA(1);
+                        int LA80_3 = input.LA(1);
 
                          
-                        int index65_4 = input.index();
+                        int index80_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 7;}
+                        if ( (LA80_3==DOT||LA80_3==COLON||(LA80_3>=EQUAL && LA80_3<=NOT_EQUAL)||LA80_3==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 8;}
+                        else if ( (LA80_3==ID) ) {s = 6;}
 
+                        else if ( (LA80_3==GRAVE_ACCENT) ) {s = 7;}
+
+                        else if ( (LA80_3==STRING||(LA80_3>=BOOL && LA80_3<=INT)||(LA80_3>=FLOAT && LA80_3<=NULL)) && ((validateRestr()))) {s = 4;}
+
+                        else if ( (LA80_3==LEFT_PAREN) ) {s = 8;}
+
                          
-                        input.seek(index65_4);
+                        input.seek(index80_3);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA65_5 = input.LA(1);
+                        int LA80_15 = input.LA(1);
 
                          
-                        int index65_5 = input.index();
+                        int index80_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_5==RIGHT_PAREN) && ((validateIdentifierKey(DroolsSoftKeywords.RESULT)))) {s = 9;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA65_5==ID||LA65_5==COMMA) && ((validateIdentifierKey(DroolsSoftKeywords.REVERSE)))) {s = 10;}
+                        else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_5);
+                        input.seek(index80_15);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA65_2 = input.LA(1);
+                        int LA80_6 = input.LA(1);
 
                          
-                        int index65_2 = input.index();
+                        int index80_6 = 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 ( (LA80_6==LEFT_PAREN) ) {s = 9;}
 
-                        else if ( (LA65_2==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 4;}
+                        else if ( (LA80_6==ID) ) {s = 10;}
 
-                        else if ( (LA65_2==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+                        else if ( (LA80_6==STRING) ) {s = 11;}
 
+                        else if ( (LA80_6==INT) ) {s = 12;}
+
+                        else if ( (LA80_6==FLOAT) ) {s = 13;}
+
+                        else if ( (LA80_6==BOOL) ) {s = 14;}
+
+                        else if ( (LA80_6==NULL) ) {s = 15;}
+
+                        else if ( (LA80_6==GRAVE_ACCENT) ) {s = 1;}
+
+                        else if ( (LA80_6==DOT||(LA80_6>=COMMA && LA80_6<=RIGHT_PAREN)||(LA80_6>=DOUBLE_PIPE && LA80_6<=DOUBLE_AMPER)||LA80_6==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
+
                          
-                        input.seek(index65_2);
+                        input.seek(index80_6);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA65_6 = input.LA(1);
+                        int LA80_11 = input.LA(1);
 
                          
-                        int index65_6 = input.index();
+                        int index80_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateIdentifierKey(DroolsSoftKeywords.REVERSE))) ) {s = 10;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( ((validateIdentifierKey(DroolsSoftKeywords.RESULT))) ) {s = 9;}
+                        else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index65_6);
+                        input.seek(index80_11);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA65_1 = input.LA(1);
+                        int LA80_13 = input.LA(1);
 
                          
-                        int index65_1 = input.index();
+                        int index80_13 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_1==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 2;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
+                        else if ( (true) ) {s = 1;}
+
                          
-                        input.seek(index65_1);
+                        input.seek(index80_13);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA65_0 = input.LA(1);
+                        int LA80_10 = input.LA(1);
 
                          
-                        int index65_0 = input.index();
+                        int index80_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_0==ID) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
+                        else if ( (true) ) {s = 1;}
+
                          
-                        input.seek(index65_0);
+                        input.seek(index80_10);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA65_3 = input.LA(1);
+                        int LA80_2 = input.LA(1);
 
                          
-                        int index65_3 = input.index();
+                        int index80_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA65_3==RIGHT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 5;}
+                        if ( (LA80_2==ID) ) {s = 3;}
 
-                        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 ( ((LA80_2>=EQUAL && LA80_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
-                        else if ( (LA65_3==LEFT_PAREN) && (((validateIdentifierKey(DroolsSoftKeywords.REVERSE))||(validateIdentifierKey(DroolsSoftKeywords.RESULT))))) {s = 6;}
+                        else if ( (LA80_2==LEFT_PAREN) ) {s = 5;}
 
                          
-                        input.seek(index65_3);
+                        input.seek(index80_2);
                         if ( s>=0 ) return s;
                         break;
-            }
-            if (backtracking>0) {failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 65, _s, input);
-            error(nvae);
-            throw nvae;
-        }
-    }
-    static final String DFA82_eotS =
-        "\30\uffff";
-    static final String DFA82_eofS =
-        "\30\uffff";
-    static final String DFA82_minS =
-        "\1\136\1\uffff\2\130\1\uffff\2\0\2\130\2\0\1\4\1\162\2\4\11\0";
-    static final String DFA82_maxS =
-        "\1\146\1\uffff\1\157\1\162\1\uffff\2\0\1\162\1\130\2\0\1\u0080\1"+
-        "\162\2\u0080\11\0";
-    static final String DFA82_acceptS =
-        "\1\uffff\1\2\2\uffff\1\1\23\uffff";
-    static final String DFA82_specialS =
-        "\2\uffff\1\5\1\6\1\uffff\1\3\1\4\1\0\1\uffff\1\1\1\2\15\uffff}>";
-    static final String[] DFA82_transitionS = {
-            "\2\1\5\uffff\1\2\1\1",
-            "",
-            "\1\3\4\uffff\1\5\13\uffff\7\4",
-            "\1\7\1\1\2\uffff\1\4\1\6\3\uffff\1\1\1\uffff\2\4\4\uffff\6\1"+
-            "\1\10\2\4\1\1",
-            "",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\11\1\4\2\uffff\1\12\1\13\2\4\3\uffff\2\12\2\4\10\uffff\1"+
-            "\1\2\12\1\4",
-            "\1\14",
-            "\1\uffff",
-            "\1\uffff",
-            "\124\20\1\15\3\20\1\16\1\17\1\20\1\21\3\20\2\16\13\20\2\16\17"+
-            "\20",
-            "\1\22",
-            "\125\20\1\26\3\20\1\25\1\27\1\23\22\20\1\24\16\20",
-            "\131\20\1\25\1\27\1\23\41\20",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff"
-    };
+                    case 7 : 
+                        int LA80_19 = input.LA(1);
 
-    static final short[] DFA82_eot = DFA.unpackEncodedString(DFA82_eotS);
-    static final short[] DFA82_eof = DFA.unpackEncodedString(DFA82_eofS);
-    static final char[] DFA82_min = DFA.unpackEncodedStringToUnsignedChars(DFA82_minS);
-    static final char[] DFA82_max = DFA.unpackEncodedStringToUnsignedChars(DFA82_maxS);
-    static final short[] DFA82_accept = DFA.unpackEncodedString(DFA82_acceptS);
-    static final short[] DFA82_special = DFA.unpackEncodedString(DFA82_specialS);
-    static final short[][] DFA82_transition;
-
-    static {
-        int numStates = DFA82_transitionS.length;
-        DFA82_transition = new short[numStates][];
-        for (int i=0; i<numStates; i++) {
-            DFA82_transition[i] = DFA.unpackEncodedString(DFA82_transitionS[i]);
-        }
-    }
-
-    class DFA82 extends DFA {
-
-        public DFA82(BaseRecognizer recognizer) {
-            this.recognizer = recognizer;
-            this.decisionNumber = 82;
-            this.eot = DFA82_eot;
-            this.eof = DFA82_eof;
-            this.min = DFA82_min;
-            this.max = DFA82_max;
-            this.accept = DFA82_accept;
-            this.special = DFA82_special;
-            this.transition = DFA82_transition;
-        }
-        public String getDescription() {
-            return "()* loopback of 779:25: ({...}? => DOUBLE_PIPE and_restr_connective )*";
-        }
-        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA82_7 = input.LA(1);
-
                          
-                        int index82_7 = input.index();
+                        int index80_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA82_7==ID) ) {s = 9;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA82_7==STRING||(LA82_7>=BOOL && LA82_7<=INT)||(LA82_7>=FLOAT && LA82_7<=NULL)) ) {s = 10;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA82_7==LEFT_PAREN) ) {s = 11;}
-
-                        else if ( (LA82_7==GRAVE_ACCENT) ) {s = 1;}
-
-                        else if ( (LA82_7==DOT||(LA82_7>=COMMA && LA82_7<=RIGHT_PAREN)||(LA82_7>=DOUBLE_PIPE && LA82_7<=DOUBLE_AMPER)||LA82_7==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
-
                          
-                        input.seek(index82_7);
+                        input.seek(index80_19);
                         if ( s>=0 ) return s;
                         break;
-                    case 1 : 
-                        int LA82_9 = input.LA(1);
+                    case 8 : 
+                        int LA80_5 = input.LA(1);
 
                          
-                        int index82_9 = input.index();
+                        int index80_5 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18610,14 +18096,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_9);
+                        input.seek(index80_5);
                         if ( s>=0 ) return s;
                         break;
-                    case 2 : 
-                        int LA82_10 = input.LA(1);
+                    case 9 : 
+                        int LA80_14 = input.LA(1);
 
                          
-                        int index82_10 = input.index();
+                        int index80_14 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18625,14 +18111,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_10);
+                        input.seek(index80_14);
                         if ( s>=0 ) return s;
                         break;
-                    case 3 : 
-                        int LA82_5 = input.LA(1);
+                    case 10 : 
+                        int LA80_12 = input.LA(1);
 
                          
-                        int index82_5 = input.index();
+                        int index80_12 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18640,14 +18126,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_5);
+                        input.seek(index80_12);
                         if ( s>=0 ) return s;
                         break;
-                    case 4 : 
-                        int LA82_6 = input.LA(1);
+                    case 11 : 
+                        int LA80_18 = input.LA(1);
 
                          
-                        int index82_6 = input.index();
+                        int index80_18 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18655,100 +18141,71 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index82_6);
+                        input.seek(index80_18);
                         if ( s>=0 ) return s;
                         break;
-                    case 5 : 
-                        int LA82_2 = input.LA(1);
+                    case 12 : 
+                        int LA80_8 = input.LA(1);
 
                          
-                        int index82_2 = input.index();
+                        int index80_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA82_2==ID) ) {s = 3;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( ((LA82_2>=EQUAL && LA82_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA82_2==LEFT_PAREN) ) {s = 5;}
-
                          
-                        input.seek(index82_2);
+                        input.seek(index80_8);
                         if ( s>=0 ) return s;
                         break;
-                    case 6 : 
-                        int LA82_3 = input.LA(1);
-
-                         
-                        int index82_3 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA82_3==DOT||LA82_3==COLON||(LA82_3>=EQUAL && LA82_3<=NOT_EQUAL)||LA82_3==LEFT_SQUARE) ) {s = 1;}
-
-                        else if ( (LA82_3==LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (LA82_3==ID) ) {s = 7;}
-
-                        else if ( (LA82_3==STRING||(LA82_3>=BOOL && LA82_3<=INT)||(LA82_3>=FLOAT && LA82_3<=NULL)) && ((validateRestr()))) {s = 4;}
-
-                        else if ( (LA82_3==GRAVE_ACCENT) ) {s = 8;}
-
-                         
-                        input.seek(index82_3);
-                        if ( s>=0 ) return s;
-                        break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 82, _s, input);
+                new NoViableAltException(getDescription(), 80, _s, input);
             error(nvae);
             throw nvae;
         }
     }
-    static final String DFA83_eotS =
-        "\57\uffff";
-    static final String DFA83_eofS =
-        "\57\uffff";
-    static final String DFA83_minS =
-        "\1\136\1\uffff\2\130\1\uffff\3\130\1\4\1\130\1\0\1\4\2\0\1\162\1"+
-        "\4\2\0\3\4\32\0";
-    static final String DFA83_maxS =
-        "\1\146\1\uffff\1\157\1\162\1\uffff\1\157\1\162\1\130\1\u0080\1\162"+
-        "\1\0\1\u0080\2\0\1\162\1\u0080\2\0\3\u0080\32\0";
-    static final String DFA83_acceptS =
-        "\1\uffff\1\2\2\uffff\1\1\52\uffff";
-    static final String DFA83_specialS =
-        "\2\uffff\1\2\1\4\1\uffff\1\6\1\7\2\uffff\1\3\1\5\1\uffff\1\0\1\1"+
-        "\2\uffff\1\10\1\11\35\uffff}>";
-    static final String[] DFA83_transitionS = {
-            "\2\1\5\uffff\1\1\1\2",
+    static final String DFA81_eotS =
+        "\63\uffff";
+    static final String DFA81_eofS =
+        "\63\uffff";
+    static final String DFA81_minS =
+        "\1\130\1\uffff\2\122\1\uffff\1\122\1\4\3\122\1\0\1\4\2\0\2\4\43"+
+        "\0";
+    static final String DFA81_maxS =
+        "\1\141\1\uffff\1\157\1\162\1\uffff\1\157\1\u0080\1\162\1\122\1\162"+
+        "\1\0\1\u0080\2\0\2\u0080\43\0";
+    static final String DFA81_acceptS =
+        "\1\uffff\1\2\2\uffff\1\1\56\uffff";
+    static final String DFA81_specialS =
+        "\2\uffff\1\2\1\0\1\uffff\1\5\1\uffff\1\4\1\uffff\1\1\1\7\1\uffff"+
+        "\1\3\1\6\45\uffff}>";
+    static final String[] DFA81_transitionS = {
+            "\2\1\6\uffff\1\1\1\2",
             "",
-            "\1\3\4\uffff\1\5\13\uffff\7\4",
-            "\1\6\1\1\2\uffff\1\4\1\10\3\uffff\1\1\1\uffff\2\4\4\uffff\6"+
-            "\1\1\7\2\4\1\1",
+            "\1\3\4\uffff\1\5\21\uffff\7\4",
+            "\1\7\1\1\2\uffff\1\4\1\6\3\uffff\1\1\2\uffff\2\4\11\uffff\6"+
+            "\1\1\10\2\4\1\1",
             "",
-            "\1\11\4\uffff\1\12\13\uffff\7\4",
-            "\1\14\1\4\2\uffff\1\15\1\13\2\4\3\uffff\2\15\2\4\10\uffff\1"+
-            "\1\2\15\1\4",
-            "\1\16",
-            "\124\32\1\17\3\32\1\22\1\20\1\32\1\21\3\32\2\22\4\32\1\23\1"+
-            "\24\1\25\1\26\1\27\1\30\1\31\2\22\17\32",
-            "\1\33\1\1\2\uffff\1\4\1\35\3\uffff\1\1\1\uffff\2\4\4\uffff\6"+
-            "\1\1\34\2\4\1\1",
+            "\1\11\4\uffff\1\12\21\uffff\7\4",
+            "\116\32\1\13\3\32\1\16\1\14\1\32\1\15\4\32\1\21\1\17\11\32\1"+
+            "\23\1\24\1\25\1\26\1\27\1\30\1\31\1\20\1\22\17\32",
+            "\1\33\1\4\2\uffff\1\34\1\41\2\4\4\uffff\1\37\1\35\2\4\15\uffff"+
+            "\1\1\1\36\1\40\1\4",
+            "\1\42",
+            "\1\43\1\1\2\uffff\1\4\1\45\3\uffff\1\1\2\uffff\2\4\11\uffff"+
+            "\6\1\1\44\2\4\1\1",
             "\1\uffff",
-            "\124\42\1\36\3\42\1\41\1\37\1\42\1\40\3\42\2\41\13\42\2\41\17"+
-            "\42",
+            "\116\32\1\46\1\57\2\32\1\47\1\54\1\60\1\61\4\32\1\52\1\50\17"+
+            "\32\1\55\1\51\1\53\1\56\16\32",
             "\1\uffff",
             "\1\uffff",
-            "\1\43",
-            "\124\32\1\50\1\45\2\32\1\52\1\51\1\46\1\47\3\32\2\52\12\32\1"+
-            "\53\2\52\1\44\16\32",
+            "\123\32\1\62\1\60\1\61\47\32",
+            "\123\32\1\62\1\60\1\61\47\32",
             "\1\uffff",
             "\1\uffff",
-            "\131\32\1\54\1\46\1\47\41\32",
-            "\124\32\1\55\3\32\1\52\1\56\1\32\1\21\3\32\2\52\13\32\2\52\17"+
-            "\32",
-            "\124\32\1\55\3\32\1\52\1\56\1\32\1\21\3\32\2\52\13\32\2\52\17"+
-            "\32",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -18774,191 +18231,176 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
+            "\1\uffff",
             "\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[] DFA81_eot = DFA.unpackEncodedString(DFA81_eotS);
+    static final short[] DFA81_eof = DFA.unpackEncodedString(DFA81_eofS);
+    static final char[] DFA81_min = DFA.unpackEncodedStringToUnsignedChars(DFA81_minS);
+    static final char[] DFA81_max = DFA.unpackEncodedStringToUnsignedChars(DFA81_maxS);
+    static final short[] DFA81_accept = DFA.unpackEncodedString(DFA81_acceptS);
+    static final short[] DFA81_special = DFA.unpackEncodedString(DFA81_specialS);
+    static final short[][] DFA81_transition;
 
     static {
-        int numStates = DFA83_transitionS.length;
-        DFA83_transition = new short[numStates][];
+        int numStates = DFA81_transitionS.length;
+        DFA81_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA83_transition[i] = DFA.unpackEncodedString(DFA83_transitionS[i]);
+            DFA81_transition[i] = DFA.unpackEncodedString(DFA81_transitionS[i]);
         }
     }
 
-    class DFA83 extends DFA {
+    class DFA81 extends DFA {
 
-        public DFA83(BaseRecognizer recognizer) {
+        public DFA81(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 = 81;
+            this.eot = DFA81_eot;
+            this.eof = DFA81_eof;
+            this.min = DFA81_min;
+            this.max = DFA81_max;
+            this.accept = DFA81_accept;
+            this.special = DFA81_special;
+            this.transition = DFA81_transition;
         }
         public String getDescription() {
-            return "()* loopback of 783:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
+            return "()* loopback of 1052:26: ({...}? => DOUBLE_AMPER constraint_expression )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA83_12 = input.LA(1);
+                        int LA81_3 = input.LA(1);
 
                          
-                        int index83_12 = input.index();
+                        int index81_3 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA81_3==DOT||LA81_3==COLON||(LA81_3>=EQUAL && LA81_3<=NOT_EQUAL)||LA81_3==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA81_3==LEFT_PAREN) ) {s = 6;}
 
+                        else if ( (LA81_3==ID) ) {s = 7;}
+
+                        else if ( (LA81_3==GRAVE_ACCENT) ) {s = 8;}
+
+                        else if ( (LA81_3==STRING||(LA81_3>=BOOL && LA81_3<=INT)||(LA81_3>=FLOAT && LA81_3<=NULL)) && ((validateRestr()))) {s = 4;}
+
                          
-                        input.seek(index83_12);
+                        input.seek(index81_3);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA83_13 = input.LA(1);
+                        int LA81_9 = input.LA(1);
 
                          
-                        int index83_13 = input.index();
+                        int index81_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        if ( (LA81_9==DOT||LA81_9==COLON||(LA81_9>=EQUAL && LA81_9<=NOT_EQUAL)||LA81_9==LEFT_SQUARE) ) {s = 1;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA81_9==ID) ) {s = 35;}
 
+                        else if ( (LA81_9==GRAVE_ACCENT) ) {s = 36;}
+
+                        else if ( (LA81_9==LEFT_PAREN) ) {s = 37;}
+
+                        else if ( (LA81_9==STRING||(LA81_9>=BOOL && LA81_9<=INT)||(LA81_9>=FLOAT && LA81_9<=NULL)) && ((validateRestr()))) {s = 4;}
+
                          
-                        input.seek(index83_13);
+                        input.seek(index81_9);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA83_2 = input.LA(1);
+                        int LA81_2 = input.LA(1);
 
                          
-                        int index83_2 = input.index();
+                        int index81_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_2==ID) ) {s = 3;}
+                        if ( (LA81_2==ID) ) {s = 3;}
 
-                        else if ( ((LA83_2>=EQUAL && LA83_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
+                        else if ( ((LA81_2>=EQUAL && LA81_2<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
-                        else if ( (LA83_2==LEFT_PAREN) ) {s = 5;}
+                        else if ( (LA81_2==LEFT_PAREN) ) {s = 5;}
 
                          
-                        input.seek(index83_2);
+                        input.seek(index81_2);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA83_9 = input.LA(1);
+                        int LA81_12 = input.LA(1);
 
                          
-                        int index83_9 = input.index();
+                        int index81_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_9==DOT||LA83_9==COLON||(LA83_9>=EQUAL && LA83_9<=NOT_EQUAL)||LA83_9==LEFT_SQUARE) ) {s = 1;}
+                        if ( ((validateRestr())) ) {s = 4;}
 
-                        else if ( (LA83_9==ID) ) {s = 27;}
+                        else if ( (true) ) {s = 1;}
 
-                        else if ( (LA83_9==GRAVE_ACCENT) ) {s = 28;}
-
-                        else if ( (LA83_9==LEFT_PAREN) ) {s = 29;}
-
-                        else if ( (LA83_9==STRING||(LA83_9>=BOOL && LA83_9<=INT)||(LA83_9>=FLOAT && LA83_9<=NULL)) && ((validateRestr()))) {s = 4;}
-
                          
-                        input.seek(index83_9);
+                        input.seek(index81_12);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA83_3 = input.LA(1);
+                        int LA81_7 = input.LA(1);
 
                          
-                        int index83_3 = input.index();
+                        int index81_7 = 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 ( (LA81_7==DOT||(LA81_7>=COMMA && LA81_7<=RIGHT_PAREN)||(LA81_7>=DOUBLE_PIPE && LA81_7<=DOUBLE_AMPER)||LA81_7==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
 
-                        else if ( (LA83_3==ID) ) {s = 6;}
+                        else if ( (LA81_7==ID) ) {s = 27;}
 
-                        else if ( (LA83_3==GRAVE_ACCENT) ) {s = 7;}
+                        else if ( (LA81_7==STRING) ) {s = 28;}
 
-                        else if ( (LA83_3==LEFT_PAREN) ) {s = 8;}
+                        else if ( (LA81_7==INT) ) {s = 29;}
 
-                        else if ( (LA83_3==STRING||(LA83_3>=BOOL && LA83_3<=INT)||(LA83_3>=FLOAT && LA83_3<=NULL)) && ((validateRestr()))) {s = 4;}
+                        else if ( (LA81_7==FLOAT) ) {s = 30;}
 
-                         
-                        input.seek(index83_3);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
-                        int LA83_10 = input.LA(1);
+                        else if ( (LA81_7==BOOL) ) {s = 31;}
 
-                         
-                        int index83_10 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( ((validateRestr())) ) {s = 4;}
+                        else if ( (LA81_7==NULL) ) {s = 32;}
 
-                        else if ( (true) ) {s = 1;}
+                        else if ( (LA81_7==LEFT_PAREN) ) {s = 33;}
 
-                         
-                        input.seek(index83_10);
-                        if ( s>=0 ) return s;
-                        break;
-                    case 6 : 
-                        int LA83_5 = input.LA(1);
+                        else if ( (LA81_7==GRAVE_ACCENT) ) {s = 1;}
 
                          
-                        int index83_5 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (LA83_5==ID) ) {s = 9;}
-
-                        else if ( (LA83_5==LEFT_PAREN) ) {s = 10;}
-
-                        else if ( ((LA83_5>=EQUAL && LA83_5<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
-
-                         
-                        input.seek(index83_5);
+                        input.seek(index81_7);
                         if ( s>=0 ) return s;
                         break;
-                    case 7 : 
-                        int LA83_6 = input.LA(1);
+                    case 5 : 
+                        int LA81_5 = input.LA(1);
 
                          
-                        int index83_6 = input.index();
+                        int index81_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA83_6==LEFT_PAREN) ) {s = 11;}
+                        if ( (LA81_5==ID) ) {s = 9;}
 
-                        else if ( (LA83_6==ID) ) {s = 12;}
+                        else if ( (LA81_5==LEFT_PAREN) ) {s = 10;}
 
-                        else if ( (LA83_6==STRING||(LA83_6>=BOOL && LA83_6<=INT)||(LA83_6>=FLOAT && LA83_6<=NULL)) ) {s = 13;}
+                        else if ( ((LA81_5>=EQUAL && LA81_5<=GRAVE_ACCENT)) && ((validateRestr()))) {s = 4;}
 
-                        else if ( (LA83_6==GRAVE_ACCENT) ) {s = 1;}
-
-                        else if ( (LA83_6==DOT||(LA83_6>=COMMA && LA83_6<=RIGHT_PAREN)||(LA83_6>=DOUBLE_PIPE && LA83_6<=DOUBLE_AMPER)||LA83_6==LEFT_SQUARE) && ((validateRestr()))) {s = 4;}
-
                          
-                        input.seek(index83_6);
+                        input.seek(index81_5);
                         if ( s>=0 ) return s;
                         break;
-                    case 8 : 
-                        int LA83_16 = input.LA(1);
+                    case 6 : 
+                        int LA81_13 = input.LA(1);
 
                          
-                        int index83_16 = input.index();
+                        int index81_13 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18966,14 +18408,14 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_16);
+                        input.seek(index81_13);
                         if ( s>=0 ) return s;
                         break;
-                    case 9 : 
-                        int LA83_17 = input.LA(1);
+                    case 7 : 
+                        int LA81_10 = input.LA(1);
 
                          
-                        int index83_17 = input.index();
+                        int index81_10 = input.index();
                         input.rewind();
                         s = -1;
                         if ( ((validateRestr())) ) {s = 4;}
@@ -18981,460 +18423,455 @@
                         else if ( (true) ) {s = 1;}
 
                          
-                        input.seek(index83_17);
+                        input.seek(index81_10);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 83, _s, input);
+                new NoViableAltException(getDescription(), 81, _s, input);
             error(nvae);
             throw nvae;
         }
     }
  
 
-    public static final BitSet FOLLOW_package_statement_in_compilation_unit408 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit413 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_EOF_in_compilation_unit418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_package_key_in_package_statement469 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_package_id_in_package_statement471 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_package_statement473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_package_id497 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_DOT_in_package_id503 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_package_id507 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    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_statement618 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_import_name_in_import_statement620 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_import_statement623 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_key_in_function_import_statement658 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_function_key_in_function_import_statement660 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_import_name_in_function_import_statement662 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_function_import_statement665 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_name694 = new BitSet(new long[]{0x0000000000000002L,0x0000000006000000L});
-    public static final BitSet FOLLOW_DOT_in_import_name700 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_import_name704 = new BitSet(new long[]{0x0000000000000002L,0x0000000006000000L});
-    public static final BitSet FOLLOW_DOT_STAR_in_import_name711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_global_key_in_global751 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_data_type_in_global753 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_global_id_in_global755 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_global757 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_global_id783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_key_in_function815 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_data_type_in_function817 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_function_id_in_function820 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_parameters_in_function822 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
-    public static final BitSet FOLLOW_curly_chunk_in_function824 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_function_id854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_query_key_in_query886 = new BitSet(new long[]{0x0000000000000000L,0x0000000011000000L});
-    public static final BitSet FOLLOW_query_id_in_query888 = new BitSet(new long[]{0x0000000000000000L,0x0000000029000000L});
-    public static final BitSet FOLLOW_parameters_in_query890 = new BitSet(new long[]{0x0000000000000000L,0x0000000029000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query893 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_END_in_query895 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_query897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_query_id929 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_query_id945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_parameters964 = new BitSet(new long[]{0x0000000000000000L,0x0000000081000000L});
-    public static final BitSet FOLLOW_param_definition_in_parameters971 = new BitSet(new long[]{0x0000000000000000L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_COMMA_in_parameters974 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_param_definition_in_parameters976 = new BitSet(new long[]{0x0000000000000000L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_parameters985 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_data_type_in_param_definition1009 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_argument_in_param_definition1012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_argument1023 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_dimension_definition_in_argument1025 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_declare_key_in_type_declaration1048 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_type_declare_id_in_type_declaration1051 = new BitSet(new long[]{0x0000000000000000L,0x0000000109000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_type_declaration1055 = new BitSet(new long[]{0x0000000000000000L,0x0000000109000000L});
-    public static final BitSet FOLLOW_decl_field_in_type_declaration1060 = new BitSet(new long[]{0x0000000000000000L,0x0000000009000000L});
-    public static final BitSet FOLLOW_END_in_type_declaration1065 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_type_declare_id1097 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AT_in_decl_metadata1116 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_decl_metadata1118 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_decl_metadata1120 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_decl_field1143 = new BitSet(new long[]{0x0000000000000000L,0x0000000600000000L});
-    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field1145 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_COLON_in_decl_field1148 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_data_type_in_decl_field1150 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_decl_field1154 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
-    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization1182 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_decl_field_initialization1184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_template_key_in_template1215 = new BitSet(new long[]{0x0000000000000000L,0x0000000011000000L});
-    public static final BitSet FOLLOW_template_id_in_template1217 = new BitSet(new long[]{0x0000000000000000L,0x0000000001800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template1219 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_template_slot_in_template1224 = new BitSet(new long[]{0x0000000000000000L,0x0000000009000000L});
-    public static final BitSet FOLLOW_END_in_template1229 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template1231 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_template_id1261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_template_id1277 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_data_type_in_template_slot1297 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_slot_id_in_template_slot1299 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_template_slot1301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_slot_id1326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule_key_in_rule1355 = new BitSet(new long[]{0x0000000000000000L,0x0000000011000000L});
-    public static final BitSet FOLLOW_rule_id_in_rule1357 = new BitSet(new long[]{0x0000000000000000L,0x0010000001000000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule1359 = new BitSet(new long[]{0x0000000000000000L,0x0010000001000000L});
-    public static final BitSet FOLLOW_when_part_in_rule1362 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule1365 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_when_key_in_when_part1396 = new BitSet(new long[]{0x0000000000000002L,0x0000000221000000L});
-    public static final BitSet FOLLOW_COLON_in_when_part1398 = new BitSet(new long[]{0x0000000000000002L,0x0000000021000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_when_part1401 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_when_key_in_when_part1413 = new BitSet(new long[]{0x0000000000000002L,0x0000000221000000L});
-    public static final BitSet FOLLOW_COLON_in_when_part1415 = new BitSet(new long[]{0x0000000000000002L,0x0000000021000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_when_part1418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_rule_id1439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_rule_id1455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_attributes_key_in_rule_attributes1476 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_COLON_in_rule_attributes1478 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1483 = new BitSet(new long[]{0x0000000000000002L,0x0000000041000000L});
-    public static final BitSet FOLLOW_COMMA_in_rule_attributes1487 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1492 = new BitSet(new long[]{0x0000000000000002L,0x0000000041000000L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute1531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute1537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1544 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1551 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1582 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1594 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_in_rule_attribute1599 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_key_in_date_effective1611 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_date_effective1614 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_key_in_date_expires1625 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_date_expires1628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_key_in_enabled1642 = new BitSet(new long[]{0x0000000000000000L,0x0000000800000000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1645 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_salience_key_in_salience1657 = new BitSet(new long[]{0x0000000000000000L,0x0000001020000000L});
-    public static final BitSet FOLLOW_INT_in_salience1664 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_salience1673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_key_in_no_loop1689 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1692 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_key_in_auto_focus1704 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_key_in_activation_group1721 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1724 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_key_in_ruleflow_group1735 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1738 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_key_in_agenda_group1749 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1752 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_key_in_duration1763 = new BitSet(new long[]{0x0000000000000000L,0x0000001000000000L});
-    public static final BitSet FOLLOW_INT_in_duration1766 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_key_in_dialect1780 = new BitSet(new long[]{0x0000000000000000L,0x0000000010000000L});
-    public static final BitSet FOLLOW_STRING_in_dialect1783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_key_in_lock_on_active1801 = new BitSet(new long[]{0x0000000000000002L,0x0000000800000000L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1816 = new BitSet(new long[]{0x0000000000000002L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or1858 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_or_key_in_lhs_or1862 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1864 = new BitSet(new long[]{0x0000000000000000L,0x00000000A1000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or1867 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1888 = new BitSet(new long[]{0x0000000000000002L,0x0000002001000000L});
-    public static final BitSet FOLLOW_or_key_in_lhs_or1910 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_lhs_or1917 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1922 = new BitSet(new long[]{0x0000000000000002L,0x0000002001000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and1960 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_and_key_in_lhs_and1964 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1966 = new BitSet(new long[]{0x0000000000000000L,0x00000000A1000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and1969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1990 = new BitSet(new long[]{0x0000000000000002L,0x0000004001000000L});
-    public static final BitSet FOLLOW_and_key_in_lhs_and2012 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_lhs_and2019 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2024 = new BitSet(new long[]{0x0000000000000002L,0x0000004001000000L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2062 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_lhs_not_binding_in_lhs_unary2070 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2076 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2082 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2088 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2094 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2097 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2099 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2105 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_lhs_unary2119 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_exists_key_in_lhs_exist2133 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2157 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2164 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2166 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2168 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2181 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_not_key_in_lhs_not_binding2227 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_not_binding2229 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_not_key_in_lhs_not2252 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2269 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2276 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2278 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2288 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_eval_key_in_lhs_eval2327 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2331 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_forall_key_in_lhs_forall2355 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2357 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2359 = new BitSet(new long[]{0x0000000000000000L,0x0000000081000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2362 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2394 = new BitSet(new long[]{0x0000000000000002L,0x0000008001000000L});
-    public static final BitSet FOLLOW_over_clause_in_pattern_source2398 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_from_key_in_pattern_source2408 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2424 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_collect_statement_in_pattern_source2440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2457 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_pattern_source2473 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OVER_in_over_clause2501 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_over_elements_in_over_clause2504 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
-    public static final BitSet FOLLOW_COMMA_in_over_clause2507 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_over_elements_in_over_clause2510 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
-    public static final BitSet FOLLOW_ID_in_over_elements2523 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_COLON_in_over_elements2525 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_over_elements2527 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_over_elements2529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accumulate_key_in_accumulate_statement2553 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2557 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2559 = new BitSet(new long[]{0x0000000000000000L,0x0000000041000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2561 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_statement2569 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_statement2575 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_init_key_in_accumulate_init_clause2612 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2617 = new BitSet(new long[]{0x0000000000000000L,0x0000000041000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause2619 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_action_key_in_accumulate_init_clause2623 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2627 = new BitSet(new long[]{0x0000000000000000L,0x0000000041000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause2629 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_reverse_key_in_accumulate_init_clause2635 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2639 = new BitSet(new long[]{0x0000000000000000L,0x0000000041000000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause2641 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_result_key_in_accumulate_init_clause2647 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2651 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_accumulate_id_clause2700 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_id_clause2704 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_collect_key_in_collect_statement2726 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement2730 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_pattern_source_in_collect_statement2732 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement2734 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_entry_point_key_in_entrypoint_statement2756 = new BitSet(new long[]{0x0000000000000000L,0x0000000011000000L});
-    public static final BitSet FOLLOW_entrypoint_id_in_entrypoint_statement2758 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_entrypoint_id2781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_entrypoint_id2794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_source2810 = new BitSet(new long[]{0x0000000000000002L,0x0000000022000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source2823 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source2830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOT_in_expression_chain2862 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_expression_chain2864 = new BitSet(new long[]{0x0000000000000002L,0x0004000022000000L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain2884 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain2906 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain2917 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern2950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_pattern2963 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_label_in_fact_binding2983 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_fact_in_fact_binding2989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding2996 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_fact_binding_expression_in_fact_binding2998 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_fact_binding_expression3039 = new BitSet(new long[]{0x0000000000000002L,0x0000002001000000L});
-    public static final BitSet FOLLOW_or_key_in_fact_binding_expression3051 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3057 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_fact_in_fact_binding_expression3062 = new BitSet(new long[]{0x0000000000000002L,0x0000002001000000L});
-    public static final BitSet FOLLOW_pattern_type_in_fact3102 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3104 = new BitSet(new long[]{0x0000000000000000L,0x00000000A1000000L});
-    public static final BitSet FOLLOW_constraints_in_fact3106 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3109 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints3134 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
-    public static final BitSet FOLLOW_COMMA_in_constraints3138 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_constraint_in_constraints3141 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
-    public static final BitSet FOLLOW_or_constr_in_constraint3155 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3166 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3170 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3173 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3188 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3192 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3195 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_eval_key_in_unary_constr3216 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_unary_constr3219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_unary_constr3224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3229 = new BitSet(new long[]{0x0000000000000000L,0x0000000021000000L});
-    public static final BitSet FOLLOW_or_constr_in_unary_constr3232 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_label_in_field_constraint3248 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3250 = new BitSet(new long[]{0x0000000000000002L,0x0000FF0021000000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3254 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ARROW_in_field_constraint3260 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_paren_chunk_in_field_constraint3262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3316 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0021000000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3318 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_label3342 = new BitSet(new long[]{0x0000000000000000L,0x0000000200000000L});
-    public static final BitSet FOLLOW_COLON_in_label3344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3360 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective3366 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0021000000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3369 = new BitSet(new long[]{0x0000000000000002L,0x0000002000000000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3384 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective3390 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0021000000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3393 = new BitSet(new long[]{0x0000000000000002L,0x0000004000000000L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression3415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression3420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression3425 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0021000000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression3428 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression3430 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EQUAL_in_simple_operator3449 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_GREATER_in_simple_operator3455 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_GREATER_EQUAL_in_simple_operator3461 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_LESS_in_simple_operator3467 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_LESS_EQUAL_in_simple_operator3473 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_NOT_EQUAL_in_simple_operator3479 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_not_key_in_simple_operator3485 = new BitSet(new long[]{0x0000000000000000L,0x0000800001000000L});
-    public static final BitSet FOLLOW_contains_key_in_simple_operator3488 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_soundslike_key_in_simple_operator3491 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_matches_key_in_simple_operator3494 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_memberof_key_in_simple_operator3497 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator3501 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator3506 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator3509 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator3512 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_contains_key_in_simple_operator3518 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_excludes_key_in_simple_operator3524 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_matches_key_in_simple_operator3530 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_soundslike_key_in_simple_operator3536 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_memberof_key_in_simple_operator3542 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator3548 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator3554 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_simple_operator3557 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator3560 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator3564 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_in_key_in_compound_operator3579 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_not_key_in_compound_operator3584 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_in_key_in_compound_operator3586 = new BitSet(new long[]{0x0000000000000000L,0x0000000020000000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator3591 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator3594 = new BitSet(new long[]{0x0000000000000000L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator3598 = new BitSet(new long[]{0x0000000000000000L,0x0003001831000000L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator3601 = new BitSet(new long[]{0x0000000000000000L,0x00000000C0000000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator3606 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_expression_value3617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value3622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_value3628 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_set_in_literal_constraint0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_pattern_type3672 = new BitSet(new long[]{0x0000000000000002L,0x0004000002000000L});
-    public static final BitSet FOLLOW_DOT_in_pattern_type3678 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_pattern_type3682 = new BitSet(new long[]{0x0000000000000002L,0x0004000002000000L});
-    public static final BitSet FOLLOW_dimension_definition_in_pattern_type3697 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_ID_in_data_type3723 = new BitSet(new long[]{0x0000000000000002L,0x0004000002000000L});
-    public static final BitSet FOLLOW_DOT_in_data_type3727 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_data_type3729 = new BitSet(new long[]{0x0000000000000002L,0x0004000002000000L});
-    public static final BitSet FOLLOW_dimension_definition_in_data_type3734 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dimension_definition3760 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dimension_definition3762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path3773 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_DOT_in_accessor_path3777 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path3779 = new BitSet(new long[]{0x0000000000000002L,0x0000000002000000L});
-    public static final BitSet FOLLOW_ID_in_accessor_element3803 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_square_chunk_in_accessor_element3805 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_data_in_rhs_chunk3834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk_data3853 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_rhs_chunk_data3857 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_END_in_rhs_chunk_data3863 = new BitSet(new long[]{0x0000000000000002L,0x0000000000800000L});
-    public static final BitSet FOLLOW_SEMICOLON_in_rhs_chunk_data3865 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk3882 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk_data3901 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_curly_chunk_data3904 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk_data3918 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk_data3923 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk3939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk_data3959 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_paren_chunk_data3962 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk_data3976 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk_data3981 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk3998 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk_data4017 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_set_in_square_chunk_data4020 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk_data4034 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk_data4039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_date_effective_key4058 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_date_effective_key4060 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_date_effective_key4062 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_date_expires_key4088 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_date_expires_key4090 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_date_expires_key4092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4118 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4120 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4122 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4124 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_lock_on_active_key4126 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_no_loop_key4152 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_no_loop_key4154 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_no_loop_key4156 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_auto_focus_key4182 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_auto_focus_key4184 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_auto_focus_key4186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_activation_group_key4212 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_activation_group_key4214 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_activation_group_key4216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_agenda_group_key4242 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_agenda_group_key4244 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_agenda_group_key4246 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_ruleflow_group_key4272 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_ruleflow_group_key4274 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_ruleflow_group_key4276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_duration_key4301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_package_key4323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_key4345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_dialect_key4367 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_salience_key4389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_enabled_key4411 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_attributes_key4433 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_when_key4455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_rule_key4477 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_template_key4499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_query_key4521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_declare_key4543 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_function_key4565 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_global_key4587 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_eval_key4609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_contains_key4631 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_matches_key4653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_excludes_key4675 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_soundslike_key4697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_memberof_key4719 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_not_key4741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_in_key4763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_or_key4785 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_and_key4807 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_exists_key4829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_forall_key4851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_key4873 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_entry_point_key4896 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
-    public static final BitSet FOLLOW_MISC_in_entry_point_key4898 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_ID_in_entry_point_key4900 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_accumulate_key4925 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_init_key4947 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_action_key4969 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_reverse_key4991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_result_key5013 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_collect_key5035 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred11852 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_or_key_in_synpred11854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_or_key_in_synpred21901 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred21903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred31954 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_and_key_in_synpred31956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred42003 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred42005 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SEMICOLON_in_synpred52115 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred62147 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_or_key_in_synpred62150 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred62152 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred72259 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
-    public static final BitSet FOLLOW_or_key_in_synpred72262 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_key_in_synpred72264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred82817 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred92878 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred102900 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_package_statement_in_compilation_unit384 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_statement_in_compilation_unit389 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_EOF_in_compilation_unit394 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_package_key_in_package_statement450 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_package_id_in_package_statement454 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_package_statement456 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_package_id483 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_DOT_in_package_id489 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_package_id493 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_rule_attribute_in_statement537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_import_statement_in_statement544 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_statement_in_statement550 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_global_in_statement556 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_in_statement562 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_template_in_statement570 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_type_declaration_in_statement578 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule_in_statement583 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_query_in_statement588 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_key_in_import_statement615 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_import_name_in_import_statement617 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_import_statement620 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_key_in_function_import_statement663 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_function_key_in_function_import_statement665 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_import_name_in_function_import_statement667 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_function_import_statement670 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_name704 = new BitSet(new long[]{0x0000000000000002L,0x0000000000180000L});
+    public static final BitSet FOLLOW_DOT_in_import_name710 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_import_name714 = new BitSet(new long[]{0x0000000000000002L,0x0000000000180000L});
+    public static final BitSet FOLLOW_DOT_STAR_in_import_name721 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_global_key_in_global766 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_data_type_in_global768 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_global_id_in_global770 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_global772 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_global_id801 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_key_in_function838 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_data_type_in_function840 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_function_id_in_function843 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_parameters_in_function845 = new BitSet(new long[]{0x0000000000000000L,0x0020000000000000L});
+    public static final BitSet FOLLOW_curly_chunk_in_function847 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_function_id877 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_query_key_in_query914 = new BitSet(new long[]{0x0000000000000000L,0x0000000000440000L});
+    public static final BitSet FOLLOW_query_id_in_query916 = new BitSet(new long[]{0x0000000000000000L,0x0000000000A40000L});
+    public static final BitSet FOLLOW_parameters_in_query924 = new BitSet(new long[]{0x0000000000000000L,0x0000000000A40000L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query933 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
+    public static final BitSet FOLLOW_END_in_query938 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_query940 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_query_id975 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_query_id991 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_parameters1010 = new BitSet(new long[]{0x0000000000000000L,0x0000000002040000L});
+    public static final BitSet FOLLOW_param_definition_in_parameters1019 = new BitSet(new long[]{0x0000000000000000L,0x0000000003000000L});
+    public static final BitSet FOLLOW_COMMA_in_parameters1022 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_param_definition_in_parameters1026 = new BitSet(new long[]{0x0000000000000000L,0x0000000003000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_parameters1035 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_data_type_in_param_definition1061 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_argument_in_param_definition1064 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_argument1075 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_dimension_definition_in_argument1081 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_declare_key_in_type_declaration1109 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_type_declare_id_in_type_declaration1112 = new BitSet(new long[]{0x0000000000000000L,0x0000000004240000L});
+    public static final BitSet FOLLOW_decl_metadata_in_type_declaration1116 = new BitSet(new long[]{0x0000000000000000L,0x0000000004240000L});
+    public static final BitSet FOLLOW_decl_field_in_type_declaration1121 = new BitSet(new long[]{0x0000000000000000L,0x0000000000240000L});
+    public static final BitSet FOLLOW_END_in_type_declaration1126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_type_declare_id1161 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AT_in_decl_metadata1180 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_decl_metadata1188 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_decl_metadata1195 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_decl_field1218 = new BitSet(new long[]{0x0000000000000000L,0x0000000018000000L});
+    public static final BitSet FOLLOW_decl_field_initialization_in_decl_field1224 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_COLON_in_decl_field1230 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_data_type_in_decl_field1236 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_decl_metadata_in_decl_field1240 = new BitSet(new long[]{0x0000000000000002L,0x0000000004000000L});
+    public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization1268 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_decl_field_initialization1274 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_template_key_in_template1311 = new BitSet(new long[]{0x0000000000000000L,0x0000000000440000L});
+    public static final BitSet FOLLOW_template_id_in_template1313 = new BitSet(new long[]{0x0000000000000000L,0x0000000000060000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template1320 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_template_slot_in_template1328 = new BitSet(new long[]{0x0000000000000000L,0x0000000000240000L});
+    public static final BitSet FOLLOW_END_in_template1333 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template1337 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_template_id1370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_template_id1386 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_data_type_in_template_slot1406 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_slot_id_in_template_slot1408 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_template_slot1410 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_slot_id1439 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule_key_in_rule1476 = new BitSet(new long[]{0x0000000000000000L,0x0000000000440000L});
+    public static final BitSet FOLLOW_rule_id_in_rule1478 = new BitSet(new long[]{0x0000000000000000L,0x0010000020040000L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule1488 = new BitSet(new long[]{0x0000000000000000L,0x0010000020000000L});
+    public static final BitSet FOLLOW_when_part_in_rule1491 = new BitSet(new long[]{0x0000000000000000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_in_rule1494 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_WHEN_in_when_part1524 = new BitSet(new long[]{0x0000000000000002L,0x0000000008840000L});
+    public static final BitSet FOLLOW_COLON_in_when_part1530 = new BitSet(new long[]{0x0000000000000002L,0x0000000000840000L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_when_part1540 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_rule_id1561 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_rule_id1577 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_attributes_key_in_rule_attributes1598 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_COLON_in_rule_attributes1600 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1610 = new BitSet(new long[]{0x0000000000000002L,0x0000000001040000L});
+    public static final BitSet FOLLOW_COMMA_in_rule_attributes1614 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1621 = new BitSet(new long[]{0x0000000000000002L,0x0000000001040000L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1660 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1666 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1673 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1680 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1687 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1693 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1699 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1705 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1711 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1717 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1723 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_in_rule_attribute1728 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_key_in_date_effective1740 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_date_effective1743 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_key_in_date_expires1757 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_date_expires1760 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_key_in_enabled1775 = new BitSet(new long[]{0x0000000000000000L,0x0000000040000000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1778 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_salience_key_in_salience1793 = new BitSet(new long[]{0x0000000000000000L,0x0000000080800000L});
+    public static final BitSet FOLLOW_INT_in_salience1800 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1809 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_key_in_no_loop1824 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1827 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_key_in_auto_focus1842 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1845 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_key_in_activation_group1862 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1865 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_key_in_ruleflow_group1879 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1882 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_key_in_agenda_group1896 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1899 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_key_in_duration1913 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_INT_in_duration1916 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_key_in_dialect1932 = new BitSet(new long[]{0x0000000000000000L,0x0000000000400000L});
+    public static final BitSet FOLLOW_STRING_in_dialect1935 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_key_in_lock_on_active1953 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active1956 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1971 = new BitSet(new long[]{0x0000000000000002L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs1992 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2016 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2026 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2034 = new BitSet(new long[]{0x0000000000000000L,0x0000000002840000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2040 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2063 = new BitSet(new long[]{0x0000000000000002L,0x0000000100040000L});
+    public static final BitSet FOLLOW_or_key_in_lhs_or2085 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_lhs_or2092 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2103 = new BitSet(new long[]{0x0000000000000002L,0x0000000100040000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2144 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2154 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2162 = new BitSet(new long[]{0x0000000000000000L,0x0000000002840000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2168 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2192 = new BitSet(new long[]{0x0000000000000002L,0x0000000200040000L});
+    public static final BitSet FOLLOW_and_key_in_lhs_and2214 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_lhs_and2221 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2232 = new BitSet(new long[]{0x0000000000000002L,0x0000000200040000L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2263 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_lhs_not_binding_in_lhs_unary2271 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2277 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2283 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2289 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2295 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2306 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2312 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2320 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_lhs_unary2334 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_exists_key_in_lhs_exist2350 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2384 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2392 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2414 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not_binding2460 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_not_binding2462 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_not_key_in_lhs_not2485 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2507 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2514 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2523 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2529 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2539 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_eval_key_in_lhs_eval2578 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2587 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_forall_key_in_lhs_forall2614 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2619 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2627 = new BitSet(new long[]{0x0000000000000000L,0x0000000002040000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2633 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2669 = new BitSet(new long[]{0x0000000000000002L,0x0000000C00000000L});
+    public static final BitSet FOLLOW_over_clause_in_pattern_source2673 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2683 = new BitSet(new long[]{0x0000000000000000L,0x0000009000040000L});
+    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_collect_statement_in_pattern_source2719 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2736 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_pattern_source2752 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OVER_in_over_clause2784 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2789 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_COMMA_in_over_clause2796 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_over_elements_in_over_clause2801 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2816 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_COLON_in_over_elements2823 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_over_elements2832 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_over_elements2839 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2865 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2874 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2882 = new BitSet(new long[]{0x0000000000000000L,0x0000002001040000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2887 = new BitSet(new long[]{0x0000000000000000L,0x0000002000040000L});
+    public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_statement2897 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_statement2903 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2911 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause2946 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2957 = new BitSet(new long[]{0x0000000000000000L,0x0000000001040000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause2961 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_action_key_in_accumulate_init_clause2972 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2976 = new BitSet(new long[]{0x0000000000000000L,0x0000004001040000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause2980 = new BitSet(new long[]{0x0000000000000000L,0x0000004000040000L});
+    public static final BitSet FOLLOW_reverse_key_in_accumulate_init_clause2993 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause2997 = new BitSet(new long[]{0x0000000000000000L,0x0000004001000000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_init_clause3001 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_RESULT_in_accumulate_init_clause3017 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_init_clause3023 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_accumulate_id_clause3074 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_id_clause3080 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement3102 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3111 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_pattern_source_in_collect_statement3118 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3123 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_entry_point_key_in_entrypoint_statement3150 = new BitSet(new long[]{0x0000000000000000L,0x0000000000440000L});
+    public static final BitSet FOLLOW_entrypoint_id_in_entrypoint_statement3158 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entrypoint_id3184 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_entrypoint_id3201 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source3221 = new BitSet(new long[]{0x0000000000000002L,0x0000000000880000L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source3236 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source3243 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOT_in_expression_chain3276 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_expression_chain3283 = new BitSet(new long[]{0x0000000000000002L,0x0004000000880000L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain3305 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3327 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain3338 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern3371 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern3384 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_fact_binding3404 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3410 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3417 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_fact_binding_expression_in_fact_binding3425 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3433 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3474 = new BitSet(new long[]{0x0000000000000002L,0x0000000100040000L});
+    public static final BitSet FOLLOW_or_key_in_fact_binding_expression3486 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_binding_expression3492 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_fact_in_fact_binding_expression3497 = new BitSet(new long[]{0x0000000000000002L,0x0000000100040000L});
+    public static final BitSet FOLLOW_pattern_type_in_fact3537 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3542 = new BitSet(new long[]{0x0000000000000000L,0x0000000002840000L});
+    public static final BitSet FOLLOW_constraints_in_fact3553 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3559 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints3589 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_COMMA_in_constraints3593 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_constraint_in_constraints3600 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_or_constr_in_constraint3614 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3625 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3629 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3636 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3651 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3655 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3662 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_eval_key_in_unary_constr3695 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_unary_constr3698 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr3703 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3709 = new BitSet(new long[]{0x0000000000000000L,0x0000000000840000L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr3719 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3724 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_label_in_field_constraint3744 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3746 = new BitSet(new long[]{0x0000000000000002L,0x0000FF0000840000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3756 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ARROW_in_field_constraint3762 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_paren_chunk_in_field_constraint3766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3820 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0000840000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3824 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_label3849 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_COLON_in_label3856 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3877 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective3883 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0000840000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3891 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3906 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective3912 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0000840000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3919 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression3941 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression3946 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression3951 = new BitSet(new long[]{0x0000000000000000L,0x0000FE0000840000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression3963 = new BitSet(new long[]{0x0000000000000000L,0x0000000002000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression3968 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EQUAL_in_simple_operator3993 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_GREATER_in_simple_operator4001 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_GREATER_EQUAL_in_simple_operator4009 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_LESS_in_simple_operator4017 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_LESS_EQUAL_in_simple_operator4025 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_NOT_EQUAL_in_simple_operator4033 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_not_key_in_simple_operator4041 = new BitSet(new long[]{0x0000000000000000L,0x0000800000040000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4048 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4055 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4062 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4069 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4078 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4089 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4097 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4103 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_contains_key_in_simple_operator4109 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_excludes_key_in_simple_operator4115 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_matches_key_in_simple_operator4121 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_soundslike_key_in_simple_operator4127 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_memberof_key_in_simple_operator4133 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4141 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_GRAVE_ACCENT_in_simple_operator4151 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4159 = new BitSet(new long[]{0x0000000000000000L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4165 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator4172 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4187 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_not_key_in_compound_operator4192 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_in_key_in_compound_operator4194 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4205 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4213 = new BitSet(new long[]{0x0000000000000000L,0x0000000003000000L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator4217 = new BitSet(new long[]{0x0000000000000000L,0x00030000C0C40000L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4222 = new BitSet(new long[]{0x0000000000000000L,0x0000000003000000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4230 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_expression_value4251 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value4256 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_value4262 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint4281 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint4288 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4295 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint4302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint4309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4324 = new BitSet(new long[]{0x0000000000000002L,0x0004000000080000L});
+    public static final BitSet FOLLOW_DOT_in_pattern_type4330 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_pattern_type4334 = new BitSet(new long[]{0x0000000000000002L,0x0004000000080000L});
+    public static final BitSet FOLLOW_dimension_definition_in_pattern_type4349 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_ID_in_data_type4377 = new BitSet(new long[]{0x0000000000000002L,0x0004000000080000L});
+    public static final BitSet FOLLOW_DOT_in_data_type4383 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_data_type4387 = new BitSet(new long[]{0x0000000000000002L,0x0004000000080000L});
+    public static final BitSet FOLLOW_dimension_definition_in_data_type4392 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dimension_definition4421 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dimension_definition4428 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4442 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_DOT_in_accessor_path4446 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4450 = new BitSet(new long[]{0x0000000000000002L,0x0000000000080000L});
+    public static final BitSet FOLLOW_ID_in_accessor_element4474 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_square_chunk_in_accessor_element4480 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
+    public static final BitSet FOLLOW_rhs_chunk_data_in_rhs_chunk4509 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk_data4528 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_rhs_chunk_data4541 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_END_in_rhs_chunk_data4554 = new BitSet(new long[]{0x0000000000000002L,0x0000000000020000L});
+    public static final BitSet FOLLOW_SEMICOLON_in_rhs_chunk_data4560 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk4579 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk_data4602 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_curly_chunk_data4614 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_curly_chunk_data_in_curly_chunk_data4630 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk_data4641 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk4662 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk_data4686 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_paren_chunk_data4698 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_paren_chunk_data_in_paren_chunk_data4714 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk_data4725 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk4746 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk_data4769 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_set_in_square_chunk_data4781 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_square_chunk_data_in_square_chunk_data4796 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0xFFFFFFFFFFFFFFFFL,0x0000000000000001L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk_data4807 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4831 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4835 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4839 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_lock_on_active_key4843 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_lock_on_active_key4847 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key4879 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_effective_key4883 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_date_effective_key4887 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key4919 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_date_expires_key4923 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_date_expires_key4927 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key4959 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_no_loop_key4963 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_no_loop_key4967 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key4999 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_auto_focus_key5003 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_auto_focus_key5007 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5039 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_activation_group_key5043 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_activation_group_key5047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5079 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_agenda_group_key5083 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_agenda_group_key5087 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5119 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_ruleflow_group_key5123 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_ruleflow_group_key5127 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5159 = new BitSet(new long[]{0x0000000000000000L,0x0080000000000000L});
+    public static final BitSet FOLLOW_MISC_in_entry_point_key5163 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_ID_in_entry_point_key5167 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_duration_key5196 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_package_key5223 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_key5250 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_dialect_key5277 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_salience_key5304 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_enabled_key5331 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_attributes_key5358 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_rule_key5385 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_template_key5412 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_query_key5439 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_declare_key5466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_function_key5493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_global_key5520 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_eval_key5547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_contains_key5574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_matches_key5601 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_excludes_key5628 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_soundslike_key5655 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_memberof_key5682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_not_key5709 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_in_key5736 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_or_key5763 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_and_key5790 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_exists_key5817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_forall_key5844 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_action_key5871 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_reverse_key5898 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred12007 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_or_key_in_synpred12009 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_or_key_in_synpred22076 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred22078 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred32135 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_and_key_in_synpred32137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred42205 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred42207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SEMICOLON_in_synpred52330 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred62367 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_or_key_in_synpred62370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred62372 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred72495 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
+    public static final BitSet FOLLOW_or_key_in_synpred72498 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_key_in_synpred72500 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred83230 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred93299 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred103321 = 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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-07-22 10:02:21
+// $ANTLR 3.0.1 /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g 2008-08-21 01:35:56
 
 	package org.drools.lang;
 
@@ -36,133 +36,133 @@
 
 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_WHEN", "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_FROM", "VK_ACCUMULATE", "VK_INIT", "VK_ACTION", "VK_REVERSE", "VK_RESULT", "VK_COLLECT", "SEMICOLON", "ID", "DOT", "DOT_STAR", "END", "STRING", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "AT", "COLON", "EQUALS", "BOOL", "INT", "DOUBLE_PIPE", "DOUBLE_AMPER", "OVER", "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_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", "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", "RESULT", "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=94;
+    public static final int COMMA=88;
     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=65;
-    public static final int END=91;
+    public static final int VK_FUNCTION=64;
+    public static final int END=85;
     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 VK_ACCUMULATE=81;
     public static final int MISC=119;
     public static final int VT_AND_PREFIX=23;
-    public static final int VK_QUERY=63;
+    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=89;
-    public static final int VK_IMPORT=60;
+    public static final int DOT=83;
+    public static final int VK_IMPORT=59;
     public static final int VT_SLOT=15;
     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=69;
+    public static final int VK_MATCHES=68;
     public static final int VT_FACT=6;
     public static final int LEFT_CURLY=117;
-    public static final int AT=96;
-    public static final int LEFT_PAREN=93;
-    public static final int DOUBLE_AMPER=102;
+    public static final int AT=90;
+    public static final int LEFT_PAREN=87;
+    public static final int DOUBLE_AMPER=97;
     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=93;
     public static final int VT_ENTRYPOINT_ID=13;
-    public static final int VK_SOUNDSLIKE=71;
+    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=103;
-    public static final int VK_AND=77;
-    public static final int STRING=92;
+    public static final int OVER=99;
+    public static final int STRING=86;
+    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=66;
-    public static final int VK_REVERSE=84;
+    public static final int VK_GLOBAL=65;
+    public static final int VK_REVERSE=80;
     public static final int VT_BEHAVIOR=21;
     public static final int GRAVE_ACCENT=111;
     public static final int VK_DURATION=53;
     public static final int VT_SQUARE_CHUNK=19;
-    public static final int VK_FORALL=79;
+    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=98;
-    public static final int VK_RESULT=85;
+    public static final int EQUALS=92;
     public static final int UnicodeEscape=124;
-    public static final int VK_PACKAGE=61;
+    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=87;
-    public static final int VK_TEMPLATE=62;
+    public static final int SEMICOLON=81;
+    public static final int VK_TEMPLATE=61;
     public static final int VT_AND_IMPLICIT=22;
     public static final int NULL=113;
-    public static final int COLON=97;
+    public static final int COLON=91;
     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=74;
+    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=101;
     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=101;
+    public static final int DOUBLE_PIPE=96;
     public static final int LESS=108;
     public static final int VT_TYPE_DECLARE_ID=11;
     public static final int VT_PATTERN=31;
     public static final int VK_DATE_EFFECTIVE=45;
     public static final int EscapeSequence=122;
-    public static final int VK_EXISTS=78;
-    public static final int INT=100;
+    public static final int VK_EXISTS=77;
+    public static final int INT=95;
     public static final int VT_BIND_FIELD=34;
-    public static final int VK_RULE=59;
-    public static final int VK_EVAL=67;
-    public static final int VK_COLLECT=86;
+    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=88;
+    public static final int RESULT=102;
+    public static final int ID=82;
+    public static final int FROM=98;
     public static final int NOT_EQUAL=110;
     public static final int RIGHT_CURLY=118;
-    public static final int VK_ENTRY_POINT=73;
+    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=99;
+    public static final int BOOL=94;
     public static final int VT_FROM_SOURCE=29;
-    public static final int VK_CONTAINS=68;
+    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=75;
+    public static final int VK_IN=74;
     public static final int VT_RHS_CHUNK=17;
-    public static final int VK_MEMBEROF=72;
+    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=90;
-    public static final int VK_OR=76;
+    public static final int DOT_STAR=84;
+    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 VK_WHEN=58;
+    public static final int ACCUMULATE=100;
     public static final int VK_RULEFLOW_GROUP=52;
     public static final int VT_FUNCTION_ID=43;
     public static final int EOF=-1;
     public static final int VT_CONSTRAINTS=7;
     public static final int VT_IMPORT_ID=41;
     public static final int EOL=120;
-    public static final int VK_INIT=82;
     public static final int VK_ACTIVATION_GROUP=50;
     public static final int OctalEscape=125;
-    public static final int VK_ACTION=83;
-    public static final int VK_FROM=80;
-    public static final int VK_EXCLUDES=70;
-    public static final int RIGHT_PAREN=95;
+    public static final int VK_ACTION=79;
+    public static final int VK_EXCLUDES=69;
+    public static final int RIGHT_PAREN=89;
     public static final int VT_TEMPLATE_ID=10;
-    public static final int VK_DECLARE=64;
+    public static final int VK_DECLARE=63;
     public static final int C_STYLE_SINGLE_LINE_COMMENT=127;
 
         public DescrBuilderTree(TreeNodeStream input) {
@@ -1115,7 +1115,7 @@
             int alt11=2;
             int LA11_0 = input.LA(1);
 
-            if ( (LA11_0==VK_WHEN) ) {
+            if ( (LA11_0==WHEN) ) {
                 alt11=1;
             }
             switch (alt11) {
@@ -1153,7 +1153,7 @@
 
 
     // $ANTLR start when_part
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:136:1: when_part returns [AndDescr andDescr] : VK_WHEN lh= lhs_block ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:136:1: when_part returns [AndDescr andDescr] : WHEN lh= lhs_block ;
     public final AndDescr when_part() throws RecognitionException {
         AndDescr andDescr = null;
 
@@ -1161,10 +1161,10 @@
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:137:2: ( VK_WHEN lh= lhs_block )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:137:4: VK_WHEN lh= lhs_block
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:137:2: ( WHEN lh= lhs_block )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:137:4: WHEN lh= lhs_block
             {
-            match(input,VK_WHEN,FOLLOW_VK_WHEN_in_when_part528); 
+            match(input,WHEN,FOLLOW_WHEN_in_when_part528); 
             pushFollow(FOLLOW_lhs_block_in_when_part532);
             lh=lhs_block();
             _fsp--;
@@ -2106,7 +2106,7 @@
                     int alt26=2;
                     int LA26_0 = input.LA(1);
 
-                    if ( ((LA26_0>=VT_AND_PREFIX && LA26_0<=VT_OR_INFIX)||LA26_0==VT_PATTERN||LA26_0==VK_EVAL||LA26_0==VK_NOT||(LA26_0>=VK_EXISTS && LA26_0<=VK_FROM)) ) {
+                    if ( ((LA26_0>=VT_AND_PREFIX && LA26_0<=VT_OR_INFIX)||LA26_0==VT_PATTERN||LA26_0==VK_EVAL||LA26_0==VK_NOT||(LA26_0>=VK_EXISTS && LA26_0<=VK_FORALL)||LA26_0==FROM) ) {
                         alt26=1;
                     }
 
@@ -2151,7 +2151,7 @@
     };
 
     // $ANTLR start lhs
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:212: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 )+ ) | ^( VK_FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:212: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 );
     public final lhs_return lhs() throws RecognitionException {
         lhs_return retval = new lhs_return();
         retval.start = input.LT(1);
@@ -2173,7 +2173,7 @@
         	List<BaseDescr> lhsList = new LinkedList<BaseDescr>();
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:215: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 )+ ) | ^( VK_FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:215: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 alt30=10;
             switch ( input.LA(1) ) {
             case VT_OR_PREFIX:
@@ -2216,7 +2216,7 @@
                 alt30=8;
                 }
                 break;
-            case VK_FROM:
+            case FROM:
                 {
                 alt30=9;
                 }
@@ -2228,7 +2228,7 @@
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("212: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 )+ ) | ^( VK_FROM pn= lhs_pattern fe= from_elements ) | pn= lhs_pattern );", 30, 0, input);
+                    new NoViableAltException("212: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 );", 30, 0, input);
 
                 throw nvae;
             }
@@ -2248,7 +2248,7 @@
                         int alt27=2;
                         int LA27_0 = input.LA(1);
 
-                        if ( ((LA27_0>=VT_AND_PREFIX && LA27_0<=VT_OR_INFIX)||LA27_0==VT_PATTERN||LA27_0==VK_EVAL||LA27_0==VK_NOT||(LA27_0>=VK_EXISTS && LA27_0<=VK_FROM)) ) {
+                        if ( ((LA27_0>=VT_AND_PREFIX && LA27_0<=VT_OR_INFIX)||LA27_0==VT_PATTERN||LA27_0==VK_EVAL||LA27_0==VK_NOT||(LA27_0>=VK_EXISTS && LA27_0<=VK_FORALL)||LA27_0==FROM) ) {
                             alt27=1;
                         }
 
@@ -2318,7 +2318,7 @@
                         int alt28=2;
                         int LA28_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_FROM)) ) {
+                        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;
                         }
 
@@ -2437,7 +2437,7 @@
                         int alt29=2;
                         int LA29_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_FROM)) ) {
+                        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;
                         }
 
@@ -2471,9 +2471,9 @@
                     }
                     break;
                 case 9 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:235:4: ^( VK_FROM pn= lhs_pattern fe= from_elements )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:235:4: ^( FROM pn= lhs_pattern fe= from_elements )
                     {
-                    match(input,VK_FROM,FOLLOW_VK_FROM_in_lhs1206); 
+                    match(input,FROM,FOLLOW_FROM_in_lhs1206); 
 
                     match(input, Token.DOWN, null); 
                     pushFollow(FOLLOW_lhs_pattern_in_lhs1210);
@@ -2519,7 +2519,7 @@
     };
 
     // $ANTLR start from_elements
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:241:1: from_elements returns [PatternSourceDescr patternSourceDescr] : ( ^(start= VK_ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= VK_COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause );
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:241: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 );
     public final from_elements_return from_elements() throws RecognitionException {
         from_elements_return retval = new from_elements_return();
         retval.start = input.LT(1);
@@ -2534,15 +2534,15 @@
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:242:2: ( ^(start= VK_ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= VK_COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:242: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 alt31=4;
             switch ( input.LA(1) ) {
-            case VK_ACCUMULATE:
+            case ACCUMULATE:
                 {
                 alt31=1;
                 }
                 break;
-            case VK_COLLECT:
+            case COLLECT:
                 {
                 alt31=2;
                 }
@@ -2559,17 +2559,17 @@
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("241:1: from_elements returns [PatternSourceDescr patternSourceDescr] : ( ^(start= VK_ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] ) | ^(start= VK_COLLECT dt= lhs ) | ^(start= VK_ENTRY_POINT entryId= VT_ENTRYPOINT_ID ) | fs= from_source_clause );", 31, 0, input);
+                    new NoViableAltException("241: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 );", 31, 0, input);
 
                 throw nvae;
             }
 
             switch (alt31) {
                 case 1 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:242:4: ^(start= VK_ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:242:4: ^(start= ACCUMULATE dt= lhs ret= accumulate_parts[$patternSourceDescr] )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_ACCUMULATE,FOLLOW_VK_ACCUMULATE_in_from_elements1246); 
+                    match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_from_elements1246); 
 
                     match(input, Token.DOWN, null); 
                     pushFollow(FOLLOW_lhs_in_from_elements1250);
@@ -2588,10 +2588,10 @@
                     }
                     break;
                 case 2 :
-                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:246:4: ^(start= VK_COLLECT dt= lhs )
+                    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:246:4: ^(start= COLLECT dt= lhs )
                     {
                     start=(DroolsTree)input.LT(1);
-                    match(input,VK_COLLECT,FOLLOW_VK_COLLECT_in_from_elements1273); 
+                    match(input,COLLECT,FOLLOW_COLLECT_in_from_elements1273); 
 
                     match(input, Token.DOWN, null); 
                     pushFollow(FOLLOW_lhs_in_from_elements1277);
@@ -2712,7 +2712,7 @@
     };
 
     // $ANTLR start accumulate_init_clause
-    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:261:1: accumulate_init_clause[PatternSourceDescr accumulateParam] returns [AccumulateDescr accumulateDescr] : ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= VK_INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( VK_RESULT pc3= VT_PAREN_CHUNK ) ) ;
+    // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:261:1: accumulate_init_clause[PatternSourceDescr accumulateParam] returns [AccumulateDescr accumulateDescr] : ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( RESULT pc3= VT_PAREN_CHUNK ) ) ;
     public final accumulate_init_clause_return accumulate_init_clause(PatternSourceDescr accumulateParam) throws RecognitionException {
         accumulate_init_clause_return retval = new accumulate_init_clause_return();
         retval.start = input.LT(1);
@@ -2725,14 +2725,14 @@
 
 
         try {
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:262:2: ( ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= VK_INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( VK_RESULT pc3= VT_PAREN_CHUNK ) ) )
-            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:262:4: ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= VK_INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( VK_RESULT pc3= VT_PAREN_CHUNK ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:262:2: ( ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( RESULT pc3= VT_PAREN_CHUNK ) ) )
+            // /Users/porcelli/Documents/dev/drools-trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g:262:4: ^( VT_ACCUMULATE_INIT_CLAUSE ^(start= INIT pc1= VT_PAREN_CHUNK ) ^( VK_ACTION pc2= VT_PAREN_CHUNK ) (rev= accumulate_init_reverse_clause )? ^( RESULT pc3= VT_PAREN_CHUNK ) )
             {
             match(input,VT_ACCUMULATE_INIT_CLAUSE,FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1359); 
 
             match(input, Token.DOWN, null); 
             start=(DroolsTree)input.LT(1);
-            match(input,VK_INIT,FOLLOW_VK_INIT_in_accumulate_init_clause1368); 
+            match(input,INIT,FOLLOW_INIT_in_accumulate_init_clause1368); 
 
             match(input, Token.DOWN, null); 
             pc1=(DroolsTree)input.LT(1);
@@ -2767,7 +2767,7 @@
 
             }
 
-            match(input,VK_RESULT,FOLLOW_VK_RESULT_in_accumulate_init_clause1400); 
+            match(input,RESULT,FOLLOW_RESULT_in_accumulate_init_clause1400); 
 
             match(input, Token.DOWN, null); 
             pc3=(DroolsTree)input.LT(1);
@@ -4469,12 +4469,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[]{0xD9FFE00000000028L,0x0000000000000007L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit53 = new BitSet(new long[]{0xD9FFE00000000028L,0x0000000000000007L});
+    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_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,0x0000000001000000L});
+    public static final BitSet FOLLOW_ID_in_package_id106 = new BitSet(new long[]{0x0000000000000008L,0x0000000000040000L});
     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});
@@ -4490,7 +4490,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,0x0000000005000000L});
+    public static final BitSet FOLLOW_ID_in_import_name281 = new BitSet(new long[]{0x0000000000000008L,0x0000000000140000L});
     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});
@@ -4502,7 +4502,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,0x0000000008000000L});
+    public static final BitSet FOLLOW_template_slot_in_template394 = new BitSet(new long[]{0x0000000000008000L,0x0000000000200000L});
     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});
@@ -4510,37 +4510,37 @@
     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,0x0000000008000000L});
+    public static final BitSet FOLLOW_lhs_block_in_query465 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
     public static final BitSet FOLLOW_END_in_query469 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_RULE_in_rule491 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_RULE_ID_in_rule495 = new BitSet(new long[]{0x0400000000030000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule499 = new BitSet(new long[]{0x0400000000020000L});
+    public static final BitSet FOLLOW_VT_RULE_ID_in_rule495 = new BitSet(new long[]{0x0000000000030000L,0x0000000020000000L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule499 = new BitSet(new long[]{0x0000000000020000L,0x0000000020000000L});
     public static final BitSet FOLLOW_when_part_in_rule504 = new BitSet(new long[]{0x0000000000020000L});
     public static final BitSet FOLLOW_VT_RHS_CHUNK_in_rule509 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_WHEN_in_when_part528 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_WHEN_in_when_part528 = new BitSet(new long[]{0x0000000000400000L});
     public static final BitSet FOLLOW_lhs_block_in_when_part532 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_VT_RULE_ATTRIBUTES_in_rule_attributes554 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VK_ATTRIBUTES_in_rule_attributes556 = new BitSet(new long[]{0x01FFE00000000000L});
     public static final BitSet FOLLOW_rule_attribute_in_rule_attributes562 = new BitSet(new long[]{0x01FFE00000000008L});
     public static final BitSet FOLLOW_VT_PARAM_LIST_in_parameters586 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_param_definition_in_parameters591 = new BitSet(new long[]{0x0000004000000008L,0x0000000001000000L});
-    public static final BitSet FOLLOW_data_type_in_param_definition613 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_param_definition_in_parameters591 = new BitSet(new long[]{0x0000004000000008L,0x0000000000040000L});
+    public static final BitSet FOLLOW_data_type_in_param_definition613 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
     public static final BitSet FOLLOW_argument_in_param_definition618 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ID_in_argument638 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
     public static final BitSet FOLLOW_LEFT_SQUARE_in_argument641 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
     public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument645 = new BitSet(new long[]{0x0000000000000002L,0x0004000000000000L});
     public static final BitSet FOLLOW_VK_DECLARE_in_type_declaration671 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration675 = new BitSet(new long[]{0x0000000000000000L,0x0000000109000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_type_declaration684 = new BitSet(new long[]{0x0000000000000000L,0x0000000109000000L});
-    public static final BitSet FOLLOW_decl_field_in_type_declaration697 = new BitSet(new long[]{0x0000000000000000L,0x0000000009000000L});
+    public static final BitSet FOLLOW_VT_TYPE_DECLARE_ID_in_type_declaration675 = new BitSet(new long[]{0x0000000000000000L,0x0000000004240000L});
+    public static final BitSet FOLLOW_decl_metadata_in_type_declaration684 = new BitSet(new long[]{0x0000000000000000L,0x0000000004240000L});
+    public static final BitSet FOLLOW_decl_field_in_type_declaration697 = new BitSet(new long[]{0x0000000000000000L,0x0000000000240000L});
     public static final BitSet FOLLOW_END_in_type_declaration703 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_AT_in_decl_metadata728 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_ID_in_decl_metadata732 = new BitSet(new long[]{0x0000000000100000L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_metadata736 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_ID_in_decl_field763 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_decl_field_initialization_in_decl_field767 = new BitSet(new long[]{0x0000004000000000L});
-    public static final BitSet FOLLOW_data_type_in_decl_field772 = new BitSet(new long[]{0x0000000000000008L,0x0000000100000000L});
-    public static final BitSet FOLLOW_decl_metadata_in_decl_field777 = new BitSet(new long[]{0x0000000000000008L,0x0000000100000000L});
+    public static final BitSet FOLLOW_data_type_in_decl_field772 = new BitSet(new long[]{0x0000000000000008L,0x0000000004000000L});
+    public static final BitSet FOLLOW_decl_metadata_in_decl_field777 = new BitSet(new long[]{0x0000000000000008L,0x0000000004000000L});
     public static final BitSet FOLLOW_EQUALS_in_decl_field_initialization804 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_decl_field_initialization808 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_SALIENCE_in_rule_attribute831 = new BitSet(new long[]{0x0000000000000004L});
@@ -4569,16 +4569,16 @@
     public static final BitSet FOLLOW_VK_DIALECT_in_rule_attribute997 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_STRING_in_rule_attribute1001 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_AND_IMPLICIT_in_lhs_block1026 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs_block1031 = new BitSet(new long[]{0x0000000087800008L,0x000000000001C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs_block1031 = new BitSet(new long[]{0x0000000087800008L,0x0000000400006204L});
     public static final BitSet FOLLOW_VT_OR_PREFIX_in_lhs1057 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1062 = new BitSet(new long[]{0x0000000087800008L,0x000000000001C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1062 = new BitSet(new long[]{0x0000000087800008L,0x0000000400006204L});
     public static final BitSet FOLLOW_VT_OR_INFIX_in_lhs1078 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1082 = new BitSet(new long[]{0x0000000087800000L,0x000000000001C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1082 = new BitSet(new long[]{0x0000000087800000L,0x0000000400006204L});
     public static final BitSet FOLLOW_lhs_in_lhs1086 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_AND_PREFIX_in_lhs1098 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1103 = new BitSet(new long[]{0x0000000087800008L,0x000000000001C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1103 = new BitSet(new long[]{0x0000000087800008L,0x0000000400006204L});
     public static final BitSet FOLLOW_VT_AND_INFIX_in_lhs1119 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1123 = new BitSet(new long[]{0x0000000087800000L,0x000000000001C408L});
+    public static final BitSet FOLLOW_lhs_in_lhs1123 = new BitSet(new long[]{0x0000000087800000L,0x0000000400006204L});
     public static final BitSet FOLLOW_lhs_in_lhs1127 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_EXISTS_in_lhs1139 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_lhs_in_lhs1143 = new BitSet(new long[]{0x0000000000000008L});
@@ -4587,15 +4587,15 @@
     public static final BitSet FOLLOW_VK_EVAL_in_lhs1171 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_lhs1175 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_FORALL_in_lhs1187 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_in_lhs1192 = new BitSet(new long[]{0x0000000087800008L,0x000000000001C408L});
-    public static final BitSet FOLLOW_VK_FROM_in_lhs1206 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs1210 = new BitSet(new long[]{0x0000000020000000L,0x0000000000420200L});
+    public static final BitSet FOLLOW_lhs_in_lhs1192 = new BitSet(new long[]{0x0000000087800008L,0x0000000400006204L});
+    public static final BitSet FOLLOW_FROM_in_lhs1206 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs1210 = new BitSet(new long[]{0x0000000020000000L,0x0000009000000100L});
     public static final BitSet FOLLOW_from_elements_in_lhs1214 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_lhs_pattern_in_lhs1225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_VK_ACCUMULATE_in_from_elements1246 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_from_elements1246 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_lhs_in_from_elements1250 = new BitSet(new long[]{0x0000000018000000L});
     public static final BitSet FOLLOW_accumulate_parts_in_from_elements1260 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_VK_COLLECT_in_from_elements1273 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_COLLECT_in_from_elements1273 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_lhs_in_from_elements1277 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_ENTRY_POINT_in_from_elements1289 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_ENTRYPOINT_ID_in_from_elements1293 = new BitSet(new long[]{0x0000000000000008L});
@@ -4603,12 +4603,12 @@
     public static final BitSet FOLLOW_accumulate_init_clause_in_accumulate_parts1325 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_accumulate_id_clause_in_accumulate_parts1336 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_VT_ACCUMULATE_INIT_CLAUSE_in_accumulate_init_clause1359 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_INIT_in_accumulate_init_clause1368 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_init_clause1368 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1372 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_ACTION_in_accumulate_init_clause1380 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1384 = new BitSet(new long[]{0x0000000000000008L});
-    public static final BitSet FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1393 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L});
-    public static final BitSet FOLLOW_VK_RESULT_in_accumulate_init_clause1400 = new BitSet(new long[]{0x0000000000000004L});
+    public static final BitSet FOLLOW_accumulate_init_reverse_clause_in_accumulate_init_clause1393 = new BitSet(new long[]{0x0000000000000000L,0x0000004000000000L});
+    public static final BitSet FOLLOW_RESULT_in_accumulate_init_clause1400 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_clause1404 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_REVERSE_in_accumulate_init_reverse_clause1427 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_accumulate_init_reverse_clause1431 = new BitSet(new long[]{0x0000000000000008L});
@@ -4630,23 +4630,23 @@
     public static final BitSet FOLLOW_OVER_in_over_clause1592 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_over_element_in_over_clause1597 = new BitSet(new long[]{0x0000000000200008L});
     public static final BitSet FOLLOW_VT_BEHAVIOR_in_over_element1618 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_over_element1620 = new BitSet(new long[]{0x0000000000000000L,0x0000000001000000L});
+    public static final BitSet FOLLOW_ID_in_over_element1620 = new BitSet(new long[]{0x0000000000000000L,0x0000000000040000L});
     public static final BitSet FOLLOW_ID_in_over_element1624 = new BitSet(new long[]{0x0000000000100000L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_over_element1628 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_FACT_in_fact_expression1651 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_pattern_type_in_fact_expression1655 = new BitSet(new long[]{0x0000001F00100048L,0x00037E78110009F8L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1660 = new BitSet(new long[]{0x0000001F00100048L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_pattern_type_in_fact_expression1655 = new BitSet(new long[]{0x0000001F00100048L,0x00037E03C04404FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1660 = new BitSet(new long[]{0x0000001F00100048L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_VT_FACT_BINDING_in_fact_expression1674 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1678 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1678 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1682 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_FACT_OR_in_fact_expression1694 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression1698 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression1698 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1702 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_FIELD_in_fact_expression1713 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_field_element_in_fact_expression1717 = new BitSet(new long[]{0x0000001F00100048L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_field_element_in_fact_expression1717 = new BitSet(new long[]{0x0000001F00100048L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1721 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_BIND_FIELD_in_fact_expression1732 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1736 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VT_LABEL_in_fact_expression1736 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1740 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_EVAL_in_fact_expression1751 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_VT_PAREN_CHUNK_in_fact_expression1755 = new BitSet(new long[]{0x0000000000000008L});
@@ -4663,32 +4663,32 @@
     public static final BitSet FOLLOW_LESS_EQUAL_in_fact_expression1848 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1852 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_CONTAINS_in_fact_expression1864 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1868 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1868 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1873 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_EXCLUDES_in_fact_expression1885 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1889 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1889 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1894 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_MATCHES_in_fact_expression1906 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1910 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1910 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1915 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_SOUNDSLIKE_in_fact_expression1927 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1931 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1931 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1936 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_MEMBEROF_in_fact_expression1948 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1952 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1952 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1957 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_ID_in_fact_expression1969 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1973 = new BitSet(new long[]{0x0000001F00180040L,0x00037E78110009F8L});
-    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression1978 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1973 = new BitSet(new long[]{0x0000001F00180040L,0x00037E03C04404FCL});
+    public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_fact_expression1978 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression1983 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VK_IN_in_fact_expression1994 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1998 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2004 = new BitSet(new long[]{0x0000001F00100048L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_VK_NOT_in_fact_expression1998 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2004 = new BitSet(new long[]{0x0000001F00100048L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_DOUBLE_PIPE_in_fact_expression2019 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2023 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2023 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression2027 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_DOUBLE_AMPER_in_fact_expression2037 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2041 = new BitSet(new long[]{0x0000001F00100040L,0x00037E78110009F8L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2041 = new BitSet(new long[]{0x0000001F00100040L,0x00037E03C04404FCL});
     public static final BitSet FOLLOW_fact_expression_in_fact_expression2045 = new BitSet(new long[]{0x0000000000000008L});
     public static final BitSet FOLLOW_VT_ACCESSOR_PATH_in_fact_expression2056 = new BitSet(new long[]{0x0000000000000004L});
     public static final BitSet FOLLOW_accessor_element_in_fact_expression2061 = new BitSet(new long[]{0x0000002000000008L});
@@ -4704,11 +4704,11 @@
     public static final BitSet FOLLOW_ID_in_accessor_element2181 = new BitSet(new long[]{0x0000000000080008L});
     public static final BitSet FOLLOW_VT_SQUARE_CHUNK_in_accessor_element2185 = new BitSet(new long[]{0x0000000000080008L});
     public static final BitSet FOLLOW_VT_PATTERN_TYPE_in_pattern_type2206 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_pattern_type2210 = new BitSet(new long[]{0x0000000000000008L,0x0004000001000000L});
+    public static final BitSet FOLLOW_ID_in_pattern_type2210 = new BitSet(new long[]{0x0000000000000008L,0x0004000000040000L});
     public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern_type2214 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
     public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern_type2218 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
     public static final BitSet FOLLOW_VT_DATA_TYPE_in_data_type2240 = new BitSet(new long[]{0x0000000000000004L});
-    public static final BitSet FOLLOW_ID_in_data_type2244 = new BitSet(new long[]{0x0000000000000008L,0x0004000001000000L});
+    public static final BitSet FOLLOW_ID_in_data_type2244 = new BitSet(new long[]{0x0000000000000008L,0x0004000000040000L});
     public static final BitSet FOLLOW_LEFT_SQUARE_in_data_type2248 = new BitSet(new long[]{0x0000000000000000L,0x0008000000000000L});
     public static final BitSet FOLLOW_RIGHT_SQUARE_in_data_type2252 = new BitSet(new long[]{0x0000000000000008L,0x0004000000000000L});
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsEditorType.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsEditorType.java	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsEditorType.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -1,20 +1,11 @@
 package org.drools.lang;
 
 /**
- * Simple holder class identifying a DroolsTree editor type. This is stored in
- * DroolsTree to be used on editor for syntax highlighting.
+ * Enum to identify an editor type (most for syntax highlighting). This
+ * is used on DroolsTree and DroolsToken.
  * 
  * @author porcelli
  */
-public class DroolsEditorType {
-	public static int KEYWORD = 0;
-	public static int CODE_CHUNK = 1;
-	public static int SYMBOL = 2;
-	public static int NUMERIC_CONST = 3;
-	public static int BOOLEAN_CONST = 4;
-	public static int STRING_CONST = 5;
-	public static int NULL_CONST = 6;
-	public static int IDENTIFIER = 7;
-	public static int IDENTIFIER_TYPE = 8;
-	public static int IDENTIFIER_PATTERN = 9;
+public enum DroolsEditorType {
+	KEYWORD, CODE_CHUNK, SYMBOL, NUMERIC_CONST, BOOLEAN_CONST, STRING_CONST, NULL_CONST, IDENTIFIER, IDENTIFIER_TYPE, IDENTIFIER_PATTERN;
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsParserExceptionFactory.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -38,12 +38,8 @@
 	public final static String PARSER_LOCATION_MESSAGE_COMPLETE = " in %1$s %2$s";
 	public final static String PARSER_LOCATION_MESSAGE_PART = " in %1$s";
 
-	public static final String[] parserLocations = new String[] { "package",
-			"import", "function import", "global", "function", "query",
-			"template", "rule", "rule attribute", "pattern" };
-
 	private String[] tokenNames = null;
-	private Stack<Map<Integer, String>> paraphrases = null;
+	private Stack<Map<DroolsParaphraseTypes, String>> paraphrases = null;
 
 	/**
 	 * DroolsParserErrorMessages constructor.
@@ -54,7 +50,7 @@
 	 *            paraphrases parser structure
 	 */
 	public DroolsParserExceptionFactory(String[] tokenNames,
-			Stack<Map<Integer, String>> paraphrases) {
+			Stack<Map<DroolsParaphraseTypes, String>> paraphrases) {
 		this.tokenNames = tokenNames;
 		this.paraphrases = paraphrases;
 	}
@@ -163,8 +159,8 @@
 		} else if (e instanceof MismatchedSetException) {
 			MismatchedSetException mse = (MismatchedSetException) e;
 			message = String.format(
-					DroolsParserExceptionFactory.MISMATCHED_SET_MESSAGE, e.line,
-					e.charPositionInLine, getBetterToken(e.token),
+					DroolsParserExceptionFactory.MISMATCHED_SET_MESSAGE,
+					e.line, e.charPositionInLine, getBetterToken(e.token),
 					mse.expecting, formatParserLocation());
 			codeAndMessage.add(message);
 			codeAndMessage.add("ERR 105");
@@ -179,9 +175,9 @@
 		} else if (e instanceof FailedPredicateException) {
 			FailedPredicateException fpe = (FailedPredicateException) e;
 			message = String.format(
-					DroolsParserExceptionFactory.FAILED_PREDICATE_MESSAGE, e.line,
-					e.charPositionInLine, fpe.ruleName, fpe.predicateText,
-					formatParserLocation());
+					DroolsParserExceptionFactory.FAILED_PREDICATE_MESSAGE,
+					e.line, e.charPositionInLine, fpe.ruleName,
+					fpe.predicateText, formatParserLocation());
 			codeAndMessage.add(message);
 			codeAndMessage.add("ERR 107");
 		}
@@ -196,14 +192,15 @@
 	 */
 	private String formatParserLocation() {
 		StringBuilder sb = new StringBuilder();
-		for (Map<Integer, String> map : paraphrases) {
-			for (Entry<Integer, String> activeEntry : map.entrySet()) {
+		for (Map<DroolsParaphraseTypes, String> map : paraphrases) {
+			for (Entry<DroolsParaphraseTypes, String> activeEntry : map
+					.entrySet()) {
 				if (activeEntry.getValue().length() == 0) {
 					sb.append(String.format(PARSER_LOCATION_MESSAGE_PART,
-							parserLocations[activeEntry.getKey()]));
+							getLocationName(activeEntry.getKey())));
 				} else {
 					sb.append(String.format(PARSER_LOCATION_MESSAGE_COMPLETE,
-							parserLocations[activeEntry.getKey()], activeEntry
+							getLocationName(activeEntry.getKey()), activeEntry
 									.getValue()));
 				}
 			}
@@ -212,6 +209,40 @@
 	}
 
 	/**
+	 * Returns a string based on Paraphrase Type
+	 * 
+	 * @param type
+	 *            Paraphrase Type
+	 * @return a string representing the
+	 */
+	private String getLocationName(DroolsParaphraseTypes type) {
+		switch (type) {
+		case PACKAGE:
+			return "package";
+		case IMPORT:
+			return "import";
+		case FUNCTION_IMPORT:
+			return "function import";
+		case GLOBAL:
+			return "global";
+		case FUNCTION:
+			return "function";
+		case QUERY:
+			return "query";
+		case TEMPLATE:
+			return "template";
+		case RULE:
+			return "rule";
+		case RULE_ATTRIBUTE:
+			return "rule attribute";
+		case PATTERN:
+			return "pattern";
+		default:
+			return "";
+		}
+	}
+
+	/**
 	 * Helper method that creates a user friendly token definition
 	 * 
 	 * @param token

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentence.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentence.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -0,0 +1,130 @@
+package org.drools.lang;
+
+import java.util.Collections;
+import java.util.LinkedList;
+
+/**
+ * Class that represents a DroolsLanguage sentence. To be used by IDE.
+ * 
+ * @author porcelli
+ */
+ at SuppressWarnings("unchecked")
+public class DroolsSentence {
+
+	/**
+	 * sentence type
+	 */
+	private DroolsSentenceType type = DroolsSentenceType.RULE;
+	/**
+	 * linked list that stores DroolsTokens and Locations
+	 */
+	private LinkedList content = new LinkedList();
+	/**
+	 * start char offset
+	 */
+	private int startOffset = -1;
+	/**
+	 * end char offset
+	 */
+	private int endOffset = -1;
+
+	/**
+	 * getter of sentence type
+	 * 
+	 * @return sentence type
+	 * @see DroolsSentenceType
+	 */
+	public DroolsSentenceType getType() {
+		return type;
+	}
+
+	/**
+	 * setter of sentence type
+	 * 
+	 * @param type
+	 *            sentence type
+	 * @see DroolsSentenceType
+	 */
+	public void setType(DroolsSentenceType type) {
+		this.type = type;
+	}
+
+	/**
+	 * getter for start char offset
+	 * 
+	 * @return start char offset
+	 */
+	public int getStartOffset() {
+		return startOffset;
+	}
+
+	/**
+	 * setter for start char offset
+	 * 
+	 * @param startOffset
+	 *            start char offset
+	 */
+	public void setStartOffset(int startOffset) {
+		this.startOffset = startOffset;
+	}
+
+	/**
+	 * getter for end char offset
+	 * 
+	 * @return end char offset
+	 */
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	/**
+	 * setter for end char offset
+	 * 
+	 * @param endOffset
+	 *            end char offset
+	 */
+	public void setEndOffset(int endOffset) {
+		this.endOffset = endOffset;
+	}
+
+	/**
+	 * getter of sentence content
+	 * 
+	 * @return linked list that stores DroolsTokens and Locations
+	 */
+	public LinkedList getContent() {
+		return content;
+	}
+
+	/**
+	 * Reverses the content linked list
+	 */
+	public void reverseContent() {
+		Collections.reverse(content);
+	}
+
+	/**
+	 * Add a token to the content and sets char offset info
+	 * 
+	 * @param token
+	 *            token to be stored
+	 */
+	public void addContent(DroolsToken token) {
+		if (startOffset == -1) {
+			startOffset = token.getStartIndex();
+		}
+		endOffset = token.getStopIndex();
+		this.content.add(token);
+	}
+
+	/**
+	 * Add a location to the content
+	 * 
+	 * @param contextInfo
+	 *            location identifier
+	 * @see Location
+	 */
+	public void addContent(int contextInfo) {
+		this.content.add(contextInfo);
+	}
+}
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentence.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentenceType.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentenceType.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentenceType.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -0,0 +1,12 @@
+package org.drools.lang;
+
+/**
+ * Enum to identify a sentence type. This is used by DRLParser and stored into
+ * DroolsSentence.
+ * 
+ * @author porcelli
+ * @see DroolsSentence
+ */
+public enum DroolsSentenceType {
+	PACKAGE, RULE_ATTRIBUTE, FUNCTION_IMPORT_STATEMENT, IMPORT_STATEMENT, GLOBAL, FUNCTION, TEMPLATE, TYPE_DECLARATION, RULE, QUERY;
+}
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSentenceType.java
___________________________________________________________________
Name: svn:eol-style
   + native

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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsSoftKeywords.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -28,16 +28,15 @@
 	public static final String SALIENCE = "salience";
 	public static final String ENABLED = "enabled";
 	public static final String ATTRIBUTES = "attributes";
-	public static final String WHEN = "when";
 	public static final String RULE = "rule";
 	public static final String TEMPLATE = "template";
 	public static final String QUERY = "query";
 	public static final String DECLARE = "declare";
 	public static final String FUNCTION = "function";
 	public static final String GLOBAL = "global";
-	public static final String EVAL = "eval";
 	public static final String CONTAINS = "contains";
 	public static final String MATCHES = "matches";
+	public static final String EVAL = "eval";
 	public static final String EXCLUDES = "excludes";
 	public static final String SOUNDSLIKE = "soundslike";
 	public static final String MEMBEROF = "memberof";
@@ -47,13 +46,8 @@
 	public static final String AND = "and";
 	public static final String EXISTS = "exists";
 	public static final String FORALL = "forall";
-	public static final String FROM = "from";
 	public static final String ENTRY = "entry";
 	public static final String POINT = "point";
-	public static final String ACCUMULATE = "accumulate";
-	public static final String INIT = "init";
 	public static final String ACTION = "action";
 	public static final String REVERSE = "reverse";
-	public static final String RESULT = "result";
-	public static final String COLLECT = "collect";
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsToken.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsToken.java	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsToken.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -5,8 +5,7 @@
 import org.antlr.runtime.Token;
 
 /**
- * An extension of the CommonToken class that keeps the char offset
- * information
+ * An extension of the CommonToken class that keeps the char offset information
  * 
  * @author porcelli
  * 
@@ -15,6 +14,13 @@
 
 	private static final long serialVersionUID = 3635806195731072579L;
 
+	/**
+	 * editor type
+	 * 
+	 * @see DroolsEditorType
+	 */
+	private DroolsEditorType editorType = DroolsEditorType.IDENTIFIER;
+
 	public DroolsToken(int type) {
 		super(type);
 	}
@@ -42,4 +48,25 @@
 			stop = ((CommonToken) oldToken).getStopIndex();
 		}
 	}
+
+	/**
+	 * getter of editor type
+	 * 
+	 * @return editor type
+	 * @see DroolsEditorType
+	 */
+	public DroolsEditorType getEditorType() {
+		return editorType;
+	}
+
+	/**
+	 * setter of editor type
+	 * 
+	 * @param editorElementType
+	 *            editor type
+	 * @see DroolsEditorType
+	 */
+	public void setEditorType(DroolsEditorType editorType) {
+		this.editorType = editorType;
+	}
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTree.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTree.java	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTree.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -27,7 +27,7 @@
 	 * 
 	 * @see DroolsEditorType
 	 */
-	int editorElementType = -1;
+	DroolsEditorType editorElementType = DroolsEditorType.IDENTIFIER;
 
 	public DroolsTree(DroolsTree node) {
 		super(node);
@@ -86,7 +86,7 @@
 	 * @return editor type
 	 * @see DroolsEditorType
 	 */
-	public int getEditorElementType() {
+	public DroolsEditorType getEditorElementType() {
 		return editorElementType;
 	}
 
@@ -97,7 +97,7 @@
 	 *            editor type
 	 * @see DroolsEditorType
 	 */
-	public void setEditorElementType(int editorElementType) {
+	public void setEditorElementType(DroolsEditorType editorElementType) {
 		this.editorElementType = editorElementType;
 	}
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DroolsTreeAdaptor.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -31,15 +31,17 @@
 			tree.setEndCharOffset(((CommonToken) token).getStopIndex());
 
 			if (token.getType() == DRLLexer.END
+					|| token.getType() == DRLLexer.VK_EVAL
 					|| token.getType() == DRLLexer.THEN
-					|| token.getType() == DRLLexer.VK_ACCUMULATE
+					|| token.getType() == DRLLexer.WHEN
+					|| token.getType() == DRLLexer.ACCUMULATE
 					|| token.getType() == DRLLexer.VK_ACTION
 					|| token.getType() == DRLLexer.VK_ACTIVATION_GROUP
 					|| token.getType() == DRLLexer.VK_AGENDA_GROUP
 					|| token.getType() == DRLLexer.VK_AND
 					|| token.getType() == DRLLexer.VK_ATTRIBUTES
 					|| token.getType() == DRLLexer.VK_AUTO_FOCUS
-					|| token.getType() == DRLLexer.VK_COLLECT
+					|| token.getType() == DRLLexer.COLLECT
 					|| token.getType() == DRLLexer.VK_CONTAINS
 					|| token.getType() == DRLLexer.VK_DATE_EFFECTIVE
 					|| token.getType() == DRLLexer.VK_DATE_EXPIRES
@@ -48,16 +50,15 @@
 					|| token.getType() == DRLLexer.VK_DURATION
 					|| token.getType() == DRLLexer.VK_ENABLED
 					|| token.getType() == DRLLexer.VK_ENTRY_POINT
-					|| token.getType() == DRLLexer.VK_EVAL
 					|| token.getType() == DRLLexer.VK_EXCLUDES
 					|| token.getType() == DRLLexer.VK_EXISTS
 					|| token.getType() == DRLLexer.VK_FORALL
-					|| token.getType() == DRLLexer.VK_FROM
+					|| token.getType() == DRLLexer.FROM
 					|| token.getType() == DRLLexer.VK_FUNCTION
 					|| token.getType() == DRLLexer.VK_GLOBAL
 					|| token.getType() == DRLLexer.VK_IMPORT
 					|| token.getType() == DRLLexer.VK_IN
-					|| token.getType() == DRLLexer.VK_INIT
+					|| token.getType() == DRLLexer.INIT
 					|| token.getType() == DRLLexer.VK_LOCK_ON_ACTIVE
 					|| token.getType() == DRLLexer.VK_MATCHES
 					|| token.getType() == DRLLexer.VK_MEMBEROF
@@ -66,14 +67,13 @@
 					|| token.getType() == DRLLexer.VK_OR
 					|| token.getType() == DRLLexer.VK_PACKAGE
 					|| token.getType() == DRLLexer.VK_QUERY
-					|| token.getType() == DRLLexer.VK_RESULT
+					|| token.getType() == DRLLexer.RESULT
 					|| token.getType() == DRLLexer.VK_REVERSE
 					|| token.getType() == DRLLexer.VK_RULE
 					|| token.getType() == DRLLexer.VK_RULEFLOW_GROUP
 					|| token.getType() == DRLLexer.VK_SALIENCE
 					|| token.getType() == DRLLexer.VK_SOUNDSLIKE
-					|| token.getType() == DRLLexer.VK_TEMPLATE
-					|| token.getType() == DRLLexer.VK_WHEN) {
+					|| token.getType() == DRLLexer.VK_TEMPLATE) {
 				tree.setEditorElementType(DroolsEditorType.KEYWORD);
 			} else if (token.getType() == DRLLexer.FLOAT
 					|| token.getType() == DRLLexer.INT) {

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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2008-08-21 19:48:02 UTC (rev 21668)
@@ -69,7 +69,6 @@
 	VK_SALIENCE;
 	VK_ENABLED;
 	VK_ATTRIBUTES;
-	VK_WHEN;
 	VK_RULE;
 	VK_IMPORT;
 	VK_PACKAGE;
@@ -91,18 +90,15 @@
 	VK_AND;
 	VK_EXISTS;
 	VK_FORALL;
-	VK_FROM;
-	VK_ACCUMULATE;
-	VK_INIT;
 	VK_ACTION;
 	VK_REVERSE;
-	VK_RESULT;
-	VK_COLLECT;
 }
 
 @parser::header {
 	package org.drools.lang;
 	
+	import java.util.List;
+	import java.util.LinkedList;
 	import org.drools.compiler.DroolsParserException;
 }
 
@@ -129,12 +125,96 @@
 }
 
 @parser::members {
-	private Stack<Map<Integer, String>> paraphrases = new Stack<Map<Integer, String>>();
+	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);
 	private String source = "unknown";
 	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) {
+				editorInterface = new LinkedList<DroolsSentence>();
+			}
+			DroolsSentence sentence = new DroolsSentence();
+			sentence.setType(sentenceType);
+			editorInterface.add(sentence);
+		}
+	}
+
+	private DroolsSentence getActiveSentence(){
+		return editorInterface.getLast();
+	}
+
+	private void emit(List tokens, DroolsEditorType editorType){
+		if (isEditorInterfaceEnabled && tokens != null) {		
+			for (Object activeObject : tokens){
+				emit((Token) activeObject, editorType);
+			}
+		}
+	}
+
+	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) {
+			if (!forceEmit && activeContext == Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR){
+				if (input.LA(1) == EOF && input.get(input.index() - 1).getType() == WS){
+					getActiveSentence().addContent(activeContext);
+				}
+			} else if (!forceEmit && activeContext == Location.LOCATION_LHS_BEGIN_OF_CONDITION && getLastTokenOnList(getActiveSentence().getContent()).getType() == FROM) {
+				//
+			} else {
+				getActiveSentence().addContent(activeContext);
+			}
+		}
+	}
+	
+	private void emit(int activeContext){
+		if (isEditorInterfaceEnabled) {
+			emit(false, activeContext);
+		}
+	}
+
+	private DroolsToken getLastTokenOnList(LinkedList list){
+		DroolsToken lastToken = null;
+		for (Object object : list) {
+			if (object instanceof DroolsToken) {
+				lastToken = (DroolsToken) object;
+			}
+		}
+		return lastToken;
+	}
+
+	private int getLastIntegerValue(LinkedList list) {
+		int lastIntergerValue = -1;
+		for (Object object : list) {
+			if (object instanceof Integer) {
+				lastIntergerValue = (Integer) object;
+			}
+		}
+		return lastIntergerValue;
+	}
+
 	private boolean validateLT(int LTNumber, String text) {
 		if (null == input)
 			return false;
@@ -168,15 +248,6 @@
 		return false;
 	}
 
-	private boolean validateWhenWithParenthesis(){
-		if (input.LA(1) == ID && validateIdentifierKey(DroolsSoftKeywords.WHEN) && input.LA(2) == COLON && input.LA(3) == LEFT_PAREN && !(validateLT(4, DroolsSoftKeywords.OR) || validateLT(4, DroolsSoftKeywords.AND))){
-			return true;
-		} else if (input.LA(1) == ID && validateIdentifierKey(DroolsSoftKeywords.WHEN) && input.LA(2) == LEFT_PAREN && !(validateLT(3, DroolsSoftKeywords.OR) || validateLT(3, DroolsSoftKeywords.AND))){
-			return true;
-		}
-		return false;
-	}
-
 	private boolean validateRestr() {
 		int lookahead = 2;
 		int countParen = 1;
@@ -188,6 +259,8 @@
 				countParen++;
 			} else if (input.LA(lookahead) == RIGHT_PAREN) {
 				countParen--;
+			} else if (input.LA(lookahead) == EOF) {
+				break;
 			}
 			if (countParen == 0){
 				break;
@@ -254,8 +327,8 @@
 	 * @param type
 	 *            paraphrase type
 	 */
-	private void pushParaphrases(int type) {
-		Map<Integer, String> activeMap = new HashMap<Integer, String>();
+	private void pushParaphrases(DroolsParaphraseTypes type) {
+		Map<DroolsParaphraseTypes, String> activeMap = new HashMap<DroolsParaphraseTypes, String>();
 		activeMap.put(type, "");
 		paraphrases.push(activeMap);
 	}
@@ -268,7 +341,7 @@
 	 * @param value
 	 *            paraphrase value
 	 */
-	private void setParaphrasesValue(int type, String value) {
+	private void setParaphrasesValue(DroolsParaphraseTypes type, String value) {
 		paraphrases.peek().put(type, value);
 	}
 
@@ -305,22 +378,29 @@
 	}
 
 package_statement
- at init  { pushParaphrases(DroolsParaphareseTypes.PACKAGE); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.PACKAGE); }
 @after { paraphrases.pop(); }
-	:	package_key package_id SEMICOLON?
+	:
+	{	beginSentence(DroolsSentenceType.PACKAGE);	}
+		package_key
+		package_id SEMICOLON?
+	{	emit($SEMICOLON, DroolsEditorType.SYMBOL);	}
 		-> ^(package_key package_id)
 	;
 
 package_id
 	:	id+=ID ( id+=DOT id+=ID )*
-	{	setParaphrasesValue(DroolsParaphareseTypes.PACKAGE, buildStringFromTokens($id));	}
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.PACKAGE, buildStringFromTokens($id));	}
 		-> ^(VT_PACKAGE_ID ID+)
 	;
 
 statement
 options{
 k = 2;
-}	:	rule_attribute
+}	:	
+	{	beginSentence(DroolsSentenceType.RULE_ATTRIBUTE);	}
+		rule_attribute
 	|{(validateLT(1, "import") && validateLT(2, "function") )}?=> function_import_statement 
 	|	import_statement 
 	|	global 
@@ -332,69 +412,94 @@
 	;
 
 import_statement
- at init  { pushParaphrases(DroolsParaphareseTypes.IMPORT); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.IMPORT); }
 @after { paraphrases.pop(); }
-	:	import_key import_name[DroolsParaphareseTypes.IMPORT] SEMICOLON?
+	:
+	{	beginSentence(DroolsSentenceType.IMPORT_STATEMENT);	}
+		import_key import_name[DroolsParaphraseTypes.IMPORT] SEMICOLON?
+	{	emit($SEMICOLON, DroolsEditorType.SYMBOL);	}
 		-> ^(import_key import_name)
 	;
 
 function_import_statement
- at init  { pushParaphrases(DroolsParaphareseTypes.FUNCTION_IMPORT); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.FUNCTION_IMPORT); }
 @after { paraphrases.pop(); }
-	:	imp=import_key function_key import_name[DroolsParaphareseTypes.FUNCTION_IMPORT] SEMICOLON?
+	:
+	{	beginSentence(DroolsSentenceType.FUNCTION_IMPORT_STATEMENT);	}
+		imp=import_key function_key import_name[DroolsParaphraseTypes.FUNCTION_IMPORT] SEMICOLON?
+	{	emit($SEMICOLON, DroolsEditorType.SYMBOL);	}		
 		-> ^(VT_FUNCTION_IMPORT[$imp.start] function_key import_name)
 	;
 
-import_name [int importType]
+import_name [DroolsParaphraseTypes importType]
 	:	id+=ID ( id+=DOT id+=ID )* id+=DOT_STAR?
-	{	setParaphrasesValue($importType, buildStringFromTokens($id));	}
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue($importType, buildStringFromTokens($id));	}
 		-> ^(VT_IMPORT_ID ID+ DOT_STAR?)
 	;
 
 global
- at init  { pushParaphrases(DroolsParaphareseTypes.GLOBAL); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.GLOBAL); }
 @after { paraphrases.pop(); }
-	:	global_key data_type global_id SEMICOLON?
+	:
+	{	beginSentence(DroolsSentenceType.GLOBAL);	}
+		global_key data_type global_id SEMICOLON?
+	{	emit($SEMICOLON, DroolsEditorType.SYMBOL);	}
 		-> ^(global_key data_type global_id)
 	;
 
 global_id
 	:	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.GLOBAL, $id.text);	}
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.GLOBAL, $id.text);	}
 		-> VT_GLOBAL_ID[$id]
 	;
 
 function
- at init  { pushParaphrases(DroolsParaphareseTypes.FUNCTION); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.FUNCTION); }
 @after { paraphrases.pop(); }
-	:	function_key data_type? function_id parameters curly_chunk
+	:
+	{	beginSentence(DroolsSentenceType.FUNCTION);	}
+		function_key data_type? function_id parameters curly_chunk
 		-> ^(function_key data_type? function_id parameters curly_chunk)
 	;
 
 function_id
 	:	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.FUNCTION, $id.text);	}
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.FUNCTION, $id.text);	}
 		-> VT_FUNCTION_ID[$id]
 	;
 
 query
- at init  { pushParaphrases(DroolsParaphareseTypes.QUERY); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.QUERY); }
 @after { paraphrases.pop(); }
-	:	query_key query_id parameters? normal_lhs_block END SEMICOLON?
+	:
+	{	beginSentence(DroolsSentenceType.QUERY);	}
+		query_key query_id 
+	{	emit(Location.LOCATION_RULE_HEADER);	}
+		parameters? 
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
+		normal_lhs_block 
+		END SEMICOLON?
+	{	emit($END, DroolsEditorType.KEYWORD);
+		emit($SEMICOLON, DroolsEditorType.SYMBOL);	}
 		-> ^(query_key query_id parameters? normal_lhs_block END)
 	;
 
 query_id
 	: 	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.QUERY, $id.text);	} -> VT_QUERY_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.QUERY, $id.text);	} -> VT_QUERY_ID[$id]
 	| 	id=STRING
-	{	setParaphrasesValue(DroolsParaphareseTypes.QUERY, $id.text);	} -> VT_QUERY_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.QUERY, $id.text);	} -> VT_QUERY_ID[$id]
 	;
 
 parameters
-	:	LEFT_PAREN
-			( param_definition (COMMA param_definition)* )?
-		RIGHT_PAREN
+	:	LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}
+			( param_definition (COMMA {	emit($COMMA, DroolsEditorType.SYMBOL);	} param_definition)* )?
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 		-> ^(VT_PARAM_LIST param_definition* RIGHT_PAREN)
 	;
 
@@ -403,93 +508,125 @@
 	;
 
 argument
-	:	ID dimension_definition*
+	:	ID {	emit($ID, DroolsEditorType.IDENTIFIER);	}
+		dimension_definition*
 	;
 
 type_declaration
- at init  { pushParaphrases(DroolsParaphareseTypes.TYPE_DECLARE); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.TYPE_DECLARE); }
 @after { paraphrases.pop(); }
-	:	declare_key  type_declare_id
+	:
+	{	beginSentence(DroolsSentenceType.TYPE_DECLARATION);	}
+		declare_key  type_declare_id
 		decl_metadata*
 		decl_field*
 		END
+	{	emit($END, DroolsEditorType.KEYWORD);	}
 		-> ^(declare_key type_declare_id decl_metadata* decl_field* END)
 	;
 
 type_declare_id
 	: 	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.TYPE_DECLARE, $id.text);	} -> VT_TYPE_DECLARE_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.TYPE_DECLARE, $id.text);	} -> VT_TYPE_DECLARE_ID[$id]
 	;
 
 decl_metadata
-	:	AT ID paren_chunk
+	:	AT 
+	{	emit($AT, DroolsEditorType.SYMBOL);	}
+		ID
+	{	emit($ID, DroolsEditorType.IDENTIFIER);	}
+		paren_chunk
 		-> ^(AT ID paren_chunk)
 	;
 
 decl_field
-	:	ID decl_field_initialization? COLON data_type
+	:	ID	{	emit($ID, DroolsEditorType.IDENTIFIER);	}
+		decl_field_initialization? 
+		COLON	{	emit($COLON, DroolsEditorType.SYMBOL);	}
+		data_type
 		decl_metadata*
 		-> ^(ID decl_field_initialization? data_type decl_metadata*)
 	;
 
 decl_field_initialization
-	:	EQUALS paren_chunk
+	:	EQUALS	{	emit($EQUALS, DroolsEditorType.SYMBOL);	}
+		paren_chunk
 	-> ^(EQUALS paren_chunk)
 	;
 
 template
- at init  { pushParaphrases(DroolsParaphareseTypes.TEMPLATE); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.TEMPLATE); }
 @after { paraphrases.pop(); }
-	:	template_key template_id SEMICOLON?
+	:	
+	{	beginSentence(DroolsSentenceType.TEMPLATE);	}
+		template_key template_id 
+		semi1=SEMICOLON?
+	{	emit($semi1, DroolsEditorType.SYMBOL);	}
 		template_slot+
-		END SEMICOLON?
+		END semi2=SEMICOLON?
+	{	emit($END, DroolsEditorType.KEYWORD);
+		emit($semi2, DroolsEditorType.SYMBOL);	}
 		-> ^(template_key template_id template_slot+ END)
 	;
 
 template_id
 	: 	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.TEMPLATE, $id.text);	} -> VT_TEMPLATE_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.TEMPLATE, $id.text);	} -> VT_TEMPLATE_ID[$id]
 	| 	id=STRING
-	{	setParaphrasesValue(DroolsParaphareseTypes.TEMPLATE, $id.text);	} -> VT_TEMPLATE_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.TEMPLATE, $id.text);	} -> VT_TEMPLATE_ID[$id]
 	;
 
 template_slot
 	:	 data_type slot_id SEMICOLON?
+	{	emit($SEMICOLON, DroolsEditorType.SYMBOL);	}
 		-> ^(VT_SLOT data_type slot_id)
 	;
 
-slot_id	:	id=ID
+slot_id
+	:	id=ID
+	{	emit($id, DroolsEditorType.IDENTIFIER);	}
 		-> VT_SLOT_ID[$id]
 	;
 
 rule
- at init  { pushParaphrases(DroolsParaphareseTypes.RULE); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.RULE); }
 @after { paraphrases.pop(); }
-	:	rule_key rule_id rule_attributes? when_part? rhs_chunk
+	:
+	{	beginSentence(DroolsSentenceType.RULE);	}
+		rule_key rule_id 
+	{	emit(Location.LOCATION_RULE_HEADER);	}		
+		rule_attributes? when_part? rhs_chunk
 		-> ^(rule_key rule_id rule_attributes? when_part? rhs_chunk)
 	;
 
 when_part
-	: {validateWhenWithParenthesis()}?	when_key COLON? normal_lhs_block
-	->	when_key normal_lhs_block
-	|	when_key COLON? normal_lhs_block
-	->	when_key normal_lhs_block
+	: 	WHEN {	emit($WHEN, DroolsEditorType.KEYWORD);	}
+		COLON? {	emit($COLON, DroolsEditorType.SYMBOL);	}
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
+		normal_lhs_block
+	->	WHEN normal_lhs_block
 	;
 
 rule_id
 	: 	id=ID
-	{	setParaphrasesValue(DroolsParaphareseTypes.RULE, $id.text);	} -> VT_RULE_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.RULE, $id.text);	} -> VT_RULE_ID[$id]
 	| 	id=STRING
-	{	setParaphrasesValue(DroolsParaphareseTypes.RULE, $id.text);	} -> VT_RULE_ID[$id]
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.RULE, $id.text);	} -> VT_RULE_ID[$id]
 	;
 
 rule_attributes
-	:	( attributes_key COLON )? rule_attribute ( COMMA? attr=rule_attribute )*
+	:	( attributes_key COLON {	emit($COLON, DroolsEditorType.SYMBOL);	} )? 
+		rule_attribute ( COMMA? {	emit($COMMA, DroolsEditorType.SYMBOL);	} attr=rule_attribute )*
 		-> ^(VT_RULE_ATTRIBUTES attributes_key? rule_attribute+)
 	;
 
 rule_attribute
- at init  { pushParaphrases(DroolsParaphareseTypes.RULE_ATTRIBUTE); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.RULE_ATTRIBUTE); }
 @after { paraphrases.pop(); }
 	:	salience 
 	|	no_loop  
@@ -507,53 +644,64 @@
 
 date_effective
 	:	date_effective_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;
 
 date_expires
-	:	date_expires_key^ STRING  
+	:	date_expires_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;
 	
 enabled
 	:	enabled_key^ BOOL
+	{	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
 	;	
 
 salience
 	:	salience_key^
-		( INT   
+		( INT 	{	emit($INT, DroolsEditorType.NUMERIC_CONST );	}
 		| paren_chunk
 		)
 	;
-	
+
 no_loop
 	:	no_loop_key^ BOOL?
+	{	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
 	;
 
 auto_focus
 	:	auto_focus_key^ BOOL?
+	{	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
 	;	
 	
 activation_group
 	:	activation_group_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;
 
 ruleflow_group
 	:	ruleflow_group_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;
 
 agenda_group
 	:	agenda_group_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;
 
 duration
-	:	duration_key^ INT 
+	:	duration_key^ INT
+	{	emit($INT, DroolsEditorType.NUMERIC_CONST );	}
 	;	
 	
 dialect
-	:	dialect_key^ STRING   
+	:	dialect_key^ STRING
+	{	emit($STRING, DroolsEditorType.STRING_CONST );	}
 	;			
 	
 lock_on_active
 	:	lock_on_active_key^ BOOL?
+	{	emit($BOOL, DroolsEditorType.BOOLEAN_CONST );	}
 	;
 
 normal_lhs_block
@@ -567,40 +715,58 @@
 lhs_or
 @init{
 	Token orToken = null;
-}	:	(LEFT_PAREN or_key)=> LEFT_PAREN or=or_key lhs_and+ RIGHT_PAREN // PREFIX
+}	:	(LEFT_PAREN or_key)=> 
+		LEFT_PAREN  {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}
+			or=or_key
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	}
+			lhs_and+ 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	} // PREFIX 
 		-> ^(VT_OR_PREFIX[$or.start] lhs_and+ RIGHT_PAREN)
 	|	(lhs_and -> lhs_and) 
-		( (or_key|DOUBLE_PIPE)=> (value=or_key {orToken = $value.start;} |pipe=DOUBLE_PIPE {orToken = $pipe;}) lhs_and 
+		( (or_key|DOUBLE_PIPE)=> (value=or_key {orToken = $value.start;} |pipe=DOUBLE_PIPE {orToken = $pipe; emit($DOUBLE_PIPE, DroolsEditorType.SYMBOL);}) 
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	}
+		lhs_and 
 		-> ^(VT_OR_INFIX[orToken] $lhs_or lhs_and))*
 	;
 
 lhs_and
 @init{
 	Token andToken = null;
-}	:	(LEFT_PAREN and_key)=> LEFT_PAREN and=and_key lhs_unary+ RIGHT_PAREN // PREFIX
+}	:	(LEFT_PAREN and_key)=> 
+		LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+			and=and_key
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	}
+			lhs_unary+ 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}  // PREFIX
 		-> ^(VT_AND_PREFIX[$and.start] lhs_unary+ RIGHT_PAREN)
 	|	(lhs_unary -> lhs_unary) 
-		( (and_key|DOUBLE_AMPER)=> (value=and_key {andToken = $value.start;} |amper=DOUBLE_AMPER {andToken = $amper;}) lhs_unary 
+		( (and_key|DOUBLE_AMPER)=> (value=and_key {andToken = $value.start;} |amper=DOUBLE_AMPER {andToken = $amper; emit($DOUBLE_AMPER, DroolsEditorType.SYMBOL);}) 
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR);	}
+		lhs_unary 
 		-> ^(VT_AND_INFIX[andToken] $lhs_and lhs_unary) )*
 	;
 
 lhs_unary
-options{backtrack=true;}
 	:	(	lhs_exist
 		|{validateNotWithBinding()}?=>	lhs_not_binding
 		|	lhs_not
 		|	lhs_eval
 		|	lhs_forall
-		|	LEFT_PAREN! lhs_or RIGHT_PAREN
+		|	LEFT_PAREN! {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	}  
+				lhs_or 
+			RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 		|	pattern_source
 		)
-		((SEMICOLON)=> SEMICOLON!)?
+		((SEMICOLON)=> SEMICOLON! {	emit($SEMICOLON, DroolsEditorType.SYMBOL);	})?
 	;
 
 lhs_exist
 	:	exists_key
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS);	}
 	        ( (LEFT_PAREN (or_key|and_key))=> lhs_or //prevent "((" 
-		| LEFT_PAREN lhs_or RIGHT_PAREN
+		| LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+			lhs_or 
+		  RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 	        | lhs_pattern
 	        )
 	        -> ^(exists_key lhs_or? lhs_pattern? RIGHT_PAREN?)
@@ -612,30 +778,42 @@
 	;
 
 lhs_not	:	not_key
-		( (LEFT_PAREN (or_key|and_key))=> lhs_or //prevent "((" 
-		|	LEFT_PAREN lhs_or RIGHT_PAREN 
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT);	}
+		( (LEFT_PAREN (or_key|and_key))=> {	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	} lhs_or //prevent "((" 
+		|	LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL); emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION );	} 
+				lhs_or 
+			RIGHT_PAREN  {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 		| 	lhs_pattern )
 	        -> ^(not_key lhs_or? lhs_pattern? RIGHT_PAREN?)
 	;
 
 lhs_eval
-	:	ev=eval_key pc=paren_chunk
+	:	ev=eval_key
+	{	emit(Location.LOCATION_LHS_INSIDE_EVAL);	}
+		pc=paren_chunk
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
 	{	String body = safeSubstring( $pc.text, 1, $pc.text.length()-1 );
 		checkTrailingSemicolon( body, $ev.start );	}
 		-> ^(eval_key paren_chunk)
 	;
 
 lhs_forall
-	:	forall_key LEFT_PAREN lhs_pattern+ RIGHT_PAREN
+	:	forall_key 
+		LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+			lhs_pattern+ 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 		-> ^(forall_key lhs_pattern+ RIGHT_PAREN)
 	;
 
 pattern_source
-options { backtrack=true;}
+ at init { boolean isFailed = true;	}
+ at after { isFailed = false;	}
 	:	lhs_pattern
 		over_clause?
 		(
-			from_key^
+			FROM^
+		{	emit($FROM, DroolsEditorType.KEYWORD);
+			emit(Location.LOCATION_LHS_FROM);	}
 		        (  accumulate_statement
 		          | collect_statement 
 		          | entrypoint_statement
@@ -643,73 +821,131 @@
 		        )
 		)?
 	;
+finally {
+	if (isEditorInterfaceEnabled && input.LA(3) == EOF && input.LA(1) == ACCUMULATE) {
+			emit(input.LT(1), DroolsEditorType.KEYWORD);
+			emit(input.LT(2), DroolsEditorType.SYMBOL);
+			input.consume();
+			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE);
+	} else if (isEditorInterfaceEnabled && input.LA(3) == EOF && input.LA(1) == COLLECT) {
+			emit(input.LT(1), DroolsEditorType.KEYWORD);
+			emit(input.LT(2), DroolsEditorType.SYMBOL);
+			input.consume();
+			emit(true, Location.LOCATION_LHS_FROM_COLLECT);
+	}
+}
 
 over_clause
-	:	OVER^ over_elements (COMMA! over_elements)*
+	:	OVER^ {	emit($OVER, DroolsEditorType.KEYWORD);	} over_elements 
+			(COMMA! {	emit($COMMA, DroolsEditorType.SYMBOL);	} over_elements)*
 	;
 
 over_elements
-	:	ID COLON ID paren_chunk
-	-> ^(VT_BEHAVIOR ID ID paren_chunk)
+	:	id1=ID {	emit($id1, DroolsEditorType.IDENTIFIER);	} 
+		COLON {	emit($COLON, DroolsEditorType.SYMBOL);	} 
+		id2=ID {	emit($id2, DroolsEditorType.IDENTIFIER);	} 
+		paren_chunk
+	-> ^(VT_BEHAVIOR $id1 $id2 paren_chunk)
 	;
 
 accumulate_statement
-	:	accumulate_key
-		LEFT_PAREN lhs_or COMMA? 
+	:	ACCUMULATE {	emit($ACCUMULATE, DroolsEditorType.KEYWORD);	}
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE);	}
+		LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+			lhs_or 
+		COMMA? {	emit($COMMA, DroolsEditorType.SYMBOL);	} 
 		(	accumulate_init_clause
 		|	accumulate_id_clause
 		)
-		RIGHT_PAREN
-		-> ^(accumulate_key lhs_or accumulate_init_clause? accumulate_id_clause? RIGHT_PAREN)
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
+		-> ^(ACCUMULATE lhs_or accumulate_init_clause? accumulate_id_clause? RIGHT_PAREN)
 	;
 
+
 accumulate_init_clause
-	:	init_key
-	pc1=paren_chunk COMMA?
-	action_key pc2=paren_chunk COMMA?
-	( reverse_key pc3=paren_chunk COMMA?)?
-	result_key pc4=paren_chunk
-	-> ^(VT_ACCUMULATE_INIT_CLAUSE ^(init_key $pc1) ^(action_key $pc2) ^(reverse_key $pc3)? ^(result_key $pc4))
+	:	INIT {	emit($INIT, DroolsEditorType.KEYWORD);	}
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT);	}
+		pc1=paren_chunk cm1=COMMA? {	emit($cm1, DroolsEditorType.SYMBOL);	} 
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION);	}
+		action_key pc2=paren_chunk cm2=COMMA? {	emit($cm2, DroolsEditorType.SYMBOL);	} 
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE);	}
+
+	( reverse_key pc3=paren_chunk cm3=COMMA? {	emit($cm3, DroolsEditorType.SYMBOL);	}
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	} )?
+	{	emit(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT);	}
+		RESULT {	emit($RESULT, DroolsEditorType.KEYWORD);	} pc4=paren_chunk
+	-> ^(VT_ACCUMULATE_INIT_CLAUSE ^(INIT $pc1) ^(action_key $pc2) ^(reverse_key $pc3)? ^(RESULT $pc4))
 	;
+finally {
+	if (isEditorInterfaceEnabled && input.LA(1) == EOF) {
+		int lastPosition = getLastIntegerValue(getActiveSentence().getContent());
+		if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_INIT) {
+			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE);
+		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION) {
+			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE);
+		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE) {
+			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE);
+		} else if (lastPosition == Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT) {
+			emit(true, Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE);
+		}
+	}
+}
 
 accumulate_id_clause
-	:	id=ID text=paren_chunk
+	:	ID {	emit($ID, DroolsEditorType.IDENTIFIER);	}
+		paren_chunk
 	-> ^(VT_ACCUMULATE_ID_CLAUSE ID paren_chunk)
 	;
 
 collect_statement
-	:	collect_key
-		LEFT_PAREN pattern_source RIGHT_PAREN
-	-> ^(collect_key pattern_source RIGHT_PAREN)
+	:	COLLECT {	emit($COLLECT, DroolsEditorType.KEYWORD);	}
+	{	emit(Location.LOCATION_LHS_FROM_COLLECT);	}
+		LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}
+			pattern_source 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
+	-> ^(COLLECT pattern_source RIGHT_PAREN)
 	;
 
 entrypoint_statement
-	:	entry_point_key entrypoint_id
+	:	entry_point_key 
+	{	emit(Location.LOCATION_LHS_FROM_COLLECT);	}
+		entrypoint_id
+	{	emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);	}
 	-> ^(entry_point_key entrypoint_id)
 	;
 
 entrypoint_id
-	: 	value=ID	-> VT_ENTRYPOINT_ID[$value]
-	| 	value=STRING	-> VT_ENTRYPOINT_ID[$value]
+	: 	value=ID {	emit($value, DroolsEditorType.IDENTIFIER);	}
+		-> VT_ENTRYPOINT_ID[$value]
+	| 	value=STRING {	emit($value, DroolsEditorType.IDENTIFIER);	}
+		-> VT_ENTRYPOINT_ID[$value]
 	;
 
 from_source
-	:	ID
+	:	ID {	emit($ID, DroolsEditorType.IDENTIFIER);	}
 		( (LEFT_PAREN)=> args=paren_chunk )?
 		expression_chain?
+	{	if ( input.LA(1) == EOF && input.get(input.index() - 1).getType() == WS) {
+			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+		} else if ( input.LA(1) != EOF ) {
+			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+		}	}
 	->	^(VT_FROM_SOURCE ID paren_chunk? expression_chain?)
 	;
 	
 expression_chain
 	:
-	 startToken=DOT ID
+	 DOT {	emit($DOT, DroolsEditorType.IDENTIFIER);	} 
+	 ID {	emit($ID, DroolsEditorType.IDENTIFIER);	}
 	  (
 	    ( LEFT_SQUARE ) => square_chunk
 	    |
 	    ( LEFT_PAREN ) => paren_chunk
 	  )?
 	  expression_chain?
-	  -> ^(VT_EXPRESSION_CHAIN[$startToken] ID square_chunk? paren_chunk? expression_chain?)
+	  -> ^(VT_EXPRESSION_CHAIN[$DOT] ID square_chunk? paren_chunk? expression_chain?)
 	;
 
 lhs_pattern
@@ -720,7 +956,9 @@
 fact_binding
  	:	label
 		( fact
- 		| LEFT_PAREN fact_binding_expression RIGHT_PAREN
+ 		| LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}
+ 			fact_binding_expression 
+ 		  RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
  		)
  	-> ^(VT_FACT_BINDING label fact? fact_binding_expression? RIGHT_PAREN?)
 	;
@@ -733,14 +971,24 @@
 	;
 
 fact
- at init  { pushParaphrases(DroolsParaphareseTypes.PATTERN); }
+ at init  { pushParaphrases(DroolsParaphraseTypes.PATTERN); }
 @after { paraphrases.pop(); }
-	:	pattern_type LEFT_PAREN constraints? RIGHT_PAREN
+	:	pattern_type 
+		LEFT_PAREN {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	}
+			constraints? 
+		RIGHT_PAREN {		}
+	{	if ($RIGHT_PAREN.text.equals(")") ){ //WORKAROUND FOR ANTLR BUG!
+			emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);
+			emit(Location.LOCATION_LHS_BEGIN_OF_CONDITION);
+		}	}
 	->	^(VT_FACT pattern_type constraints? RIGHT_PAREN)
 	;
 
 constraints
-	:	constraint ( COMMA! constraint )*
+	:	constraint ( COMMA! 
+	{	emit($COMMA, DroolsEditorType.SYMBOL);
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_START);	} constraint )*
 	;
 
 constraint
@@ -748,39 +996,62 @@
 	;
 
 or_constr
-	:	and_constr ( DOUBLE_PIPE^ and_constr )* 
+	:	and_constr ( DOUBLE_PIPE^ 
+	{	emit($DOUBLE_PIPE, DroolsEditorType.SYMBOL);
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	} and_constr )* 
 	;
 
 and_constr
-	:	unary_constr ( DOUBLE_AMPER^ unary_constr )*
+	:	unary_constr ( DOUBLE_AMPER^ 
+	{	emit($DOUBLE_AMPER, DroolsEditorType.SYMBOL);
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	} unary_constr )*
 	;
 
 unary_constr
-options {k=2;}
+options { k=2; }
+ at init { boolean isFailed = true;	}
+ at after { isFailed = false;	}
 	:	eval_key^ paren_chunk
 	|	field_constraint
-	|	LEFT_PAREN! or_constr RIGHT_PAREN
+	| 	LEFT_PAREN! {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}  
+			or_constr 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
 	;
+finally { 
+	if (isEditorInterfaceEnabled && isFailed && input.LA(2) == EOF && input.LA(1) == ID) {
+		emit(input.LT(1), DroolsEditorType.IDENTIFIER);
+		input.consume();
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+	}	}
 
 field_constraint
 @init{
 	boolean isArrow = false;
-}	:	label accessor_path ( or_restr_connective | arw=ARROW paren_chunk {isArrow = true;})?
+}	:	label accessor_path 
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	}
+		( or_restr_connective | arw=ARROW {	emit($ARROW, DroolsEditorType.SYMBOL);	} paren_chunk {isArrow = true;})?
 		-> {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
+	|	accessor_path {	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	} or_restr_connective
 		-> ^(VT_FIELD accessor_path or_restr_connective)
 	;
 
-label	:	value=ID COLON -> VT_LABEL[$value]
+label
+	:	value=ID {	emit($ID, DroolsEditorType.IDENTIFIER);	} 
+		COLON {	emit($COLON, DroolsEditorType.SYMBOL);	} 
+		-> VT_LABEL[$value]
 	;
 
 or_restr_connective
-	:	and_restr_connective ({(validateRestr())}?=> DOUBLE_PIPE^ and_restr_connective )* 
+	:	and_restr_connective ({(validateRestr())}?=> DOUBLE_PIPE^ 
+	{	emit($DOUBLE_PIPE, DroolsEditorType.SYMBOL);
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	}  and_restr_connective )* 
 	;
 
 and_restr_connective
-	:	constraint_expression ({(validateRestr())}?=> DOUBLE_AMPER^ constraint_expression )*
+	:	constraint_expression ({(validateRestr())}?=> DOUBLE_AMPER^ 
+	{	emit($DOUBLE_AMPER, DroolsEditorType.SYMBOL);
+		emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	} constraint_expression )*
 	;
 
 constraint_expression
@@ -788,77 +1059,131 @@
 k=3;
 }	:	compound_operator
 	|	simple_operator
-	|	LEFT_PAREN! or_restr_connective RIGHT_PAREN
+	|	LEFT_PAREN! {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	} 
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);	}
+			or_restr_connective 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	} 
 	;
-	catch [ RecognitionException re ] {
-		if (!lookaheadTest){
-			reportError(re);
-			recover(input, re);
-		} else {
-			throw re;
+catch [ RecognitionException re ] {
+	if (!lookaheadTest){
+		reportError(re);
+		recover(input, re);
+	} else {
+		throw re;
+	}
+}
+finally {
+	if (isEditorInterfaceEnabled && input.LA(2) == EOF) {
+		if (input.LA(1) == ID) {
+			emit(input.LT(1), DroolsEditorType.KEYWORD);
+			input.consume();
+			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
 		}
+	} else if (isEditorInterfaceEnabled && input.LA(3) == EOF) {
+		if (input.LA(1) == ID && input.LA(2) == ID && validateLT(1, DroolsSoftKeywords.NOT)) {
+			emit(input.LT(1), DroolsEditorType.KEYWORD);
+			emit(input.LT(2), DroolsEditorType.KEYWORD);
+			input.consume();
+			input.consume();
+			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+		}
 	}
+}
 
 simple_operator
-	:	(EQUAL^
-	|	GREATER^
-	|	GREATER_EQUAL^
-	|	LESS^
-	|	LESS_EQUAL^
-	|	NOT_EQUAL^
-	|	not_key (contains_key^|soundslike_key^|matches_key^|memberof_key^| ID^ | GRAVE_ACCENT! ID^ square_chunk)
+	:	(EQUAL^ {	emit($EQUAL, DroolsEditorType.SYMBOL);	}
+	|	GREATER^ {	emit($GREATER, DroolsEditorType.SYMBOL);	}
+	|	GREATER_EQUAL^ {	emit($GREATER_EQUAL, DroolsEditorType.SYMBOL);	}
+	|	LESS^ {	emit($LESS, DroolsEditorType.SYMBOL);	}
+	|	LESS_EQUAL^ {	emit($LESS_EQUAL, DroolsEditorType.SYMBOL);	}
+	|	NOT_EQUAL^ {	emit($NOT_EQUAL, DroolsEditorType.SYMBOL);	}
+	|	not_key 
+		(	contains_key^
+		|	soundslike_key^
+		|	matches_key^
+		|	memberof_key^
+		|	id1=ID^ {	emit($id1, DroolsEditorType.IDENTIFIER);	}
+		|	ga1=GRAVE_ACCENT!  {	emit($ga1, DroolsEditorType.SYMBOL);	} id2=ID^  {	emit($id2, DroolsEditorType.IDENTIFIER);	} square_chunk)
 	|	contains_key^
 	|	excludes_key^
 	|	matches_key^
 	|	soundslike_key^
 	|	memberof_key^
-	|	ID^
-	|	GRAVE_ACCENT! ID^ square_chunk)
+	|	id3=ID^ {	emit($id3, DroolsEditorType.IDENTIFIER);	}
+	|	ga2=GRAVE_ACCENT!  {	emit($ga2, DroolsEditorType.SYMBOL);	} id4=ID^  {	emit($id4, DroolsEditorType.IDENTIFIER);	} square_chunk)
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	}
 	expression_value
 	;
 
 //Simple Syntax Sugar
 compound_operator 
-	:	( in_key^ | not_key in_key^ ) LEFT_PAREN! expression_value ( COMMA! expression_value )* RIGHT_PAREN
+	:	( in_key^ | not_key in_key^ ) 
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);	}
+		LEFT_PAREN! {	emit($LEFT_PAREN, DroolsEditorType.SYMBOL);	}
+			expression_value ( COMMA! {	emit($COMMA, DroolsEditorType.SYMBOL);	} expression_value )* 
+		RIGHT_PAREN {	emit($RIGHT_PAREN, DroolsEditorType.SYMBOL);	}
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	}
 	;
+finally { 
+	if (isEditorInterfaceEnabled && input.LA(2) == EOF && input.LA(1) == DOUBLE_PIPE) {
+		emit(input.LT(1), DroolsEditorType.SYMBOL);
+		input.consume();
+		emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+	}	}
 
 expression_value
-	:	accessor_path
+	:	(accessor_path
 	|	literal_constraint 
-	|	paren_chunk
+	|	paren_chunk)
+	{	emit(Location.LOCATION_LHS_INSIDE_CONDITION_END);	}
 	;
+finally { 
+	if (isEditorInterfaceEnabled && input.LA(2) == EOF) {
+		if (input.LA(1) == DOUBLE_PIPE) {
+			emit(input.LT(1), DroolsEditorType.SYMBOL);
+			input.consume();
+			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
+		} else if (input.LA(1) == EOF && input.get(input.index() - 1).getType() != WS) {
+			emit(true, Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
+		}
+	}
+}
 
 literal_constraint
-	:	STRING
-	|	INT
-	|	FLOAT
-	|	BOOL
-	|	NULL
+	:	STRING {	emit($STRING, DroolsEditorType.STRING_CONST);	}
+	|	INT {	emit($INT, DroolsEditorType.NUMERIC_CONST);	}
+	|	FLOAT {	emit($FLOAT, DroolsEditorType.NUMERIC_CONST);	}
+	|	BOOL {	emit($BOOL, DroolsEditorType.BOOLEAN_CONST);	}
+	|	NULL {	emit($NULL, DroolsEditorType.NULL_CONST);	}
 	;
 
 pattern_type
 	:	id+=ID ( id+=DOT id+=ID )* 
-	{	setParaphrasesValue(DroolsParaphareseTypes.PATTERN, buildStringFromTokens($id));	} 
+	{	emit($id, DroolsEditorType.IDENTIFIER);
+		setParaphrasesValue(DroolsParaphraseTypes.PATTERN, buildStringFromTokens($id));	} 
 	    dimension_definition*
 		-> ^(VT_PATTERN_TYPE ID+ dimension_definition*)
 	;
 
 data_type
-	:	ID ( DOT ID )* dimension_definition*
+	:	id+=ID ( id+=DOT id+=ID )* dimension_definition*
+	{	emit($id, DroolsEditorType.IDENTIFIER);	}
 		-> ^(VT_DATA_TYPE ID+ dimension_definition*)
 	;
 
 dimension_definition
-	:	LEFT_SQUARE RIGHT_SQUARE
+	:	LEFT_SQUARE {	emit($LEFT_SQUARE, DroolsEditorType.SYMBOL);	} 
+		RIGHT_SQUARE {	emit($RIGHT_SQUARE, DroolsEditorType.SYMBOL);	} 
 	;
 
 accessor_path
-	:	accessor_element ( DOT accessor_element )*
+	:	accessor_element ( DOT {	emit($DOT, DroolsEditorType.IDENTIFIER);	} accessor_element )*
 	-> ^(VT_ACCESSOR_PATH accessor_element+)
 	;
 
 accessor_element
-	:	ID square_chunk*
+	:	ID {	emit($ID, DroolsEditorType.IDENTIFIER);	}
+		square_chunk*
 	-> ^(VT_ACCESSOR_ELEMENT ID square_chunk*)
 	;
 
@@ -870,238 +1195,345 @@
 	;
 
 rhs_chunk_data
-	:	THEN ( ~END )* END SEMICOLON?
+	:	THEN 
+	{	if ($THEN.text.equalsIgnoreCase("then")){
+			emit($THEN, DroolsEditorType.KEYWORD);
+			emit(Location.LOCATION_RHS);
+		}	}
+			( any=~END { emit($any, DroolsEditorType.CODE_CHUNK); } )* 
+		end1=END {	emit($end1, DroolsEditorType.KEYWORD);	}
+		SEMICOLON? {	emit($SEMICOLON, DroolsEditorType.KEYWORD);	}
 	;
 
 curly_chunk
 @init{
 	String text = "";
-}	:	cc=curly_chunk_data {text = $cc.text;}
+}	:	cc=curly_chunk_data[false] {text = $cc.text;}
 	-> VT_CURLY_CHUNK[$cc.start,text]
 	;
 
-curly_chunk_data
-	:	LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk_data )* RIGHT_CURLY
+curly_chunk_data[boolean isRecursive]
+	:	lc1=LEFT_CURLY
+		{	if (!isRecursive) {
+				emit($lc1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($lc1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}
+			(any=~ ( LEFT_CURLY | RIGHT_CURLY ) { emit($any, DroolsEditorType.CODE_CHUNK); } | curly_chunk_data[true] )* 
+		rc1=RIGHT_CURLY
+		{	if (!isRecursive) {
+				emit($rc1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($rc1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}	
 	;
 
 paren_chunk
 @init{
 	String text = "";
-}	:	pc=paren_chunk_data {text = $pc.text;} 
+}	:	pc=paren_chunk_data[false] {text = $pc.text;} 
 	-> VT_PAREN_CHUNK[$pc.start,text]
 	;
 
-paren_chunk_data
-	:	LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk_data )* RIGHT_PAREN 
+paren_chunk_data[boolean isRecursive]
+	:	lp1=LEFT_PAREN
+		{	if (!isRecursive) {
+				emit($lp1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($lp1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}
+			(any=~ ( LEFT_PAREN | RIGHT_PAREN ) { emit($any, DroolsEditorType.CODE_CHUNK); } | paren_chunk_data[true] )* 
+		rp1=RIGHT_PAREN
+		{	if (!isRecursive) {
+				emit($rp1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($rp1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}	
 	;
 
 square_chunk
 @init{
 	String text = "";
-}	:	sc=square_chunk_data {text = $sc.text;}
+}	:	sc=square_chunk_data[false] {text = $sc.text;}
 	-> VT_SQUARE_CHUNK[$sc.start,text]
 	;
 
-square_chunk_data
-	:	LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk_data )* RIGHT_SQUARE
+square_chunk_data[boolean isRecursive]
+	:	ls1=LEFT_SQUARE
+		{	if (!isRecursive) {
+				emit($ls1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($ls1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}
+			(any=~ ( LEFT_SQUARE | RIGHT_SQUARE ) { emit($any, DroolsEditorType.CODE_CHUNK); }| square_chunk_data[true] )* 
+		rs1=RIGHT_SQUARE
+		{	if (!isRecursive) {
+				emit($rs1, DroolsEditorType.SYMBOL);
+			} else {
+				emit($rs1, DroolsEditorType.CODE_CHUNK);
+			}	
+		}
 	;
 
-
-date_effective_key
+lock_on_active_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))}?=>  ID MISC ID {text = $text;}
-	->	VK_DATE_EFFECTIVE[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))}?=>  id1=ID mis1=MISC id2=ID mis2=MISC id3=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);
+		emit($mis2, DroolsEditorType.KEYWORD);
+		emit($id3, DroolsEditorType.KEYWORD);	}
+		->	VK_LOCK_ON_ACTIVE[$start, text]
 	;
 
-date_expires_key
+date_effective_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))}?=>  ID MISC ID {text = $text;}
-	->	VK_DATE_EXPIRES[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EFFECTIVE))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_DATE_EFFECTIVE[$start, text]
 	;
 
-lock_on_active_key
+date_expires_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.LOCK) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.ON) && validateLT(4, "-") && validateLT(5, DroolsSoftKeywords.ACTIVE))}?=>  ID MISC ID MISC ID {text = $text;}
-	->	VK_LOCK_ON_ACTIVE[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.DATE) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.EXPIRES))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_DATE_EXPIRES[$start, text]
 	;
 
 no_loop_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))}?=>  ID MISC ID {text = $text;}
-	->	VK_NO_LOOP[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.NO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.LOOP))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_NO_LOOP[$start, text]
 	;
 
 auto_focus_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))}?=>  ID MISC ID {text = $text;}
-	->	VK_AUTO_FOCUS[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.AUTO) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.FOCUS))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_AUTO_FOCUS[$start, text]
 	;
 
 activation_group_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  ID MISC ID {text = $text;}
-	->	VK_ACTIVATION_GROUP[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.ACTIVATION) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_ACTIVATION_GROUP[$start, text]
 	;
 
 agenda_group_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  ID MISC ID {text = $text;}
-	->	VK_AGENDA_GROUP[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.AGENDA) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_AGENDA_GROUP[$start, text]
 	;
 
 ruleflow_group_key
 @init{
 	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  ID MISC ID {text = $text;}
-	->	VK_RULEFLOW_GROUP[$start, text]
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.RULEFLOW) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.GROUP))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_RULEFLOW_GROUP[$start, text]
 	;
 
+entry_point_key
+ at init{
+	String text = "";
+}	:	{(validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT))}?=>  id1=ID mis1=MISC id2=ID {text = $text;}
+	{	emit($id1, DroolsEditorType.KEYWORD);
+		emit($mis1, DroolsEditorType.KEYWORD);
+		emit($id2, DroolsEditorType.KEYWORD);	}
+		->	VK_ENTRY_POINT[$start, text]
+	;
+
 duration_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.DURATION))}?=>  id=ID	->	VK_DURATION[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.DURATION))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_DURATION[$id]
 	;
 
 package_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))}?=>  id=ID	->	VK_PACKAGE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.PACKAGE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_PACKAGE[$id]
 	;
 
 import_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.IMPORT))}?=>  id=ID	->	VK_IMPORT[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.IMPORT))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_IMPORT[$id]
 	;
 
 dialect_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.DIALECT))}?=>  id=ID	->	VK_DIALECT[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.DIALECT))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_DIALECT[$id]
 	;
 
 salience_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))}?=>  id=ID	->	VK_SALIENCE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.SALIENCE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_SALIENCE[$id]
 	;
 
 enabled_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.ENABLED))}?=>  id=ID	->	VK_ENABLED[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.ENABLED))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_ENABLED[$id]
 	;
 
 attributes_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))}?=>  id=ID	->	VK_ATTRIBUTES[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.ATTRIBUTES))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_ATTRIBUTES[$id]
 	;
 
-when_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.WHEN))}?=>  id=ID	->	VK_WHEN[$id]
-	;
-
 rule_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.RULE))}?=>  id=ID	->	VK_RULE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.RULE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_RULE[$id]
 	;
 
 template_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE))}?=>  id=ID	->	VK_TEMPLATE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.TEMPLATE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_TEMPLATE[$id]
 	;
 
 query_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.QUERY))}?=>  id=ID	->	VK_QUERY[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.QUERY))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_QUERY[$id]
 	;
 
 declare_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.DECLARE))}?=>  id=ID	->	VK_DECLARE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.DECLARE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_DECLARE[$id]
 	;
 
 function_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))}?=>  id=ID	->	VK_FUNCTION[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.FUNCTION))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_FUNCTION[$id]
 	;
 
 global_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))}?=>  id=ID	->	VK_GLOBAL[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.GLOBAL))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_GLOBAL[$id]
 	;
 
 eval_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.EVAL))}?=>  id=ID	->	VK_EVAL[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.EVAL))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_EVAL[$id]
 	;
 
 contains_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.CONTAINS))}?=>  id=ID	->	VK_CONTAINS[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.CONTAINS))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_CONTAINS[$id]
 	;
 
 matches_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.MATCHES))}?=>  id=ID	->	VK_MATCHES[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.MATCHES))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_MATCHES[$id]
 	;
 
 excludes_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))}?=>  id=ID	->	VK_EXCLUDES[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.EXCLUDES))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_EXCLUDES[$id]
 	;
 
 soundslike_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))}?=>  id=ID	->	VK_SOUNDSLIKE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.SOUNDSLIKE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_SOUNDSLIKE[$id]
 	;
 
 memberof_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))}?=>  id=ID	->	VK_MEMBEROF[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.MEMBEROF))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_MEMBEROF[$id]
 	;
 
 not_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.NOT))}?=>  id=ID	->	VK_NOT[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.NOT))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_NOT[$id]
 	;
 
 in_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.IN))}?=>  id=ID	->	VK_IN[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.IN))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_IN[$id]
 	;
 
 or_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.OR))}?=>  id=ID	->	VK_OR[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.OR))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_OR[$id]
 	;
 
 and_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.AND))}?=>  id=ID	->	VK_AND[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.AND))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_AND[$id]
 	;
 
 exists_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.EXISTS))}?=>  id=ID	->	VK_EXISTS[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.EXISTS))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_EXISTS[$id]
 	;
 
 forall_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.FORALL))}?=>  id=ID	->	VK_FORALL[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.FORALL))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_FORALL[$id]
 	;
 
-from_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.FROM))}?=>  id=ID	->	VK_FROM[$id]
-	;
-
-entry_point_key
- at init{
-	String text = "";
-}	:	{(validateIdentifierKey(DroolsSoftKeywords.ENTRY) && validateLT(2, "-") && validateLT(3, DroolsSoftKeywords.POINT))}?=>  ID MISC ID {text = $text;}
-	->	VK_ENTRY_POINT[$start, text]
-	;
-
-accumulate_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.ACCUMULATE))}?=>  id=ID	->	VK_ACCUMULATE[$id]
-	;
-
-init_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.INIT))}?=>  id=ID	->	VK_INIT[$id]
-	;
-
 action_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.ACTION))}?=>  id=ID	->	VK_ACTION[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.ACTION))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_ACTION[$id]
 	;
 
 reverse_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.REVERSE))}?=>  id=ID	->	VK_REVERSE[$id]
+	:	{(validateIdentifierKey(DroolsSoftKeywords.REVERSE))}?=>  id=ID
+	{	emit($id, DroolsEditorType.KEYWORD);	}
+		->	VK_REVERSE[$id]
 	;
 
-result_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.RESULT))}?=>  id=ID	->	VK_RESULT[$id]
-	;
-
-collect_key
-	:	{(validateIdentifierKey(DroolsSoftKeywords.COLLECT))}?=>  id=ID	->	VK_COLLECT[$id]
-	;
-
 WS      :       (	' '
                 |	'\t'
                 |	'\f'
@@ -1160,17 +1592,43 @@
 	:	('true'|'false') 
 	;	
 
-NULL	:	'null';
+ACCUMULATE
+	:	'accumulate'
+	;
 
+COLLECT
+	:	'collect'
+	;
+
+END	:	'end'
+	;
+
+FROM
+	:	'from'
+	;
+
+INIT
+	:	'init'
+	;
+
+NULL	
+	:	'null'
+	;
+
 OVER
 	:	'over'
 	;
 
+RESULT
+	:	'result'
+	;
+
 THEN
 	:	'then'
 	;
 
-END	:	'end'
+WHEN
+	:	'when'
 	;
 
 GRAVE_ACCENT
@@ -1225,9 +1683,11 @@
 	;
 
 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')*
+	|	'%' ('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')+ '%'
+	{	text = $text.substring(1, $text.length() - 1);	}
 	;
-		
+
 LEFT_PAREN
         :	'('
         ;

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-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DescrBuilderTree.g	2008-08-21 19:48:02 UTC (rev 21668)
@@ -134,7 +134,7 @@
 	;
 
 when_part returns [AndDescr andDescr]
-	:	VK_WHEN lh=lhs_block
+	:	WHEN lh=lhs_block
 	{	$andDescr = $lh.andDescr;	}
 	;
 
@@ -232,18 +232,18 @@
 	{	$baseDescr = factory.createEval($start, $pc);	}
 	|	^(start=VK_FORALL (dt=lhs {	lhsList.add($dt.baseDescr);	})+)
 	{	$baseDescr = factory.createForAll($start, lhsList);	}
-	|	^(VK_FROM pn=lhs_pattern fe=from_elements)
+	|	^(FROM pn=lhs_pattern fe=from_elements)
 	{	$baseDescr = factory.setupFrom($pn.baseDescr, $fe.patternSourceDescr);	}
 	|	pn=lhs_pattern
 	{	$baseDescr = $pn.baseDescr;	}
 	;
 
 from_elements returns [PatternSourceDescr patternSourceDescr]
-	:	^(start=VK_ACCUMULATE dt=lhs
+	:	^(start=ACCUMULATE dt=lhs
 	{	$patternSourceDescr = factory.createAccumulate($start, $dt.baseDescr);	} 
 		ret=accumulate_parts[$patternSourceDescr])
 	{	$patternSourceDescr = $ret.accumulateDescr;	}
-	|	^(start=VK_COLLECT dt=lhs)
+	|	^(start=COLLECT dt=lhs)
 	{	$patternSourceDescr = factory.createCollect($start, $dt.baseDescr);	}
 	|	^(start=VK_ENTRY_POINT entryId=VT_ENTRYPOINT_ID)
 	{	$patternSourceDescr = factory.createEntryPoint($start, $entryId);	}
@@ -260,10 +260,10 @@
 
 accumulate_init_clause [PatternSourceDescr accumulateParam] returns [AccumulateDescr accumulateDescr] 
 	:	^(VT_ACCUMULATE_INIT_CLAUSE 
-			^(start=VK_INIT pc1=VT_PAREN_CHUNK) 
+			^(start=INIT pc1=VT_PAREN_CHUNK) 
 			^(VK_ACTION pc2=VT_PAREN_CHUNK) 
 			rev=accumulate_init_reverse_clause?
-			^(VK_RESULT pc3=VT_PAREN_CHUNK))
+			^(RESULT pc3=VT_PAREN_CHUNK))
 	{	if (null == rev){
 			$accumulateDescr = factory.setupAccumulateInit($accumulateParam, $start, $pc1, $pc2, $pc3, null);
 		} else {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/Tree2TestDRL.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/Tree2TestDRL.g	2008-08-21 19:45:52 UTC (rev 21667)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/Tree2TestDRL.g	2008-08-21 19:48:02 UTC (rev 21668)
@@ -99,7 +99,7 @@
 	;
 
 when_part
-	:	VK_WHEN lhs_block
+	:	WHEN lhs_block
 	;
 
 rule_attributes
@@ -133,23 +133,23 @@
 	|	^(VK_NOT lhs)
 	|	^(VK_EVAL VT_PAREN_CHUNK)
 	|	^(VK_FORALL lhs+)
-	|	^(VK_FROM lhs_pattern from_elements)
+	|	^(FROM lhs_pattern from_elements)
 	|	lhs_pattern
 	;
 
 from_elements
-	:	^(VK_ACCUMULATE lhs (accumulate_init_clause|accumulate_id_clause))
-	|	^(VK_COLLECT lhs)
+	:	^(ACCUMULATE lhs (accumulate_init_clause|accumulate_id_clause))
+	|	^(COLLECT lhs)
 	|	^(VK_ENTRY_POINT VT_ENTRYPOINT_ID)
 	|	^(VT_FROM_SOURCE ID VT_PAREN_CHUNK? expression_chain?)
 	;
 
 accumulate_init_clause
 	:	^(VT_ACCUMULATE_INIT_CLAUSE 
-			^(VK_INIT VT_PAREN_CHUNK) 
+			^(INIT VT_PAREN_CHUNK) 
 			^(VK_ACTION VT_PAREN_CHUNK) 
 			accumulate_init_reverse_clause?
-			^(VK_RESULT VT_PAREN_CHUNK))
+			^(RESULT VT_PAREN_CHUNK))
 	;
 
 accumulate_init_reverse_clause

Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java	2008-08-21 19:48:02 UTC (rev 21668)
@@ -0,0 +1,2917 @@
+package org.drools.lang;
+
+import java.util.LinkedList;
+
+import junit.framework.TestCase;
+
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.drools.compiler.DroolsParserException;
+
+public class DRLContextTest extends TestCase {
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION1()
+			throws DroolsParserException, RecognitionException {
+		String input = "rule MyRule \n" + "	when \n" + "		";
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class( condition == true ) \n" + "		";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION3() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		class: Class( condition == true, condition2 == null ) \n"
+				+ "		";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION4() {
+		String input = "rule MyRule \n" + "	when \n" + "		Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class( condition == true ) \n" + "		Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION6() {
+		String input = "rule MyRule \n" + "	when \n" + "		class: Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION7() {
+		String input = "rule MyRule \n" + "	when \n" + "		class:Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** Inside of condition: start */
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START1() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START2() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( na";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START3() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name.subProperty['test'].subsu";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START4() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( condition == true, ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( condition == true, na";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START6() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( \n" + "			";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START7() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( condition == true, \n" + "			";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START8() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( c: condition, \n" + "			";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START9a() {
+		String input = "rule MyRule \n" + "   when \n" + "       Class ( name:";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START9b() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( name: ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START10() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( name:";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** Inside of condition: Operator */
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR1() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR2() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class(property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR3() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name : property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR4() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class (name:property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class (name:property   ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR6() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name1 : property1, name : property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR7() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name1 : property1 == \"value\", name : property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR8() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name1 : property1 == \"value\",property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR9() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name1 : property1, \n" + "			name : property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** Inside of condition: argument */
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT1() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( property == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT2() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( property== ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT3() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name : property <= ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT4() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name:property != ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name1 : property1, property2 == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT6() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class (name:property== ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT7a() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property == otherPropertyN";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT7b() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property == otherPropertyN ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT8() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property == \"someth";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT9a() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property contains ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT9b() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not contains ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT10() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property excludes ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT11() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property matches \"prop";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT12() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( property in ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END1() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property in ('1', '2') ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START11() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property in ('1', '2'), ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT13() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not in ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not in ('1', '2') ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START12() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not in ('1', '2'), ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT14() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property memberOf ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void FIXME_testCheckLHSLocationDetermination_INSIDE_CONDITION_END3() {
+		// FIXME for now it will be a limitation of the parser... memberOf is a
+		// soft-keyword and this sentence cannot be parsed correctly if
+		// misspelling
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property memberOf collection ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START13() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property memberOf collection, ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT15() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not memberOf ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END4() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not memberOf collection ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START14() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property not memberOf collection, ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** EXISTS */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS1() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS2() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS3() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists(";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS4() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS5() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists ( Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS6() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists ( name : Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDeterminationINSIDE_CONDITION_START16() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION() {
+		String input = "rule MyRule \n" + "	when \n" + "		exists Class ( ) \n"
+				+ "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** NOT */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_NOT1() {
+		String input = "rule MyRule \n" + "	when \n" + "		not ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_NOT2() {
+		String input = "rule MyRule \n" + "	when \n" + "		not Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS7() {
+		String input = "rule MyRule \n" + "	when \n" + "		not exists ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS8() {
+		String input = "rule MyRule \n" + "	when \n" + "		not exists Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START21() {
+		String input = "rule MyRule \n" + "	when \n" + "		not Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START22() {
+		String input = "rule MyRule \n" + "	when \n" + "		not exists Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START23() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		not exists name : Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION9() {
+		String input = "rule MyRule \n" + "	when \n" + "		not Class () \n"
+				+ "		";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** AND */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR1() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) and ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR2() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) &&  ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR3() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class () and   ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR4() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		name : Class ( name: property ) and ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name: property ) \n" + "       and ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR6() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) and Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR7() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and name : Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR8() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) && name : Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION31() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and Class ( ) \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION32() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and not Class ( ) \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION33() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and exists Class ( ) \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START20() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and Class ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR21() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and Class ( name ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR22() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and Class ( name == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_NOT() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		exists Class ( ) and not ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		exists Class ( ) and exists ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION30() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) and not Class ( ) \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** OR */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR21() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) or ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR22() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) || ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR23() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class () or   ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR24() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		name : Class ( name: property ) or ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR25() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name: property ) \n" + "       or ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR26() {
+		String input = "rule MyRule \n" + "	when \n" + "		Class ( ) or Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR27() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) or name : Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_AND_OR28() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) || name : Cl";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION40() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) or Class ( ) \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START40() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) or Class ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) or Class ( name ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT30() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( ) or Class ( name == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_EGIN_OF_CONDITION_NOT() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		exists Class ( ) or not ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION_EXISTS40() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		exists Class ( ) or exists ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** EVAL */
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL1() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL2() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval(";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL3() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval( myCla";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL4() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval( param.getMetho";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL5() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getMethod(";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL6() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getMethod().get";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL7() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getMethod(\"someStringWith)))\").get";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL8() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getMethod(\"someStringWith(((\").get";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL9() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval( true )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION50() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getProperty(name).isTrue() )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION51() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getProperty(\"someStringWith(((\").isTrue() )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_EVAL10() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getProperty((((String) s) )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_EVAL,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION52() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		eval( param.getProperty((((String) s))))";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION53() {
+		String input = "rule MyRule \n" + "	when \n" + "		eval( true ) \n"
+				+ "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** MULTIPLE RESTRICTIONS */
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR12() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR13() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name : property1, property2 > 0 && ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR14() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property1 < 20, property2 > 0 && ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT20() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && < ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END6() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && < 10 ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START41() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && < 10, ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR60() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 || ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR61() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR62() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( name : property1, property2 > 0 || ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR63() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property1 < 20, property2 > 0 || ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END10() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END11() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 \n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END12() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 && < 10 ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END13() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 || < 10 ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_END14() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property == \"test\" || == \"test2\" ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_END,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** FROM */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION60() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION61() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) fr";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM1() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from myGlob";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM3() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from myGlobal.get";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION75() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from myGlobal.getList() \n"
+				+ "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION71() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from getDroolsFunction() \n"
+				+ "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** FROM ACCUMULATE */
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE1() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate(";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION73() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total = 0; ), \n"
+				+ "			action( total += $cheese.getPrice(); ), \n"
+				+ "           result( new Integer( total ) ) \n" + "		) \n"
+				+ "		";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_INIT_INSIDE() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n" + "			init( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_ACTION_INSIDE() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total = 0; ), \n" + "			action( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_RESULT_INSIDE() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total = 0; ), \n"
+				+ "			action( total += $cheese.getPrice(); ), \n"
+				+ "           result( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_INIT_INSIDE2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total =";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_INIT_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_ACTION_INSIDE2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total = 0; ), \n" + "			action( total += $ch";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_ACTION_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_ACCUMULATE_RESULT_INSIDE2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == $likes ), \n"
+				+ "			init( int total = 0; ), \n"
+				+ "			action( total += $cheese.getPrice(); ), \n"
+				+ "           result( new Integer( tot";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR40() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from accumulate( \n"
+				+ "			$cheese : Cheese( type == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** FROM COLLECT */
+	public void testCheckLHSLocationDetermination_FROM_COLLECT1() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_COLLECT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM_COLLECT2() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect(";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM_COLLECT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION67() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect ( \n"
+				+ "			Cheese( type == $likes )" + "		) \n" + "		";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START31() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect ( \n" + "			Cheese( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR31() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect ( \n"
+				+ "			Cheese( type ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT21() {
+		String input = "rule MyRule \n" + "	when \n"
+				+ "		Class ( property > 0 ) from collect ( \n"
+				+ "			Cheese( type == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	/** NESTED FROM */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION68() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM5() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) from ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION69() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from collect( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION70() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_FROM6() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_FROM, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	/** FORALL */
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION81() {
+		String input = "rule MyRule \n" + "	when \n" + "		forall ( ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START32() {
+		String input = "rule MyRule \n" + "	when \n" + "		forall ( "
+				+ "           Class ( pr";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_OPERATOR32() {
+		String input = "rule MyRule \n" + "	when \n" + "		forall ( "
+				+ "           Class ( property ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_ARGUMENT22() {
+		String input = "rule MyRule \n" + "	when \n" + "		forall ( "
+				+ "           Class ( property == ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION76() {
+		String input = "rule MyRule \n" + "	when \n" + "		forall ( "
+				+ "           Class ( property == \"test\")" + "           C";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION77a() {
+		String input = "rule MyRule \n"
+				+ "	when \n"
+				+ "		ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() ) ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_BEGIN_OF_CONDITION77b() {
+		String input = "rule MyRule \n"
+				+ "   when \n"
+				+ "       ArrayList(size > 50) from accumulate( Person( disabled == \"yes\", income > 100000 ) from town.getPersons() )";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START45a() {
+		String input = "rule MyRule \n" + "   when \n"
+				+ "       Class ( name :";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckLHSLocationDetermination_INSIDE_CONDITION_START45b() {
+		String input = "rule MyRule \n" + "   when \n"
+				+ "       Class ( name : ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckRHSLocationDetermination_firstLineOfLHS() {
+		String input = "rule MyRule \n" + "	when\n" + "		Class ( )\n"
+				+ "   then\n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RHS, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRHSLocationDetermination_startOfNewlINE() {
+		String input = "rule MyRule \n" + "	when\n" + "		Class ( )\n"
+				+ "   then\n" + "       assert(null);\n" + "       ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RHS, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRHSLocationDetermination3() {
+		String input = "rule MyRule \n" + "	when\n" + "		Class ( )\n"
+				+ "   then\n" + "       meth";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RHS, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination() {
+		String input = "rule MyRule ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination2() {
+		String input = "rule MyRule \n" + "	salience 12 activation-group \"my";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination3() {
+		String input = "rule \"Hello World\" ruleflow-group \"hello\" s";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination_dialect1() {
+		String input = "rule MyRule \n" + "	dialect \"java\"";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination_dialect2() {
+		String input = "rule MyRule \n" + "	dialect \"mvel\"";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination_dialect3() {
+		String input = "rule MyRule \n" + "	dialect ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckRuleHeaderLocationDetermination_dialect4() {
+		String input = "rule MyRule \n" + "	dialect \"";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	// TODO: add tests for dialect defined at package header level
+
+	public void testCheckQueryLocationDetermination_RULE_HEADER1() {
+		String input = "query MyQuery ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckQueryLocationDetermination_RULE_HEADER2() {
+		String input = "query \"MyQuery\" ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_RULE_HEADER, getLastIntegerValue(parser
+				.getEditorInterface().get(0).getContent()));
+	}
+
+	public void testCheckQueryLocationDetermination_LHS_BEGIN_OF_CONDITION() {
+		String input = "query MyQuery() ";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_BEGIN_OF_CONDITION,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	public void testCheckQueryLocationDetermination_LHS_INSIDE_CONDITION_START() {
+		String input = "query MyQuery \n" + "	Class (";
+
+		DRLParser parser = getParser(input);
+		parser.enableEditorInterface();
+		try {
+			parser.compilation_unit();
+		} catch (Exception ex) {
+		}
+
+		assertEquals(Location.LOCATION_LHS_INSIDE_CONDITION_START,
+				getLastIntegerValue(parser.getEditorInterface().get(0)
+						.getContent()));
+	}
+
+	@SuppressWarnings("unchecked")
+	private int getLastIntegerValue(LinkedList list) {
+		// System.out.println(list.toString());
+		int lastIntergerValue = -1;
+		for (Object object : list) {
+			if (object instanceof Integer) {
+				lastIntergerValue = (Integer) object;
+			}
+		}
+		return lastIntergerValue;
+	}
+
+	/**
+	 * @return An instance of a RuleParser should you need one (most folks will
+	 *         not).
+	 */
+	private DRLParser getParser(final String text) {
+		DRLParser parser = new DRLParser(new CommonTokenStream(new DRLLexer(
+				new ANTLRStringStream(text))));
+		parser.setTreeAdaptor(new DroolsTreeAdaptor());
+		return parser;
+	}
+}
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/DRLContextTest.java
___________________________________________________________________
Name: svn:eol-style
   + native




More information about the jboss-svn-commits mailing list