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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Apr 24 10:19:36 EDT 2008


Author: tirelli
Date: 2008-04-24 10:19:35 -0400 (Thu, 24 Apr 2008)
New Revision: 19705

Added:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeFieldDescr.java
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.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/dsl/DSLMap.g
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertion.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertionWithDuration.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/declare_type.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java
Log:
JBRULES-1390: updating syntax for type declaration

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -412,13 +412,13 @@
             TypeDeclaration type = new TypeDeclaration( typeDescr.getTypeName() );
 
             // is it a regular fact or an event?
-            String role = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_ROLE );
+            String role = typeDescr.getMetaAttribute( TypeDeclaration.Role.ID );
             if ( role != null ) {
                 type.setRole( TypeDeclaration.Role.parseRole( role ) );
             }
 
             // is it a POJO or a template?
-            String templateName = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_TEMPLATE );
+            String templateName = typeDescr.getMetaAttribute( TypeDeclaration.ATTR_TEMPLATE );
             if ( templateName != null ) {
                 type.setFormat( TypeDeclaration.Format.TEMPLATE );
                 FactTemplate template = this.pkg.getFactTemplate( templateName );
@@ -430,7 +430,7 @@
                     continue;
                 }
             } else {
-                String className = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_CLASS );
+                String className = typeDescr.getMetaAttribute( TypeDeclaration.ATTR_CLASS );
                 if ( className == null ) {
                     className = type.getTypeName();
                 }
@@ -446,15 +446,11 @@
                 }
             }
 
-            String clockStrategy = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_CLOCK_STRATEGY );
-            if ( clockStrategy != null ) {
-                type.setClockStrategy( TypeDeclaration.ClockStrategy.parseClockStrategy( clockStrategy ) );
-            }
-            String timestamp = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_TIMESTAMP );
+            String timestamp = typeDescr.getMetaAttribute( TypeDeclaration.ATTR_TIMESTAMP );
             if ( timestamp != null ) {
                 type.setTimestampAttribute( timestamp );
             }
-            String duration = typeDescr.getAttribute( TypeDeclarationDescr.ATTR_DURATION );
+            String duration = typeDescr.getMetaAttribute( TypeDeclaration.ATTR_DURATION );
             if ( duration != null ) {
                 type.setDurationAttribute( duration );
                 FieldExtractor extractor = ClassFieldExtractorCache.getInstance().getExtractor( type.getTypeClass(),

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-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -1,114 +1,112 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-03-10 18:35:54
+// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-04-24 09:58:02
 
 	package org.drools.lang;
 
 
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
 import java.util.HashMap;
-
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.Lexer;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
 public class DRLLexer extends Lexer {
-    public static final int ACCUMULATE=46;
+    public static final int COMMA=11;
+    public static final int EXISTS=43;
+    public static final int T79=79;
+    public static final int AUTO_FOCUS=31;
+    public static final int END=14;
+    public static final int HexDigit=72;
+    public static final int FORALL=46;
+    public static final int TEMPLATE=19;
+    public static final int MISC=78;
+    public static final int FLOAT=63;
+    public static final int QUERY=18;
+    public static final int THEN=67;
+    public static final int RULE=20;
+    public static final int T85=85;
+    public static final int INIT=48;
+    public static final int T83=83;
+    public static final int TILDE=61;
+    public static final int IMPORT=5;
     public static final int PACKAGE=4;
+    public static final int DATE_EFFECTIVE=23;
+    public static final int OR=38;
+    public static final int DOT=8;
+    public static final int DOUBLE_PIPE=39;
+    public static final int AND=40;
+    public static final int T86=86;
     public static final int FUNCTION=6;
-    public static final int T76=76;
-    public static final int RIGHT_SQUARE=63;
-    public static final int T79=79;
-    public static final int ACTIVATION_GROUP=31;
-    public static final int T77=77;
+    public static final int GLOBAL=9;
+    public static final int EscapeSequence=71;
+    public static final int DIALECT=36;
+    public static final int INT=29;
+    public static final int LOCK_ON_ACTIVE=37;
+    public static final int DATE_EXPIRES=25;
+    public static final int T81=81;
+    public static final int LEFT_SQUARE=54;
+    public static final int CONTAINS=56;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=75;
     public static final int ATTRIBUTES=22;
-    public static final int RIGHT_CURLY=15;
-    public static final int T78=78;
-    public static final int DIALECT=35;
-    public static final int CONTAINS=53;
-    public static final int NO_LOOP=29;
-    public static final int LOCK_ON_ACTIVE=36;
-    public static final int MEMBEROF=57;
-    public static final int AGENDA_GROUP=33;
-    public static final int FLOAT=60;
-    public static final int NOT=43;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=72;
+    public static final int EVENT=68;
+    public static final int DECLARE=13;
+    public static final int LEFT_CURLY=65;
+    public static final int RESULT=51;
+    public static final int AT=15;
     public static final int ID=7;
-    public static final int AND=39;
-    public static final int EOF=-1;
-    public static final int HexDigit=69;
-    public static final int DATE_EFFECTIVE=23;
-    public static final int ACTION=48;
-    public static final int DOUBLE_PIPE=38;
-    public static final int RIGHT_PAREN=12;
-    public static final int IMPORT=5;
-    public static final int EOL=66;
-    public static final int DOUBLE_AMPER=40;
-    public static final int THEN=64;
-    public static final int IN=59;
-    public static final int MATCHES=55;
-    public static final int COMMA=11;
-    public static final int TILDE=58;
-    public static final int ENABLED=25;
-    public static final int EXISTS=42;
-    public static final int DOT=8;
-    public static final int RULE=20;
-    public static final int EXCLUDES=54;
-    public static final int AUTO_FOCUS=30;
-    public static final int NULL=61;
-    public static final int SOUNDSLIKE=56;
-    public static final int BOOL=26;
-    public static final int FORALL=45;
-    public static final int RULEFLOW_GROUP=32;
-    public static final int SALIENCE=27;
-    public static final int RESULT=50;
-    public static final int INT=28;
-    public static final int EVENT=65;
-    public static final int Tokens=86;
-    public static final int MULTI_LINE_COMMENT=74;
-    public static final int DURATION=34;
+    public static final int FROM=42;
+    public static final int DOUBLE_AMPER=41;
+    public static final int ACTIVATION_GROUP=32;
+    public static final int LEFT_PAREN=10;
+    public static final int RIGHT_CURLY=66;
+    public static final int BOOL=27;
+    public static final int EXCLUDES=57;
+    public static final int SOUNDSLIKE=59;
     public static final int T84=84;
-    public static final int WS=67;
-    public static final int T85=85;
-    public static final int TEMPLATE=19;
-    public static final int EVAL=44;
+    public static final int MEMBEROF=60;
     public static final int WHEN=21;
-    public static final int ENTRY_POINT=52;
-    public static final int UnicodeEscape=70;
-    public static final int LEFT_CURLY=14;
-    public static final int OR=37;
-    public static final int LEFT_PAREN=10;
-    public static final int DECLARE=13;
-    public static final int QUERY=17;
-    public static final int T81=81;
-    public static final int FROM=41;
-    public static final int GLOBAL=9;
-    public static final int END=18;
-    public static final int REVERSE=49;
-    public static final int MISC=75;
+    public static final int RULEFLOW_GROUP=33;
+    public static final int WS=70;
+    public static final int STRING=24;
+    public static final int ACTION=49;
+    public static final int COLLECT=52;
+    public static final int T87=87;
+    public static final int REVERSE=50;
+    public static final int IN=62;
     public static final int T80=80;
-    public static final int COLLECT=51;
-    public static final int T83=83;
-    public static final int INIT=47;
-    public static final int LEFT_SQUARE=62;
+    public static final int NO_LOOP=30;
+    public static final int EQUALS=17;
+    public static final int ACCUMULATE=47;
+    public static final int UnicodeEscape=73;
+    public static final int DURATION=35;
+    public static final int EVAL=45;
+    public static final int MATCHES=58;
+    public static final int EOF=-1;
+    public static final int AGENDA_GROUP=34;
+    public static final int NULL=64;
+    public static final int EOL=69;
+    public static final int Tokens=88;
+    public static final int COLON=16;
     public static final int T82=82;
-    public static final int EscapeSequence=68;
-    public static final int OctalEscape=71;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=73;
-    public static final int DATE_EXPIRES=24;
-    public static final int STRING=16;
+    public static final int SALIENCE=28;
+    public static final int OctalEscape=74;
+    public static final int MULTI_LINE_COMMENT=77;
+    public static final int RIGHT_PAREN=12;
+    public static final int NOT=44;
+    public static final int ENABLED=26;
+    public static final int RIGHT_SQUARE=55;
+    public static final int ENTRY_POINT=53;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=76;
     public DRLLexer() {;} 
     public DRLLexer(CharStream input) {
         super(input);
-        ruleMemo = new HashMap[84+1];
+        ruleMemo = new HashMap[86+1];
      }
     public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
-    // $ANTLR start T76
-    public final void mT76() throws RecognitionException {
+    // $ANTLR start T79
+    public final void mT79() throws RecognitionException {
         try {
-            int _type = T76;
+            int _type = T79;
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:5: ( ';' )
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:7: ';'
             {
@@ -121,12 +119,12 @@
         finally {
         }
     }
-    // $ANTLR end T76
+    // $ANTLR end T79
 
-    // $ANTLR start T77
-    public final void mT77() throws RecognitionException {
+    // $ANTLR start T80
+    public final void mT80() throws RecognitionException {
         try {
-            int _type = T77;
+            int _type = T80;
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:5: ( '.*' )
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:7: '.*'
             {
@@ -140,33 +138,15 @@
         finally {
         }
     }
-    // $ANTLR end T77
+    // $ANTLR end T80
 
-    // $ANTLR start T78
-    public final void mT78() throws RecognitionException {
+    // $ANTLR start T81
+    public final void mT81() throws RecognitionException {
         try {
-            int _type = T78;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:5: ( ':' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: ':'
+            int _type = T81;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:5: ( '->' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: '->'
             {
-            match(':'); if (failed) return ;
-
-            }
-
-            this.type = _type;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end T78
-
-    // $ANTLR start T79
-    public final void mT79() throws RecognitionException {
-        try {
-            int _type = T79;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:5: ( '->' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: '->'
-            {
             match("->"); if (failed) return ;
 
 
@@ -177,14 +157,14 @@
         finally {
         }
     }
-    // $ANTLR end T79
+    // $ANTLR end T81
 
-    // $ANTLR start T80
-    public final void mT80() throws RecognitionException {
+    // $ANTLR start T82
+    public final void mT82() throws RecognitionException {
         try {
-            int _type = T80;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:5: ( '==' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: '=='
+            int _type = T82;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:5: ( '==' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: '=='
             {
             match("=="); if (failed) return ;
 
@@ -196,14 +176,14 @@
         finally {
         }
     }
-    // $ANTLR end T80
+    // $ANTLR end T82
 
-    // $ANTLR start T81
-    public final void mT81() throws RecognitionException {
+    // $ANTLR start T83
+    public final void mT83() throws RecognitionException {
         try {
-            int _type = T81;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:5: ( '>' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: '>'
+            int _type = T83;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:5: ( '>' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: '>'
             {
             match('>'); if (failed) return ;
 
@@ -214,14 +194,14 @@
         finally {
         }
     }
-    // $ANTLR end T81
+    // $ANTLR end T83
 
-    // $ANTLR start T82
-    public final void mT82() throws RecognitionException {
+    // $ANTLR start T84
+    public final void mT84() throws RecognitionException {
         try {
-            int _type = T82;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:5: ( '>=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: '>='
+            int _type = T84;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:5: ( '>=' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: '>='
             {
             match(">="); if (failed) return ;
 
@@ -233,14 +213,14 @@
         finally {
         }
     }
-    // $ANTLR end T82
+    // $ANTLR end T84
 
-    // $ANTLR start T83
-    public final void mT83() throws RecognitionException {
+    // $ANTLR start T85
+    public final void mT85() throws RecognitionException {
         try {
-            int _type = T83;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:5: ( '<' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: '<'
+            int _type = T85;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:5: ( '<' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: '<'
             {
             match('<'); if (failed) return ;
 
@@ -251,14 +231,14 @@
         finally {
         }
     }
-    // $ANTLR end T83
+    // $ANTLR end T85
 
-    // $ANTLR start T84
-    public final void mT84() throws RecognitionException {
+    // $ANTLR start T86
+    public final void mT86() throws RecognitionException {
         try {
-            int _type = T84;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:5: ( '<=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: '<='
+            int _type = T86;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:5: ( '<=' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: '<='
             {
             match("<="); if (failed) return ;
 
@@ -270,14 +250,14 @@
         finally {
         }
     }
-    // $ANTLR end T84
+    // $ANTLR end T86
 
-    // $ANTLR start T85
-    public final void mT85() throws RecognitionException {
+    // $ANTLR start T87
+    public final void mT87() throws RecognitionException {
         try {
-            int _type = T85;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:5: ( '!=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:7: '!='
+            int _type = T87;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:5: ( '!=' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: '!='
             {
             match("!="); if (failed) return ;
 
@@ -289,16 +269,16 @@
         finally {
         }
     }
-    // $ANTLR end T85
+    // $ANTLR end T87
 
     // $ANTLR start WS
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:17: ( ' ' | '\\t' | '\\f' | EOL )+
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -330,28 +310,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:19: ' '
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:19: '\\t'
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1763:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1737:19: '\\f'
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1764:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1738:19: EOL
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -384,10 +364,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1744:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1771:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -406,13 +386,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1745:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1772:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:14: ( '\\r\\n' )=> '\\r\\n'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -420,14 +400,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1746:25: '\\r'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1747:25: '\\n'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -449,10 +429,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:2: ( ( '-' )? ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:4: ( '-' )? ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:2: ( ( '-' )? ( '0' .. '9' )+ )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:4: ( '-' )? ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -461,7 +441,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:5: '-'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -470,7 +450,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -484,7 +464,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -515,10 +495,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -527,7 +507,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:5: '-'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -536,7 +516,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -550,7 +530,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -568,7 +548,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:26: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -582,7 +562,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1756:27: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -613,7 +593,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -626,19 +606,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1759:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1786:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -654,14 +634,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:15: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1760:32: ~ ( '\\\\' | '\"' )
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -691,13 +671,13 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -713,14 +693,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:16: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:33: ~ ( '\\\\' | '\\'' )
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -761,8 +741,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792: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();
@@ -787,7 +767,7 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769: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 )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796: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);
 
@@ -859,7 +839,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1767: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("1794: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;
                 }
@@ -868,13 +848,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1767: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("1794:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 'B' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' | '.' | 'o' | 'x' | 'a' | 'e' | 'c' | 'd' | 'D' | 's' | 'S' | 'w' | 'W' | 'p' | 'A' | 'G' | 'Z' | 'z' | 'Q' | 'E' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' ) | UnicodeEscape | OctalEscape );", 11, 0, input);
 
                 throw nvae;
             }
             switch (alt11) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769: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' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796: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)<='}') ) {
@@ -892,14 +872,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:9: UnicodeEscape
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1800:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:9: OctalEscape
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1801:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -916,7 +896,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -927,9 +907,9 @@
                     int LA12_2 = input.LA(3);
 
                     if ( ((LA12_2>='0' && LA12_2<='7')) ) {
-                        int LA12_5 = input.LA(4);
+                        int LA12_4 = input.LA(4);
 
-                        if ( ((LA12_5>='0' && LA12_5<='7')) ) {
+                        if ( ((LA12_4>='0' && LA12_4<='7')) ) {
                             alt12=1;
                         }
                         else {
@@ -950,7 +930,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1777:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1804:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -958,31 +938,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1777:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1804:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
 
                 throw nvae;
             }
             switch (alt12) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:14: ( '0' .. '3' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:15: '0' .. '3'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:14: ( '0' .. '3' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:26: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:25: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:36: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:37: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:36: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -992,18 +972,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:15: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:14: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:26: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:25: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1013,11 +993,11 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1781:9: '\\\\' ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1781:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1781:15: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:14: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1037,8 +1017,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1786:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1786:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1813:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1813:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -1059,10 +1039,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:2: ( ( 'true' | 'false' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:4: ( 'true' | 'false' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:2: ( ( 'true' | 'false' ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:4: ( 'true' | 'false' )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:4: ( 'true' | 'false' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1075,13 +1055,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1790:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1817:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:5: 'true'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -1089,7 +1069,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:12: 'false'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -1113,8 +1093,8 @@
     public final void mPACKAGE() throws RecognitionException {
         try {
             int _type = PACKAGE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:9: ( 'package' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:11: 'package'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:9: ( 'package' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:11: 'package'
             {
             match("package"); if (failed) return ;
 
@@ -1132,8 +1112,8 @@
     public final void mIMPORT() throws RecognitionException {
         try {
             int _type = IMPORT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1795:8: ( 'import' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1795:10: 'import'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:8: ( 'import' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:10: 'import'
             {
             match("import"); if (failed) return ;
 
@@ -1151,8 +1131,8 @@
     public final void mFUNCTION() throws RecognitionException {
         try {
             int _type = FUNCTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1797:10: ( 'function' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1797:12: 'function'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:10: ( 'function' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:12: 'function'
             {
             match("function"); if (failed) return ;
 
@@ -1170,8 +1150,8 @@
     public final void mEVENT() throws RecognitionException {
         try {
             int _type = EVENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:7: ( 'event' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:10: 'event'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:7: ( 'event' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:10: 'event'
             {
             match("event"); if (failed) return ;
 
@@ -1189,8 +1169,8 @@
     public final void mGLOBAL() throws RecognitionException {
         try {
             int _type = GLOBAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1801:8: ( 'global' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1801:10: 'global'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:8: ( 'global' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:10: 'global'
             {
             match("global"); if (failed) return ;
 
@@ -1208,8 +1188,8 @@
     public final void mDECLARE() throws RecognitionException {
         try {
             int _type = DECLARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:9: ( 'declare' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:11: 'declare'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:9: ( 'declare' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:11: 'declare'
             {
             match("declare"); if (failed) return ;
 
@@ -1227,8 +1207,8 @@
     public final void mRULE() throws RecognitionException {
         try {
             int _type = RULE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1805:9: ( 'rule' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1805:11: 'rule'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1832:9: ( 'rule' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1832:11: 'rule'
             {
             match("rule"); if (failed) return ;
 
@@ -1246,8 +1226,8 @@
     public final void mQUERY() throws RecognitionException {
         try {
             int _type = QUERY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:7: ( 'query' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1807:9: 'query'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:7: ( 'query' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:9: 'query'
             {
             match("query"); if (failed) return ;
 
@@ -1265,8 +1245,8 @@
     public final void mTEMPLATE() throws RecognitionException {
         try {
             int _type = TEMPLATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:10: ( 'template' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:12: 'template'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:10: ( 'template' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:12: 'template'
             {
             match("template"); if (failed) return ;
 
@@ -1284,8 +1264,8 @@
     public final void mATTRIBUTES() throws RecognitionException {
         try {
             int _type = ATTRIBUTES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1811:12: ( 'attributes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1811:14: 'attributes'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1838:12: ( 'attributes' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1838:14: 'attributes'
             {
             match("attributes"); if (failed) return ;
 
@@ -1303,8 +1283,8 @@
     public final void mDATE_EFFECTIVE() throws RecognitionException {
         try {
             int _type = DATE_EFFECTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:2: ( 'date-effective' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:4: 'date-effective'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1841:2: ( 'date-effective' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1841:4: 'date-effective'
             {
             match("date-effective"); if (failed) return ;
 
@@ -1322,8 +1302,8 @@
     public final void mDATE_EXPIRES() throws RecognitionException {
         try {
             int _type = DATE_EXPIRES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:2: ( 'date-expires' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:4: 'date-expires'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1844:2: ( 'date-expires' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1844:4: 'date-expires'
             {
             match("date-expires"); if (failed) return ;
 
@@ -1341,8 +1321,8 @@
     public final void mENABLED() throws RecognitionException {
         try {
             int _type = ENABLED;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:9: ( 'enabled' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:11: 'enabled'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1846:9: ( 'enabled' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1846:11: 'enabled'
             {
             match("enabled"); if (failed) return ;
 
@@ -1360,8 +1340,8 @@
     public final void mSALIENCE() throws RecognitionException {
         try {
             int _type = SALIENCE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:2: ( 'salience' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:4: 'salience'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:2: ( 'salience' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:4: 'salience'
             {
             match("salience"); if (failed) return ;
 
@@ -1379,8 +1359,8 @@
     public final void mNO_LOOP() throws RecognitionException {
         try {
             int _type = NO_LOOP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:9: ( 'no-loop' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:11: 'no-loop'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:9: ( 'no-loop' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:11: 'no-loop'
             {
             match("no-loop"); if (failed) return ;
 
@@ -1398,8 +1378,8 @@
     public final void mAUTO_FOCUS() throws RecognitionException {
         try {
             int _type = AUTO_FOCUS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1827:2: ( 'auto-focus' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1827:4: 'auto-focus'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:2: ( 'auto-focus' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:4: 'auto-focus'
             {
             match("auto-focus"); if (failed) return ;
 
@@ -1417,8 +1397,8 @@
     public final void mACTIVATION_GROUP() throws RecognitionException {
         try {
             int _type = ACTIVATION_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:2: ( 'activation-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:4: 'activation-group'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:2: ( 'activation-group' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:4: 'activation-group'
             {
             match("activation-group"); if (failed) return ;
 
@@ -1436,8 +1416,8 @@
     public final void mAGENDA_GROUP() throws RecognitionException {
         try {
             int _type = AGENDA_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:2: ( 'agenda-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:4: 'agenda-group'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:2: ( 'agenda-group' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:4: 'agenda-group'
             {
             match("agenda-group"); if (failed) return ;
 
@@ -1455,8 +1435,8 @@
     public final void mDIALECT() throws RecognitionException {
         try {
             int _type = DIALECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:2: ( 'dialect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:4: 'dialect'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:2: ( 'dialect' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:4: 'dialect'
             {
             match("dialect"); if (failed) return ;
 
@@ -1474,8 +1454,8 @@
     public final void mRULEFLOW_GROUP() throws RecognitionException {
         try {
             int _type = RULEFLOW_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:2: ( 'ruleflow-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:4: 'ruleflow-group'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1866:2: ( 'ruleflow-group' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1866:4: 'ruleflow-group'
             {
             match("ruleflow-group"); if (failed) return ;
 
@@ -1493,8 +1473,8 @@
     public final void mDURATION() throws RecognitionException {
         try {
             int _type = DURATION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:2: ( 'duration' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:4: 'duration'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:2: ( 'duration' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:4: 'duration'
             {
             match("duration"); if (failed) return ;
 
@@ -1512,8 +1492,8 @@
     public final void mLOCK_ON_ACTIVE() throws RecognitionException {
         try {
             int _type = LOCK_ON_ACTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:2: ( 'lock-on-active' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:4: 'lock-on-active'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:2: ( 'lock-on-active' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:4: 'lock-on-active'
             {
             match("lock-on-active"); if (failed) return ;
 
@@ -1531,8 +1511,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:6: ( 'from' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:8: 'from'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:6: ( 'from' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:8: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -1550,8 +1530,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1850:2: ( 'accumulate' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1850:4: 'accumulate'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:2: ( 'accumulate' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:4: 'accumulate'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1569,8 +1549,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1852:6: ( 'init' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1852:8: 'init'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:6: ( 'init' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:8: 'init'
             {
             match("init"); if (failed) return ;
 
@@ -1588,8 +1568,8 @@
     public final void mACTION() throws RecognitionException {
         try {
             int _type = ACTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:8: ( 'action' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:10: 'action'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1881:8: ( 'action' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1881:10: 'action'
             {
             match("action"); if (failed) return ;
 
@@ -1607,8 +1587,8 @@
     public final void mREVERSE() throws RecognitionException {
         try {
             int _type = REVERSE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:9: ( 'reverse' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:11: 'reverse'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:9: ( 'reverse' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:11: 'reverse'
             {
             match("reverse"); if (failed) return ;
 
@@ -1626,8 +1606,8 @@
     public final void mRESULT() throws RecognitionException {
         try {
             int _type = RESULT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1858:8: ( 'result' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1858:10: 'result'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1885:8: ( 'result' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1885:10: 'result'
             {
             match("result"); if (failed) return ;
 
@@ -1645,8 +1625,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:9: ( 'collect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:11: 'collect'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:9: ( 'collect' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:11: 'collect'
             {
             match("collect"); if (failed) return ;
 
@@ -1664,8 +1644,8 @@
     public final void mENTRY_POINT() throws RecognitionException {
         try {
             int _type = ENTRY_POINT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1862:13: ( 'entry-point' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1862:15: 'entry-point'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1889:13: ( 'entry-point' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1889:15: 'entry-point'
             {
             match("entry-point"); if (failed) return ;
 
@@ -1683,8 +1663,8 @@
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:4: ( 'or' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:6: 'or'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:4: ( 'or' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:6: 'or'
             {
             match("or"); if (failed) return ;
 
@@ -1702,8 +1682,8 @@
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1866:5: ( 'and' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1866:7: 'and'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1893:5: ( 'and' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1893:7: 'and'
             {
             match("and"); if (failed) return ;
 
@@ -1721,8 +1701,8 @@
     public final void mCONTAINS() throws RecognitionException {
         try {
             int _type = CONTAINS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:8: ( 'contains' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1869:16: 'contains'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1896:8: ( 'contains' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1896:16: 'contains'
             {
             match("contains"); if (failed) return ;
 
@@ -1740,8 +1720,8 @@
     public final void mEXCLUDES() throws RecognitionException {
         try {
             int _type = EXCLUDES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:8: ( 'excludes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:16: 'excludes'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1899:8: ( 'excludes' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1899:16: 'excludes'
             {
             match("excludes"); if (failed) return ;
 
@@ -1759,8 +1739,8 @@
     public final void mMEMBEROF() throws RecognitionException {
         try {
             int _type = MEMBEROF;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1875:8: ( 'memberOf' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1875:16: 'memberOf'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1902:8: ( 'memberOf' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1902:16: 'memberOf'
             {
             match("memberOf"); if (failed) return ;
 
@@ -1778,8 +1758,8 @@
     public final void mMATCHES() throws RecognitionException {
         try {
             int _type = MATCHES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:9: ( 'matches' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1877:16: 'matches'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1904:9: ( 'matches' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1904:16: 'matches'
             {
             match("matches"); if (failed) return ;
 
@@ -1797,8 +1777,8 @@
     public final void mSOUNDSLIKE() throws RecognitionException {
         try {
             int _type = SOUNDSLIKE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:12: ( 'soundslike' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:16: 'soundslike'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1906:12: ( 'soundslike' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1906:16: 'soundslike'
             {
             match("soundslike"); if (failed) return ;
 
@@ -1816,8 +1796,8 @@
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1881:4: ( 'in' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1881:6: 'in'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:4: ( 'in' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:6: 'in'
             {
             match("in"); if (failed) return ;
 
@@ -1835,8 +1815,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:6: ( 'null' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:8: 'null'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:6: ( 'null' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:8: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1854,8 +1834,8 @@
     public final void mEXISTS() throws RecognitionException {
         try {
             int _type = EXISTS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1885:8: ( 'exists' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1885:10: 'exists'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1912:8: ( 'exists' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1912:10: 'exists'
             {
             match("exists"); if (failed) return ;
 
@@ -1873,8 +1853,8 @@
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:5: ( 'not' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:7: 'not'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1914:5: ( 'not' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1914:7: 'not'
             {
             match("not"); if (failed) return ;
 
@@ -1892,8 +1872,8 @@
     public final void mEVAL() throws RecognitionException {
         try {
             int _type = EVAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1889:6: ( 'eval' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1889:8: 'eval'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:6: ( 'eval' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:8: 'eval'
             {
             match("eval"); if (failed) return ;
 
@@ -1911,8 +1891,8 @@
     public final void mFORALL() throws RecognitionException {
         try {
             int _type = FORALL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:8: ( 'forall' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:10: 'forall'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1918:8: ( 'forall' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1918:10: 'forall'
             {
             match("forall"); if (failed) return ;
 
@@ -1930,8 +1910,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1893:9: ( 'when' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1893:11: 'when'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1920:9: ( 'when' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1920:11: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -1949,8 +1929,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:6: ( 'then' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:12: 'then'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:6: ( 'then' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:12: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1968,8 +1948,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1897:9: ( 'end' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1897:11: 'end'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1924:9: ( 'end' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1924:11: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -1987,8 +1967,8 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1900:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1900:4: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927: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();
@@ -2001,7 +1981,7 @@
                 recover(mse);    throw mse;
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1900:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
             loop14:
             do {
                 int alt14=2;
@@ -2050,8 +2030,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1904:9: ( '(' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1904:11: '('
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1931:9: ( '(' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1931:11: '('
             {
             match('('); if (failed) return ;
 
@@ -2068,8 +2048,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:9: ( ')' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:11: ')'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1935:9: ( ')' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1935:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -2086,8 +2066,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1912:9: ( '[' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1912:11: '['
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:9: ( '[' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:11: '['
             {
             match('['); if (failed) return ;
 
@@ -2104,8 +2084,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:9: ( ']' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:11: ']'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1943:9: ( ']' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1943:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -2122,8 +2102,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1920:9: ( '{' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1920:11: '{'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1947:9: ( '{' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1947:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -2140,8 +2120,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1924:9: ( '}' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1924:11: '}'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1951:9: ( '}' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1951:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -2158,8 +2138,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:7: ( ',' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1927:9: ','
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1954:7: ( ',' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1954:9: ','
             {
             match(','); if (failed) return ;
 
@@ -2176,8 +2156,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1930:5: ( '.' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1930:7: '.'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1957:5: ( '.' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1957:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -2194,8 +2174,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1934:2: ( '&&' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1934:4: '&&'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1961:2: ( '&&' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1961:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -2213,8 +2193,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1938:2: ( '||' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1938:4: '||'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1965:2: ( '||' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1965:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -2232,8 +2212,8 @@
     public final void mTILDE() throws RecognitionException {
         try {
             int _type = TILDE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1941:7: ( '~' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1941:9: '~'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1968:7: ( '~' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1968:9: '~'
             {
             match('~'); if (failed) return ;
 
@@ -2246,15 +2226,69 @@
     }
     // $ANTLR end TILDE
 
+    // $ANTLR start AT
+    public final void mAT() throws RecognitionException {
+        try {
+            int _type = AT;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1970:4: ( '@' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1970:12: '@'
+            {
+            match('@'); if (failed) return ;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end AT
+
+    // $ANTLR start EQUALS
+    public final void mEQUALS() throws RecognitionException {
+        try {
+            int _type = EQUALS;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1972:9: ( '=' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1972:11: '='
+            {
+            match('='); if (failed) return ;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end EQUALS
+
+    // $ANTLR start COLON
+    public final void mCOLON() throws RecognitionException {
+        try {
+            int _type = COLON;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1974:9: ( ':' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1974:11: ':'
+            {
+            match(':'); if (failed) return ;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end COLON
+
     // $ANTLR start SH_STYLE_SINGLE_LINE_COMMENT
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1944:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1944:4: '#' ( options {greedy=false; } : . )* EOL
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1977:2: ( '#' ( options {greedy=false; } : . )* EOL )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1977:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1944:8: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1977:8: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -2273,7 +2307,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1944:35: .
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1977:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2303,12 +2337,12 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:4: '//' ( options {greedy=false; } : . )* EOL
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1983:2: ( '//' ( options {greedy=false; } : . )* EOL )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1983:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1983:9: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2327,7 +2361,7 @@
 
                 switch (alt16) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:36: .
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1983:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2357,12 +2391,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1955:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1955:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1988:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1988:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1955:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1988:9: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -2387,7 +2421,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1955:35: .
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1988:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2418,10 +2452,10 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1959:7: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1992:7: ( '!' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '/' | '\\'' | '\\\\' | '|' | '&' )
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
             {
-            if ( input.LA(1)=='!'||(input.LA(1)>='$' && input.LA(1)<='\'')||(input.LA(1)>='*' && input.LA(1)<='+')||input.LA(1)=='-'||input.LA(1)=='/'||input.LA(1)=='='||(input.LA(1)>='?' && input.LA(1)<='@')||input.LA(1)=='\\'||(input.LA(1)>='^' && input.LA(1)<='_')||input.LA(1)=='|' ) {
+            if ( input.LA(1)=='!'||(input.LA(1)>='$' && input.LA(1)<='\'')||(input.LA(1)>='*' && input.LA(1)<='+')||input.LA(1)=='-'||input.LA(1)=='/'||input.LA(1)=='?'||input.LA(1)=='\\'||(input.LA(1)>='^' && input.LA(1)<='_')||input.LA(1)=='|' ) {
                 input.consume();
             failed=false;
             }
@@ -2443,545 +2477,559 @@
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | DECLARE | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | ENTRY_POINT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | TILDE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
-        int alt18=77;
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | DECLARE | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | ENTRY_POINT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | TILDE | AT | EQUALS | COLON | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
+        int alt18=79;
         alt18 = dfa18.predict(input);
         switch (alt18) {
             case 1 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T76
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T79
                 {
-                mT76(); if (failed) return ;
+                mT79(); if (failed) return ;
 
                 }
                 break;
             case 2 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T77
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T80
                 {
-                mT77(); if (failed) return ;
+                mT80(); if (failed) return ;
 
                 }
                 break;
             case 3 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T78
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T81
                 {
-                mT78(); if (failed) return ;
+                mT81(); if (failed) return ;
 
                 }
                 break;
             case 4 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T79
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T82
                 {
-                mT79(); if (failed) return ;
+                mT82(); if (failed) return ;
 
                 }
                 break;
             case 5 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T80
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T83
                 {
-                mT80(); if (failed) return ;
+                mT83(); if (failed) return ;
 
                 }
                 break;
             case 6 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T81
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T84
                 {
-                mT81(); if (failed) return ;
+                mT84(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T82
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T85
                 {
-                mT82(); if (failed) return ;
+                mT85(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T83
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T86
                 {
-                mT83(); if (failed) return ;
+                mT86(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T84
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T87
                 {
-                mT84(); if (failed) return ;
+                mT87(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T85
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: WS
                 {
-                mT85(); if (failed) return ;
+                mWS(); if (failed) return ;
 
                 }
                 break;
             case 11 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:50: WS
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:49: INT
                 {
-                mWS(); if (failed) return ;
+                mINT(); if (failed) return ;
 
                 }
                 break;
             case 12 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:53: INT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:53: FLOAT
                 {
-                mINT(); if (failed) return ;
+                mFLOAT(); if (failed) return ;
 
                 }
                 break;
             case 13 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:57: FLOAT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:59: STRING
                 {
-                mFLOAT(); if (failed) return ;
+                mSTRING(); if (failed) return ;
 
                 }
                 break;
             case 14 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:63: STRING
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:66: BOOL
                 {
-                mSTRING(); if (failed) return ;
+                mBOOL(); if (failed) return ;
 
                 }
                 break;
             case 15 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:70: BOOL
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:71: PACKAGE
                 {
-                mBOOL(); if (failed) return ;
+                mPACKAGE(); if (failed) return ;
 
                 }
                 break;
             case 16 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:75: PACKAGE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:79: IMPORT
                 {
-                mPACKAGE(); if (failed) return ;
+                mIMPORT(); if (failed) return ;
 
                 }
                 break;
             case 17 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:83: IMPORT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:86: FUNCTION
                 {
-                mIMPORT(); if (failed) return ;
+                mFUNCTION(); if (failed) return ;
 
                 }
                 break;
             case 18 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:90: FUNCTION
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:95: EVENT
                 {
-                mFUNCTION(); if (failed) return ;
+                mEVENT(); if (failed) return ;
 
                 }
                 break;
             case 19 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:99: EVENT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:101: GLOBAL
                 {
-                mEVENT(); if (failed) return ;
+                mGLOBAL(); if (failed) return ;
 
                 }
                 break;
             case 20 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:105: GLOBAL
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:108: DECLARE
                 {
-                mGLOBAL(); if (failed) return ;
+                mDECLARE(); if (failed) return ;
 
                 }
                 break;
             case 21 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:112: DECLARE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:116: RULE
                 {
-                mDECLARE(); if (failed) return ;
+                mRULE(); if (failed) return ;
 
                 }
                 break;
             case 22 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:120: RULE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:121: QUERY
                 {
-                mRULE(); if (failed) return ;
+                mQUERY(); if (failed) return ;
 
                 }
                 break;
             case 23 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:125: QUERY
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:127: TEMPLATE
                 {
-                mQUERY(); if (failed) return ;
+                mTEMPLATE(); if (failed) return ;
 
                 }
                 break;
             case 24 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:131: TEMPLATE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:136: ATTRIBUTES
                 {
-                mTEMPLATE(); if (failed) return ;
+                mATTRIBUTES(); if (failed) return ;
 
                 }
                 break;
             case 25 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:140: ATTRIBUTES
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:147: DATE_EFFECTIVE
                 {
-                mATTRIBUTES(); if (failed) return ;
+                mDATE_EFFECTIVE(); if (failed) return ;
 
                 }
                 break;
             case 26 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:151: DATE_EFFECTIVE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:162: DATE_EXPIRES
                 {
-                mDATE_EFFECTIVE(); if (failed) return ;
+                mDATE_EXPIRES(); if (failed) return ;
 
                 }
                 break;
             case 27 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:166: DATE_EXPIRES
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:175: ENABLED
                 {
-                mDATE_EXPIRES(); if (failed) return ;
+                mENABLED(); if (failed) return ;
 
                 }
                 break;
             case 28 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:179: ENABLED
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:183: SALIENCE
                 {
-                mENABLED(); if (failed) return ;
+                mSALIENCE(); if (failed) return ;
 
                 }
                 break;
             case 29 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:187: SALIENCE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:192: NO_LOOP
                 {
-                mSALIENCE(); if (failed) return ;
+                mNO_LOOP(); if (failed) return ;
 
                 }
                 break;
             case 30 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:196: NO_LOOP
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:200: AUTO_FOCUS
                 {
-                mNO_LOOP(); if (failed) return ;
+                mAUTO_FOCUS(); if (failed) return ;
 
                 }
                 break;
             case 31 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:204: AUTO_FOCUS
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:211: ACTIVATION_GROUP
                 {
-                mAUTO_FOCUS(); if (failed) return ;
+                mACTIVATION_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 32 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:215: ACTIVATION_GROUP
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:228: AGENDA_GROUP
                 {
-                mACTIVATION_GROUP(); if (failed) return ;
+                mAGENDA_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 33 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:232: AGENDA_GROUP
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:241: DIALECT
                 {
-                mAGENDA_GROUP(); if (failed) return ;
+                mDIALECT(); if (failed) return ;
 
                 }
                 break;
             case 34 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:245: DIALECT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:249: RULEFLOW_GROUP
                 {
-                mDIALECT(); if (failed) return ;
+                mRULEFLOW_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 35 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:253: RULEFLOW_GROUP
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:264: DURATION
                 {
-                mRULEFLOW_GROUP(); if (failed) return ;
+                mDURATION(); if (failed) return ;
 
                 }
                 break;
             case 36 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:268: DURATION
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:273: LOCK_ON_ACTIVE
                 {
-                mDURATION(); if (failed) return ;
+                mLOCK_ON_ACTIVE(); if (failed) return ;
 
                 }
                 break;
             case 37 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:277: LOCK_ON_ACTIVE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:288: FROM
                 {
-                mLOCK_ON_ACTIVE(); if (failed) return ;
+                mFROM(); if (failed) return ;
 
                 }
                 break;
             case 38 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:292: FROM
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:293: ACCUMULATE
                 {
-                mFROM(); if (failed) return ;
+                mACCUMULATE(); if (failed) return ;
 
                 }
                 break;
             case 39 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:297: ACCUMULATE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:304: INIT
                 {
-                mACCUMULATE(); if (failed) return ;
+                mINIT(); if (failed) return ;
 
                 }
                 break;
             case 40 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:308: INIT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:309: ACTION
                 {
-                mINIT(); if (failed) return ;
+                mACTION(); if (failed) return ;
 
                 }
                 break;
             case 41 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:313: ACTION
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:316: REVERSE
                 {
-                mACTION(); if (failed) return ;
+                mREVERSE(); if (failed) return ;
 
                 }
                 break;
             case 42 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:320: REVERSE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:324: RESULT
                 {
-                mREVERSE(); if (failed) return ;
+                mRESULT(); if (failed) return ;
 
                 }
                 break;
             case 43 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:328: RESULT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:331: COLLECT
                 {
-                mRESULT(); if (failed) return ;
+                mCOLLECT(); if (failed) return ;
 
                 }
                 break;
             case 44 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:335: COLLECT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:339: ENTRY_POINT
                 {
-                mCOLLECT(); if (failed) return ;
+                mENTRY_POINT(); if (failed) return ;
 
                 }
                 break;
             case 45 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:343: ENTRY_POINT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:351: OR
                 {
-                mENTRY_POINT(); if (failed) return ;
+                mOR(); if (failed) return ;
 
                 }
                 break;
             case 46 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:355: OR
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:354: AND
                 {
-                mOR(); if (failed) return ;
+                mAND(); if (failed) return ;
 
                 }
                 break;
             case 47 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:358: AND
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:358: CONTAINS
                 {
-                mAND(); if (failed) return ;
+                mCONTAINS(); if (failed) return ;
 
                 }
                 break;
             case 48 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:362: CONTAINS
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:367: EXCLUDES
                 {
-                mCONTAINS(); if (failed) return ;
+                mEXCLUDES(); if (failed) return ;
 
                 }
                 break;
             case 49 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:371: EXCLUDES
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:376: MEMBEROF
                 {
-                mEXCLUDES(); if (failed) return ;
+                mMEMBEROF(); if (failed) return ;
 
                 }
                 break;
             case 50 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:380: MEMBEROF
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:385: MATCHES
                 {
-                mMEMBEROF(); if (failed) return ;
+                mMATCHES(); if (failed) return ;
 
                 }
                 break;
             case 51 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:389: MATCHES
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:393: SOUNDSLIKE
                 {
-                mMATCHES(); if (failed) return ;
+                mSOUNDSLIKE(); if (failed) return ;
 
                 }
                 break;
             case 52 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:397: SOUNDSLIKE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:404: IN
                 {
-                mSOUNDSLIKE(); if (failed) return ;
+                mIN(); if (failed) return ;
 
                 }
                 break;
             case 53 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:408: IN
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:407: NULL
                 {
-                mIN(); if (failed) return ;
+                mNULL(); if (failed) return ;
 
                 }
                 break;
             case 54 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:411: NULL
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:412: EXISTS
                 {
-                mNULL(); if (failed) return ;
+                mEXISTS(); if (failed) return ;
 
                 }
                 break;
             case 55 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:416: EXISTS
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:419: NOT
                 {
-                mEXISTS(); if (failed) return ;
+                mNOT(); if (failed) return ;
 
                 }
                 break;
             case 56 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:423: NOT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:423: EVAL
                 {
-                mNOT(); if (failed) return ;
+                mEVAL(); if (failed) return ;
 
                 }
                 break;
             case 57 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:427: EVAL
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:428: FORALL
                 {
-                mEVAL(); if (failed) return ;
+                mFORALL(); if (failed) return ;
 
                 }
                 break;
             case 58 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:432: FORALL
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:435: WHEN
                 {
-                mFORALL(); if (failed) return ;
+                mWHEN(); if (failed) return ;
 
                 }
                 break;
             case 59 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:439: WHEN
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:440: THEN
                 {
-                mWHEN(); if (failed) return ;
+                mTHEN(); if (failed) return ;
 
                 }
                 break;
             case 60 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:444: THEN
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:445: END
                 {
-                mTHEN(); if (failed) return ;
+                mEND(); if (failed) return ;
 
                 }
                 break;
             case 61 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:449: END
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:449: ID
                 {
-                mEND(); if (failed) return ;
+                mID(); if (failed) return ;
 
                 }
                 break;
             case 62 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:453: ID
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:452: LEFT_PAREN
                 {
-                mID(); if (failed) return ;
+                mLEFT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 63 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:456: LEFT_PAREN
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:463: RIGHT_PAREN
                 {
-                mLEFT_PAREN(); if (failed) return ;
+                mRIGHT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 64 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:467: RIGHT_PAREN
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:475: LEFT_SQUARE
                 {
-                mRIGHT_PAREN(); if (failed) return ;
+                mLEFT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 65 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:479: LEFT_SQUARE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:487: RIGHT_SQUARE
                 {
-                mLEFT_SQUARE(); if (failed) return ;
+                mRIGHT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 66 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:491: RIGHT_SQUARE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:500: LEFT_CURLY
                 {
-                mRIGHT_SQUARE(); if (failed) return ;
+                mLEFT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 67 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:504: LEFT_CURLY
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:511: RIGHT_CURLY
                 {
-                mLEFT_CURLY(); if (failed) return ;
+                mRIGHT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 68 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:515: RIGHT_CURLY
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:523: COMMA
                 {
-                mRIGHT_CURLY(); if (failed) return ;
+                mCOMMA(); if (failed) return ;
 
                 }
                 break;
             case 69 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:527: COMMA
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:529: DOT
                 {
-                mCOMMA(); if (failed) return ;
+                mDOT(); if (failed) return ;
 
                 }
                 break;
             case 70 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:533: DOT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:533: DOUBLE_AMPER
                 {
-                mDOT(); if (failed) return ;
+                mDOUBLE_AMPER(); if (failed) return ;
 
                 }
                 break;
             case 71 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:537: DOUBLE_AMPER
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:546: DOUBLE_PIPE
                 {
-                mDOUBLE_AMPER(); if (failed) return ;
+                mDOUBLE_PIPE(); if (failed) return ;
 
                 }
                 break;
             case 72 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:550: DOUBLE_PIPE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:558: TILDE
                 {
-                mDOUBLE_PIPE(); if (failed) return ;
+                mTILDE(); if (failed) return ;
 
                 }
                 break;
             case 73 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:562: TILDE
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:564: AT
                 {
-                mTILDE(); if (failed) return ;
+                mAT(); if (failed) return ;
 
                 }
                 break;
             case 74 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:568: SH_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:567: EQUALS
                 {
-                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mEQUALS(); if (failed) return ;
 
                 }
                 break;
             case 75 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:597: C_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:574: COLON
                 {
-                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mCOLON(); if (failed) return ;
 
                 }
                 break;
             case 76 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:625: MULTI_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:580: SH_STYLE_SINGLE_LINE_COMMENT
                 {
-                mMULTI_LINE_COMMENT(); if (failed) return ;
+                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 77 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:644: MISC
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:609: C_STYLE_SINGLE_LINE_COMMENT
                 {
+                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 78 :
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:637: MULTI_LINE_COMMENT
+                {
+                mMULTI_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 79 :
+                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:656: MISC
+                {
                 mMISC(); if (failed) return ;
 
                 }
@@ -2993,8 +3041,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:14: ( '\\r\\n' )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:16: '\\r\\n'
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:14: ( '\\r\\n' )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -3021,128 +3069,128 @@
 
     protected DFA18 dfa18 = new DFA18(this);
     static final String DFA18_eotS =
-        "\2\uffff\1\56\1\uffff\2\54\1\62\1\64\1\54\1\uffff\1\66\1\uffff\1"+
-        "\54\21\53\10\uffff\2\54\2\uffff\1\54\15\uffff\10\53\1\151\27\53"+
-        "\1\u0089\3\53\4\uffff\11\53\1\uffff\3\53\1\u0099\17\53\1\u00a9\6"+
-        "\53\1\u00b0\1\uffff\3\53\1\uffff\3\53\1\u00b7\1\53\1\u00b9\1\u00ba"+
-        "\4\53\1\u00bf\3\53\1\uffff\2\53\1\u00c5\10\53\1\u00cf\3\53\1\uffff"+
-        "\5\53\1\u00d9\1\uffff\5\53\1\u00df\1\uffff\1\53\2\uffff\1\u00b7"+
-        "\3\53\1\uffff\5\53\1\uffff\1\u00e9\4\53\1\uffff\3\53\1\uffff\1\u00f2"+
-        "\4\53\1\uffff\3\53\2\uffff\4\53\1\uffff\1\53\1\u00ff\2\53\1\u0102"+
-        "\1\53\1\u0104\1\uffff\1\53\1\uffff\1\u0106\3\53\1\uffff\1\53\1\u010d"+
-        "\1\53\1\uffff\2\53\1\u0111\11\53\1\uffff\1\53\1\u011c\1\uffff\1"+
-        "\53\1\uffff\1\u011e\1\uffff\1\53\1\u0120\1\u0121\2\uffff\1\u0122"+
-        "\1\uffff\3\53\1\uffff\1\53\1\uffff\2\53\1\u0129\2\53\1\u012c\1\u012d"+
-        "\1\u012e\1\uffff\1\u012f\1\uffff\1\u0130\3\uffff\5\53\1\u0136\1"+
-        "\uffff\1\u0137\1\u0138\6\uffff\4\53\3\uffff\1\u013d\1\53\1\u013f"+
-        "\1\u0140\4\uffff";
+        "\2\uffff\1\57\1\55\1\62\1\64\1\66\1\55\1\uffff\1\70\1\uffff\1\55"+
+        "\21\54\10\uffff\2\55\4\uffff\1\55\16\uffff\10\54\1\153\27\54\1\u008b"+
+        "\3\54\4\uffff\11\54\1\uffff\7\54\1\u009f\14\54\1\u00ac\4\54\1\u00b1"+
+        "\1\uffff\4\54\1\uffff\3\54\1\u00b9\1\54\1\u00bb\2\54\1\u00be\2\54"+
+        "\1\u00c1\2\54\1\u00c4\4\54\1\uffff\5\54\1\u00cf\6\54\1\uffff\4\54"+
+        "\1\uffff\1\u00db\5\54\1\u00e1\1\uffff\1\54\1\uffff\1\u00b9\1\54"+
+        "\1\uffff\2\54\1\uffff\1\54\1\u00e7\1\uffff\5\54\1\uffff\4\54\1\uffff"+
+        "\2\54\1\u00f4\4\54\1\uffff\3\54\2\uffff\4\54\1\uffff\1\54\1\u0101"+
+        "\2\54\1\u0104\1\uffff\1\u0105\1\54\1\uffff\1\54\1\u0108\1\uffff"+
+        "\5\54\1\u0110\1\uffff\1\54\1\u0112\12\54\1\uffff\1\54\1\u011e\2"+
+        "\uffff\1\54\1\u0120\3\uffff\1\54\1\u0122\1\u0123\1\54\1\u0125\1"+
+        "\uffff\1\54\1\uffff\1\54\1\uffff\4\54\1\u012c\1\54\1\u012e\1\u012f"+
+        "\1\u0130\1\uffff\1\u0131\1\uffff\1\u0132\2\uffff\1\54\1\uffff\3"+
+        "\54\1\u0137\1\54\1\u0139\1\uffff\1\u013a\6\uffff\3\54\1\uffff\1"+
+        "\54\2\uffff\1\54\1\u0140\1\u0141\1\u0142\4\uffff";
     static final String DFA18_eofS =
-        "\u0141\uffff";
+        "\u0143\uffff";
     static final String DFA18_minS =
-        "\1\11\1\uffff\1\52\1\uffff\1\60\4\75\1\uffff\1\56\1\uffff\1\0\1"+
-        "\145\2\141\1\155\1\156\1\154\1\141\1\145\1\165\1\143\1\141\3\157"+
-        "\1\162\1\141\1\150\10\uffff\1\46\1\174\2\uffff\1\52\15\uffff\1\165"+
-        "\1\155\1\145\1\157\1\154\1\162\1\156\1\143\1\60\1\160\1\143\2\141"+
-        "\1\157\1\162\1\141\1\143\1\164\1\163\1\154\1\145\1\143\1\144\2\164"+
-        "\1\145\1\165\2\154\1\55\1\143\1\154\1\60\1\155\1\164\1\145\4\uffff"+
-        "\1\145\1\160\1\156\1\155\1\163\1\141\1\143\1\153\1\164\1\uffff\1"+
-        "\157\1\154\1\163\1\60\1\162\1\142\1\154\1\156\1\142\1\141\2\154"+
-        "\2\145\1\165\1\145\1\162\1\165\1\151\1\60\1\162\1\157\2\156\1\151"+
-        "\1\154\1\60\1\uffff\1\153\1\154\1\164\1\uffff\1\142\1\143\1\156"+
-        "\1\60\1\154\2\60\1\145\1\154\1\164\1\141\1\60\1\162\1\165\1\164"+
-        "\1\uffff\1\171\1\154\1\60\1\164\1\141\1\164\1\145\1\141\1\55\1\162"+
-        "\1\154\1\60\1\171\1\155\1\157\1\uffff\1\151\1\55\2\144\1\145\1\60"+
-        "\1\uffff\1\55\1\145\1\141\1\145\1\150\1\60\1\uffff\1\141\2\uffff"+
-        "\1\60\1\154\1\151\1\147\1\uffff\1\164\1\144\1\163\1\55\1\145\1\uffff"+
-        "\1\60\1\154\1\151\1\143\1\162\1\145\1\163\1\164\1\154\1\uffff\1"+
-        "\60\1\165\1\141\1\156\1\142\1\uffff\1\141\1\163\1\156\2\uffff\1"+
-        "\143\1\151\1\162\1\145\1\uffff\1\164\1\60\1\157\1\145\1\60\1\145"+
-        "\1\60\1\uffff\1\144\1\uffff\1\60\1\157\1\164\1\145\1\146\1\145\1"+
-        "\60\1\157\1\uffff\1\154\1\164\1\60\1\165\1\55\1\154\1\143\1\164"+
-        "\1\156\1\117\1\163\1\145\1\uffff\1\156\1\60\1\uffff\1\163\1\uffff"+
-        "\1\60\1\uffff\1\156\2\60\2\uffff\1\60\1\uffff\1\167\1\141\1\151"+
-        "\1\uffff\1\164\1\uffff\1\151\1\145\1\60\1\163\1\146\3\60\1\uffff"+
-        "\1\60\1\uffff\1\60\3\uffff\1\55\1\164\1\157\1\145\1\153\1\60\1\uffff"+
-        "\2\60\6\uffff\1\145\1\156\1\163\1\145\3\uffff\1\60\1\55\2\60\4\uffff";
+        "\1\11\1\uffff\1\52\1\60\4\75\1\uffff\1\56\1\uffff\1\0\1\145\2\141"+
+        "\1\155\1\156\1\154\1\141\1\145\1\165\1\143\1\141\3\157\1\162\1\141"+
+        "\1\150\10\uffff\1\46\1\174\4\uffff\1\52\16\uffff\1\165\1\155\1\145"+
+        "\1\154\1\162\1\157\1\156\1\143\1\60\1\160\1\141\1\143\1\141\1\157"+
+        "\1\164\1\162\1\143\1\141\1\154\1\163\1\145\1\143\1\145\1\144\2\164"+
+        "\1\154\1\165\1\55\1\154\1\143\1\154\1\60\1\155\1\164\1\145\4\uffff"+
+        "\1\145\1\160\1\156\1\163\1\141\1\155\1\143\1\153\1\164\1\uffff\1"+
+        "\157\1\156\1\154\1\163\1\154\1\162\1\142\1\60\1\142\1\145\1\141"+
+        "\2\154\2\145\1\165\1\162\1\151\1\165\1\156\1\60\1\157\1\162\1\151"+
+        "\1\156\1\60\1\uffff\1\154\1\153\1\164\1\154\1\uffff\1\142\1\143"+
+        "\1\156\1\60\1\154\1\60\1\145\1\154\1\60\1\164\1\141\1\60\1\162\1"+
+        "\164\1\60\1\164\1\165\1\171\1\154\1\uffff\1\141\1\55\1\164\1\141"+
+        "\1\145\1\60\1\162\1\154\1\171\1\157\1\155\1\144\1\uffff\1\55\1\151"+
+        "\1\145\1\144\1\uffff\1\60\1\55\1\141\2\145\1\150\1\60\1\uffff\1"+
+        "\141\1\uffff\1\60\1\154\1\uffff\1\151\1\147\1\uffff\1\164\1\60\1"+
+        "\uffff\1\163\1\144\1\55\1\145\1\154\1\145\1\151\1\162\1\143\1\154"+
+        "\1\uffff\1\163\1\164\1\60\1\141\1\156\1\165\1\141\1\uffff\1\142"+
+        "\1\156\1\163\2\uffff\1\151\1\143\1\162\1\145\1\uffff\1\164\1\60"+
+        "\1\157\1\145\1\60\1\uffff\1\60\1\145\1\uffff\1\144\1\60\1\146\1"+
+        "\157\1\145\1\164\1\157\1\145\1\60\1\uffff\1\164\1\60\1\154\1\55"+
+        "\1\165\1\143\1\154\1\156\1\164\1\117\1\163\1\145\1\uffff\1\156\1"+
+        "\60\2\uffff\1\163\1\60\3\uffff\1\156\2\60\1\167\1\60\1\uffff\1\151"+
+        "\1\uffff\1\141\1\uffff\1\164\1\145\1\151\1\163\1\60\1\146\3\60\1"+
+        "\uffff\1\60\1\uffff\1\60\2\uffff\1\55\1\uffff\1\157\1\164\1\145"+
+        "\1\60\1\153\1\60\1\uffff\1\60\6\uffff\1\156\1\145\1\163\1\uffff"+
+        "\1\145\2\uffff\1\55\3\60\4\uffff";
     static final String DFA18_maxS =
-        "\1\u00ff\1\uffff\1\52\1\uffff\1\76\4\75\1\uffff\1\71\1\uffff\1\ufffe"+
-        "\1\162\1\165\1\141\1\156\1\170\1\154\4\165\1\157\1\165\2\157\1\162"+
-        "\1\145\1\150\10\uffff\1\46\1\174\2\uffff\1\57\15\uffff\1\165\1\155"+
-        "\1\145\1\157\1\154\1\162\1\156\1\143\1\u00ff\1\160\1\151\1\164\1"+
-        "\145\1\157\1\162\1\141\1\143\1\164\1\166\1\154\1\145\1\164\1\144"+
-        "\2\164\1\145\1\165\2\154\1\164\1\143\1\156\1\u00ff\1\155\1\164\1"+
-        "\145\4\uffff\1\145\1\160\1\156\1\155\1\163\1\141\1\143\1\153\1\164"+
-        "\1\uffff\1\157\1\154\1\163\1\u00ff\1\162\1\142\1\154\1\156\1\142"+
-        "\1\141\2\154\2\145\1\165\1\145\1\162\1\165\1\151\1\u00ff\1\162\1"+
-        "\157\2\156\1\151\1\154\1\u00ff\1\uffff\1\153\1\154\1\164\1\uffff"+
-        "\1\142\1\143\1\156\1\u00ff\1\154\2\u00ff\1\145\1\154\1\164\1\141"+
-        "\1\u00ff\1\162\1\165\1\164\1\uffff\1\171\1\154\1\u00ff\1\164\1\141"+
-        "\1\164\1\145\1\141\1\55\1\162\1\154\1\u00ff\1\171\1\155\1\166\1"+
-        "\uffff\1\151\1\55\2\144\1\145\1\u00ff\1\uffff\1\55\1\145\1\141\1"+
-        "\145\1\150\1\u00ff\1\uffff\1\141\2\uffff\1\u00ff\1\154\1\151\1\147"+
-        "\1\uffff\1\164\1\144\1\163\1\55\1\145\1\uffff\1\u00ff\1\154\1\151"+
-        "\1\143\1\162\1\145\1\163\1\164\1\154\1\uffff\1\u00ff\1\165\1\141"+
-        "\1\156\1\142\1\uffff\1\141\1\163\1\156\2\uffff\1\143\1\151\1\162"+
-        "\1\145\1\uffff\1\164\1\u00ff\1\157\1\145\1\u00ff\1\145\1\u00ff\1"+
-        "\uffff\1\144\1\uffff\1\u00ff\1\157\1\164\1\145\1\170\1\145\1\u00ff"+
-        "\1\157\1\uffff\1\154\1\164\1\u00ff\1\165\1\55\1\154\1\143\1\164"+
-        "\1\156\1\117\1\163\1\145\1\uffff\1\156\1\u00ff\1\uffff\1\163\1\uffff"+
-        "\1\u00ff\1\uffff\1\156\2\u00ff\2\uffff\1\u00ff\1\uffff\1\167\1\141"+
-        "\1\151\1\uffff\1\164\1\uffff\1\151\1\145\1\u00ff\1\163\1\146\3\u00ff"+
-        "\1\uffff\1\u00ff\1\uffff\1\u00ff\3\uffff\1\55\1\164\1\157\1\145"+
-        "\1\153\1\u00ff\1\uffff\2\u00ff\6\uffff\1\145\1\156\1\163\1\145\3"+
-        "\uffff\1\u00ff\1\55\2\u00ff\4\uffff";
+        "\1\u00ff\1\uffff\1\52\1\76\4\75\1\uffff\1\71\1\uffff\1\ufffe\1\162"+
+        "\1\165\1\141\1\156\1\170\1\154\4\165\1\157\1\165\2\157\1\162\1\145"+
+        "\1\150\10\uffff\1\46\1\174\4\uffff\1\57\16\uffff\1\165\1\155\1\145"+
+        "\1\154\1\162\1\157\1\156\1\143\1\u00ff\1\160\1\145\1\151\1\164\1"+
+        "\157\1\164\1\162\1\143\1\141\1\154\1\166\1\145\1\164\1\145\1\144"+
+        "\2\164\1\154\1\165\1\164\1\154\1\143\1\156\1\u00ff\1\155\1\164\1"+
+        "\145\4\uffff\1\145\1\160\1\156\1\163\1\141\1\155\1\143\1\153\1\164"+
+        "\1\uffff\1\157\1\156\1\154\1\163\1\154\1\162\1\142\1\u00ff\1\142"+
+        "\1\145\1\141\2\154\2\145\1\165\1\162\1\151\1\165\1\156\1\u00ff\1"+
+        "\157\1\162\1\151\1\156\1\u00ff\1\uffff\1\154\1\153\1\164\1\154\1"+
+        "\uffff\1\142\1\143\1\156\1\u00ff\1\154\1\u00ff\1\145\1\154\1\u00ff"+
+        "\1\164\1\141\1\u00ff\1\162\1\164\1\u00ff\1\164\1\165\1\171\1\154"+
+        "\1\uffff\1\141\1\55\1\164\1\141\1\145\1\u00ff\1\162\1\154\1\171"+
+        "\1\166\1\155\1\144\1\uffff\1\55\1\151\1\145\1\144\1\uffff\1\u00ff"+
+        "\1\55\1\141\2\145\1\150\1\u00ff\1\uffff\1\141\1\uffff\1\u00ff\1"+
+        "\154\1\uffff\1\151\1\147\1\uffff\1\164\1\u00ff\1\uffff\1\163\1\144"+
+        "\1\55\1\145\1\154\1\145\1\151\1\162\1\143\1\154\1\uffff\1\163\1"+
+        "\164\1\u00ff\1\141\1\156\1\165\1\141\1\uffff\1\142\1\156\1\163\2"+
+        "\uffff\1\151\1\143\1\162\1\145\1\uffff\1\164\1\u00ff\1\157\1\145"+
+        "\1\u00ff\1\uffff\1\u00ff\1\145\1\uffff\1\144\1\u00ff\1\170\1\157"+
+        "\1\145\1\164\1\157\1\145\1\u00ff\1\uffff\1\164\1\u00ff\1\154\1\55"+
+        "\1\165\1\143\1\154\1\156\1\164\1\117\1\163\1\145\1\uffff\1\156\1"+
+        "\u00ff\2\uffff\1\163\1\u00ff\3\uffff\1\156\2\u00ff\1\167\1\u00ff"+
+        "\1\uffff\1\151\1\uffff\1\141\1\uffff\1\164\1\145\1\151\1\163\1\u00ff"+
+        "\1\146\3\u00ff\1\uffff\1\u00ff\1\uffff\1\u00ff\2\uffff\1\55\1\uffff"+
+        "\1\157\1\164\1\145\1\u00ff\1\153\1\u00ff\1\uffff\1\u00ff\6\uffff"+
+        "\1\156\1\145\1\163\1\uffff\1\145\2\uffff\1\55\3\u00ff\4\uffff";
     static final String DFA18_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\5\uffff\1\13\1\uffff\1\16\22\uffff\1\76"+
-        "\1\77\1\100\1\101\1\102\1\103\1\104\1\105\2\uffff\1\111\1\112\1"+
-        "\uffff\1\76\1\115\1\2\1\106\1\4\1\5\1\7\1\6\1\11\1\10\1\12\1\14"+
-        "\1\15\44\uffff\1\107\1\110\1\114\1\113\11\uffff\1\65\33\uffff\1"+
-        "\36\3\uffff\1\56\17\uffff\1\75\17\uffff\1\57\6\uffff\1\70\6\uffff"+
-        "\1\17\1\uffff\1\74\1\46\4\uffff\1\50\5\uffff\1\71\11\uffff\1\26"+
-        "\5\uffff\1\37\3\uffff\1\66\1\45\4\uffff\1\73\7\uffff\1\55\1\uffff"+
-        "\1\23\10\uffff\1\27\14\uffff\1\72\2\uffff\1\21\1\uffff\1\67\1\uffff"+
-        "\1\24\3\uffff\1\33\1\32\1\uffff\1\53\3\uffff\1\51\1\uffff\1\41\10"+
-        "\uffff\1\20\1\uffff\1\34\1\uffff\1\42\1\25\1\52\6\uffff\1\54\2\uffff"+
-        "\1\63\1\30\1\22\1\61\1\44\1\43\4\uffff\1\35\1\60\1\62\4\uffff\1"+
-        "\47\1\40\1\31\1\64";
+        "\1\uffff\1\1\6\uffff\1\12\1\uffff\1\15\22\uffff\1\75\1\76\1\77\1"+
+        "\100\1\101\1\102\1\103\1\104\2\uffff\1\110\1\111\1\113\1\114\1\uffff"+
+        "\1\75\1\117\1\2\1\105\1\3\1\4\1\112\1\6\1\5\1\10\1\7\1\11\1\13\1"+
+        "\14\44\uffff\1\106\1\107\1\116\1\115\11\uffff\1\64\32\uffff\1\35"+
+        "\4\uffff\1\55\23\uffff\1\74\14\uffff\1\56\4\uffff\1\67\7\uffff\1"+
+        "\16\1\uffff\1\73\2\uffff\1\45\2\uffff\1\47\2\uffff\1\70\12\uffff"+
+        "\1\25\7\uffff\1\36\3\uffff\1\65\1\44\4\uffff\1\72\5\uffff\1\22\2"+
+        "\uffff\1\54\11\uffff\1\26\14\uffff\1\71\2\uffff\1\20\1\66\2\uffff"+
+        "\1\23\1\31\1\32\5\uffff\1\52\1\uffff\1\50\1\uffff\1\40\11\uffff"+
+        "\1\17\1\uffff\1\33\1\uffff\1\24\1\41\1\uffff\1\51\6\uffff\1\53\1"+
+        "\uffff\1\62\1\27\1\21\1\60\1\43\1\42\3\uffff\1\34\1\uffff\1\57\1"+
+        "\61\4\uffff\1\37\1\46\1\30\1\63";
     static final String DFA18_specialS =
-        "\u0141\uffff}>";
+        "\u0143\uffff}>";
     static final String[] DFA18_transitionS = {
-            "\2\11\1\uffff\2\11\22\uffff\1\11\1\10\1\13\1\51\1\36\1\54\1"+
-            "\46\1\14\1\37\1\40\2\54\1\45\1\4\1\2\1\52\12\12\1\3\1\1\1\7"+
-            "\1\5\1\6\2\54\32\53\1\41\1\54\1\42\1\54\1\36\1\uffff\1\26\1"+
-            "\53\1\32\1\23\1\21\1\16\1\22\1\53\1\20\2\53\1\31\1\34\1\30\1"+
-            "\33\1\17\1\25\1\24\1\27\1\15\2\53\1\35\3\53\1\43\1\47\1\44\1"+
-            "\50\101\uffff\100\53",
+            "\2\10\1\uffff\2\10\22\uffff\1\10\1\7\1\12\1\52\1\35\1\55\1\45"+
+            "\1\13\1\36\1\37\2\55\1\44\1\3\1\2\1\53\12\11\1\51\1\1\1\6\1"+
+            "\4\1\5\1\55\1\50\32\54\1\40\1\55\1\41\1\55\1\35\1\uffff\1\25"+
+            "\1\54\1\31\1\22\1\20\1\15\1\21\1\54\1\17\2\54\1\30\1\33\1\27"+
+            "\1\32\1\16\1\24\1\23\1\26\1\14\2\54\1\34\3\54\1\42\1\46\1\43"+
+            "\1\47\101\uffff\100\54",
             "",
-            "\1\55",
-            "",
-            "\12\12\4\uffff\1\57",
-            "\1\60",
+            "\1\56",
+            "\12\11\4\uffff\1\60",
             "\1\61",
             "\1\63",
             "\1\65",
+            "\1\67",
             "",
-            "\1\67\1\uffff\12\12",
+            "\1\71\1\uffff\12\11",
             "",
-            "\uffff\13",
-            "\1\71\2\uffff\1\72\11\uffff\1\70",
-            "\1\74\15\uffff\1\75\2\uffff\1\73\2\uffff\1\76",
-            "\1\77",
-            "\1\101\1\100",
-            "\1\103\7\uffff\1\104\1\uffff\1\102",
-            "\1\105",
-            "\1\111\3\uffff\1\110\3\uffff\1\107\13\uffff\1\106",
-            "\1\112\17\uffff\1\113",
-            "\1\114",
-            "\1\115\3\uffff\1\121\6\uffff\1\116\5\uffff\1\117\1\120",
-            "\1\123\15\uffff\1\122",
-            "\1\125\5\uffff\1\124",
-            "\1\126",
-            "\1\127",
+            "\uffff\12",
+            "\1\73\2\uffff\1\74\11\uffff\1\72",
+            "\1\75\15\uffff\1\76\2\uffff\1\77\2\uffff\1\100",
+            "\1\101",
+            "\1\103\1\102",
+            "\1\106\7\uffff\1\104\1\uffff\1\105",
+            "\1\107",
+            "\1\110\3\uffff\1\112\3\uffff\1\113\13\uffff\1\111",
+            "\1\115\17\uffff\1\114",
+            "\1\116",
+            "\1\117\3\uffff\1\120\6\uffff\1\121\5\uffff\1\123\1\122",
+            "\1\124\15\uffff\1\125",
+            "\1\126\5\uffff\1\127",
             "\1\130",
-            "\1\132\3\uffff\1\131",
-            "\1\133",
+            "\1\131",
+            "\1\132",
+            "\1\134\3\uffff\1\133",
+            "\1\135",
             "",
             "",
             "",
@@ -3151,13 +3199,13 @@
             "",
             "",
             "",
-            "\1\134",
-            "\1\135",
+            "\1\136",
+            "\1\137",
             "",
             "",
-            "\1\136\4\uffff\1\137",
             "",
             "",
+            "\1\140\4\uffff\1\141",
             "",
             "",
             "",
@@ -3169,50 +3217,51 @@
             "",
             "",
             "",
-            "\1\140",
-            "\1\141",
+            "",
+            "",
+            "",
             "\1\142",
             "\1\143",
             "\1\144",
             "\1\145",
             "\1\146",
             "\1\147",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\10\53\1\150\21\53"+
-            "\105\uffff\100\53",
-            "\1\152",
-            "\1\153\5\uffff\1\154",
-            "\1\157\2\uffff\1\155\17\uffff\1\156",
-            "\1\160\3\uffff\1\161",
-            "\1\162",
-            "\1\163",
+            "\1\150",
+            "\1\151",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\10\54\1\152\21\54"+
+            "\105\uffff\100\54",
+            "\1\154",
+            "\1\156\3\uffff\1\155",
+            "\1\160\5\uffff\1\157",
+            "\1\162\2\uffff\1\163\17\uffff\1\161",
             "\1\164",
             "\1\165",
             "\1\166",
-            "\1\170\2\uffff\1\167",
+            "\1\167",
+            "\1\170",
             "\1\171",
-            "\1\172",
-            "\1\173\20\uffff\1\174",
-            "\1\175",
-            "\1\176",
+            "\1\173\2\uffff\1\172",
+            "\1\174",
+            "\1\176\20\uffff\1\175",
             "\1\177",
             "\1\u0080",
             "\1\u0081",
             "\1\u0082",
             "\1\u0083",
-            "\1\u0085\106\uffff\1\u0084",
-            "\1\u0086",
-            "\1\u0087\1\uffff\1\u0088",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\1\u008a",
-            "\1\u008b",
+            "\1\u0084",
+            "\1\u0086\106\uffff\1\u0085",
+            "\1\u0087",
+            "\1\u0088",
+            "\1\u008a\1\uffff\1\u0089",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u008c",
+            "\1\u008d",
+            "\1\u008e",
             "",
             "",
             "",
             "",
-            "\1\u008d",
-            "\1\u008e",
             "\1\u008f",
             "\1\u0090",
             "\1\u0091",
@@ -3220,18 +3269,18 @@
             "\1\u0093",
             "\1\u0094",
             "\1\u0095",
-            "",
             "\1\u0096",
             "\1\u0097",
+            "",
             "\1\u0098",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u0099",
             "\1\u009a",
             "\1\u009b",
             "\1\u009c",
             "\1\u009d",
             "\1\u009e",
-            "\1\u009f",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00a0",
             "\1\u00a1",
             "\1\u00a2",
@@ -3241,92 +3290,92 @@
             "\1\u00a6",
             "\1\u00a7",
             "\1\u00a8",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00a9",
             "\1\u00aa",
             "\1\u00ab",
-            "\1\u00ac",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00ad",
             "\1\u00ae",
             "\1\u00af",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00b0",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\1\u00b1",
             "\1\u00b2",
             "\1\u00b3",
-            "",
             "\1\u00b4",
             "\1\u00b5",
+            "",
             "\1\u00b6",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00b7",
             "\1\u00b8",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\1\u00bb",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u00ba",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00bc",
             "\1\u00bd",
-            "\1\u00be",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u00bf",
             "\1\u00c0",
-            "\1\u00c1",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00c2",
-            "",
             "\1\u00c3",
-            "\1\u00c4",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u00c5",
             "\1\u00c6",
             "\1\u00c7",
             "\1\u00c8",
+            "",
             "\1\u00c9",
             "\1\u00ca",
             "\1\u00cb",
             "\1\u00cc",
             "\1\u00cd",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\5\53\1\u00ce\24\53"+
-            "\105\uffff\100\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\5\54\1\u00ce\24\54"+
+            "\105\uffff\100\54",
             "\1\u00d0",
             "\1\u00d1",
-            "\1\u00d3\6\uffff\1\u00d2",
-            "",
-            "\1\u00d4",
+            "\1\u00d2",
+            "\1\u00d4\6\uffff\1\u00d3",
             "\1\u00d5",
             "\1\u00d6",
+            "",
             "\1\u00d7",
             "\1\u00d8",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00d9",
+            "\1\u00da",
             "",
-            "\1\u00da",
-            "\1\u00db",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00dc",
             "\1\u00dd",
             "\1\u00de",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "",
+            "\1\u00df",
             "\1\u00e0",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
+            "\1\u00e2",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\1\u00e1",
-            "\1\u00e2",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00e3",
             "",
             "\1\u00e4",
             "\1\u00e5",
+            "",
             "\1\u00e6",
-            "\1\u00e7",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "",
             "\1\u00e8",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00e9",
             "\1\u00ea",
             "\1\u00eb",
             "\1\u00ec",
@@ -3336,52 +3385,52 @@
             "\1\u00f0",
             "\1\u00f1",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00f2",
             "\1\u00f3",
-            "\1\u00f4",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u00f5",
             "\1\u00f6",
-            "",
             "\1\u00f7",
             "\1\u00f8",
+            "",
             "\1\u00f9",
+            "\1\u00fa",
+            "\1\u00fb",
             "",
             "",
-            "\1\u00fa",
-            "\1\u00fb",
             "\1\u00fc",
             "\1\u00fd",
+            "\1\u00fe",
+            "\1\u00ff",
             "",
-            "\1\u00fe",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "\1\u0100",
-            "\1\u0101",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u0102",
             "\1\u0103",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\1\u0105",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u0106",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "\1\u0107",
-            "\1\u0108",
-            "\1\u0109",
-            "\1\u010b\21\uffff\1\u010a",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u0109\21\uffff\1\u010a",
+            "\1\u010b",
             "\1\u010c",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u010d",
             "\1\u010e",
+            "\1\u010f",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\1\u010f",
-            "\1\u0110",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\1\u0112",
+            "\1\u0111",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u0113",
             "\1\u0114",
             "\1\u0115",
@@ -3390,85 +3439,87 @@
             "\1\u0118",
             "\1\u0119",
             "\1\u011a",
-            "",
             "\1\u011b",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u011c",
             "",
             "\1\u011d",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "",
             "\1\u011f",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "",
-            "\1\u0123",
+            "\1\u0121",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "\1\u0124",
-            "\1\u0125",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
             "\1\u0126",
             "",
             "\1\u0127",
+            "",
             "\1\u0128",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u0129",
             "\1\u012a",
             "\1\u012b",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u012d",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
             "",
+            "\1\u0133",
             "",
-            "\1\u0131",
-            "\1\u0132",
-            "\1\u0133",
             "\1\u0134",
             "\1\u0135",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u0136",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\1\u0138",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
             "",
             "",
             "",
             "",
             "",
-            "\1\u0139",
-            "\1\u013a",
             "\1\u013b",
             "\1\u013c",
+            "\1\u013d",
             "",
+            "\1\u013e",
             "",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\1\u013e",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u013f",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54\105\uffff\100"+
+            "\54",
             "",
             "",
             "",
@@ -3505,7 +3556,7 @@
             this.transition = DFA18_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | DECLARE | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | ENTRY_POINT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | TILDE | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC );";
+            return "1:1: Tokens : ( T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | DECLARE | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | ENTRY_POINT | OR | AND | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | IN | NULL | EXISTS | NOT | EVAL | FORALL | WHEN | THEN | END | ID | LEFT_PAREN | RIGHT_PAREN | LEFT_SQUARE | RIGHT_SQUARE | LEFT_CURLY | RIGHT_CURLY | COMMA | DOT | DOUBLE_AMPER | DOUBLE_PIPE | TILDE | AT | EQUALS | COLON | 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-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -1,149 +1,104 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-03-10 18:35:53
+// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2008-04-24 09:58:01
 
 	package org.drools.lang;
+	import java.util.List;
 	import java.util.ArrayList;
+	import java.util.Iterator;
+	import java.util.HashMap;	
+	import java.util.StringTokenizer;
+	import org.drools.lang.descr.*;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.CommonToken;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.FailedPredicateException;
-import org.antlr.runtime.IntStream;
-import org.antlr.runtime.MismatchedNotSetException;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.MismatchedTokenException;
-import org.antlr.runtime.MismatchedTreeNodeException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.Parser;
-import org.antlr.runtime.ParserRuleReturnScope;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
-import org.drools.lang.descr.AccessorDescr;
-import org.drools.lang.descr.AccumulateDescr;
-import org.drools.lang.descr.AndDescr;
-import org.drools.lang.descr.AttributeDescr;
-import org.drools.lang.descr.BaseDescr;
-import org.drools.lang.descr.CollectDescr;
-import org.drools.lang.descr.ConditionalElementDescr;
-import org.drools.lang.descr.DeclarativeInvokerDescr;
-import org.drools.lang.descr.DescrFactory;
-import org.drools.lang.descr.EntryPointDescr;
-import org.drools.lang.descr.EvalDescr;
-import org.drools.lang.descr.ExistsDescr;
-import org.drools.lang.descr.FactTemplateDescr;
-import org.drools.lang.descr.FieldAccessDescr;
-import org.drools.lang.descr.FieldBindingDescr;
-import org.drools.lang.descr.FieldConstraintDescr;
-import org.drools.lang.descr.FieldTemplateDescr;
-import org.drools.lang.descr.ForallDescr;
-import org.drools.lang.descr.FromDescr;
-import org.drools.lang.descr.FunctionCallDescr;
-import org.drools.lang.descr.FunctionDescr;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.LiteralRestrictionDescr;
-import org.drools.lang.descr.MethodAccessDescr;
-import org.drools.lang.descr.NotDescr;
-import org.drools.lang.descr.OrDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.lang.descr.PatternDescr;
-import org.drools.lang.descr.PatternSourceDescr;
-import org.drools.lang.descr.PredicateDescr;
-import org.drools.lang.descr.QualifiedIdentifierRestrictionDescr;
-import org.drools.lang.descr.QueryDescr;
-import org.drools.lang.descr.RestrictionConnectiveDescr;
-import org.drools.lang.descr.RestrictionDescr;
-import org.drools.lang.descr.ReturnValueRestrictionDescr;
-import org.drools.lang.descr.RuleDescr;
-import org.drools.lang.descr.TypeDeclarationDescr;
-import org.drools.lang.descr.VariableRestrictionDescr;
 public class DRLParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "ID", "DOT", "GLOBAL", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "DECLARE", "LEFT_CURLY", "RIGHT_CURLY", "STRING", "QUERY", "END", "TEMPLATE", "RULE", "WHEN", "ATTRIBUTES", "DATE_EFFECTIVE", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "DIALECT", "LOCK_ON_ACTIVE", "OR", "DOUBLE_PIPE", "AND", "DOUBLE_AMPER", "FROM", "EXISTS", "NOT", "EVAL", "FORALL", "ACCUMULATE", "INIT", "ACTION", "REVERSE", "RESULT", "COLLECT", "ENTRY_POINT", "CONTAINS", "EXCLUDES", "MATCHES", "SOUNDSLIKE", "MEMBEROF", "TILDE", "IN", "FLOAT", "NULL", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "EVENT", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.*'", "':'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!!
 ='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "ID", "DOT", "GLOBAL", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "DECLARE", "END", "AT", "COLON", "EQUALS", "QUERY", "TEMPLATE", "RULE", "WHEN", "ATTRIBUTES", "DATE_EFFECTIVE", "STRING", "DATE_EXPIRES", "ENABLED", "BOOL", "SALIENCE", "INT", "NO_LOOP", "AUTO_FOCUS", "ACTIVATION_GROUP", "RULEFLOW_GROUP", "AGENDA_GROUP", "DURATION", "DIALECT", "LOCK_ON_ACTIVE", "OR", "DOUBLE_PIPE", "AND", "DOUBLE_AMPER", "FROM", "EXISTS", "NOT", "EVAL", "FORALL", "ACCUMULATE", "INIT", "ACTION", "REVERSE", "RESULT", "COLLECT", "ENTRY_POINT", "LEFT_SQUARE", "RIGHT_SQUARE", "CONTAINS", "EXCLUDES", "MATCHES", "SOUNDSLIKE", "MEMBEROF", "TILDE", "IN", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "THEN", "EVENT", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.*'", "'->'", "'=='", "'>'", "'>='", !
 "'<'", "'<='", "'!='"
     };
-    public static final int ACCUMULATE=46;
+    public static final int COMMA=11;
+    public static final int EXISTS=43;
+    public static final int AUTO_FOCUS=31;
+    public static final int END=14;
+    public static final int HexDigit=72;
+    public static final int FORALL=46;
+    public static final int TEMPLATE=19;
+    public static final int MISC=78;
+    public static final int FLOAT=63;
+    public static final int QUERY=18;
+    public static final int THEN=67;
+    public static final int RULE=20;
+    public static final int INIT=48;
+    public static final int TILDE=61;
+    public static final int IMPORT=5;
     public static final int PACKAGE=4;
+    public static final int DATE_EFFECTIVE=23;
+    public static final int OR=38;
+    public static final int DOT=8;
+    public static final int DOUBLE_PIPE=39;
+    public static final int AND=40;
     public static final int FUNCTION=6;
-    public static final int RIGHT_SQUARE=63;
-    public static final int ACTIVATION_GROUP=31;
-    public static final int RIGHT_CURLY=15;
+    public static final int GLOBAL=9;
+    public static final int EscapeSequence=71;
+    public static final int DIALECT=36;
+    public static final int INT=29;
+    public static final int LOCK_ON_ACTIVE=37;
+    public static final int DATE_EXPIRES=25;
+    public static final int LEFT_SQUARE=54;
+    public static final int CONTAINS=56;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=75;
     public static final int ATTRIBUTES=22;
-    public static final int DIALECT=35;
-    public static final int CONTAINS=53;
-    public static final int NO_LOOP=29;
-    public static final int MEMBEROF=57;
-    public static final int LOCK_ON_ACTIVE=36;
-    public static final int AGENDA_GROUP=33;
-    public static final int FLOAT=60;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=72;
-    public static final int NOT=43;
+    public static final int EVENT=68;
+    public static final int DECLARE=13;
+    public static final int LEFT_CURLY=65;
+    public static final int RESULT=51;
+    public static final int AT=15;
     public static final int ID=7;
-    public static final int AND=39;
+    public static final int FROM=42;
+    public static final int LEFT_PAREN=10;
+    public static final int ACTIVATION_GROUP=32;
+    public static final int DOUBLE_AMPER=41;
+    public static final int RIGHT_CURLY=66;
+    public static final int SOUNDSLIKE=59;
+    public static final int EXCLUDES=57;
+    public static final int BOOL=27;
+    public static final int MEMBEROF=60;
+    public static final int WHEN=21;
+    public static final int RULEFLOW_GROUP=33;
+    public static final int WS=70;
+    public static final int STRING=24;
+    public static final int ACTION=49;
+    public static final int COLLECT=52;
+    public static final int IN=62;
+    public static final int REVERSE=50;
+    public static final int ACCUMULATE=47;
+    public static final int EQUALS=17;
+    public static final int NO_LOOP=30;
+    public static final int UnicodeEscape=73;
+    public static final int DURATION=35;
+    public static final int EVAL=45;
+    public static final int MATCHES=58;
     public static final int EOF=-1;
-    public static final int HexDigit=69;
-    public static final int DATE_EFFECTIVE=23;
-    public static final int ACTION=48;
-    public static final int DOUBLE_PIPE=38;
+    public static final int EOL=69;
+    public static final int NULL=64;
+    public static final int AGENDA_GROUP=34;
+    public static final int COLON=16;
+    public static final int OctalEscape=74;
+    public static final int SALIENCE=28;
+    public static final int MULTI_LINE_COMMENT=77;
+    public static final int NOT=44;
     public static final int RIGHT_PAREN=12;
-    public static final int IMPORT=5;
-    public static final int EOL=66;
-    public static final int DOUBLE_AMPER=40;
-    public static final int THEN=64;
-    public static final int IN=59;
-    public static final int MATCHES=55;
-    public static final int COMMA=11;
-    public static final int TILDE=58;
-    public static final int ENABLED=25;
-    public static final int EXISTS=42;
-    public static final int DOT=8;
-    public static final int RULE=20;
-    public static final int EXCLUDES=54;
-    public static final int AUTO_FOCUS=30;
-    public static final int NULL=61;
-    public static final int SOUNDSLIKE=56;
-    public static final int BOOL=26;
-    public static final int FORALL=45;
-    public static final int SALIENCE=27;
-    public static final int RULEFLOW_GROUP=32;
-    public static final int RESULT=50;
-    public static final int INT=28;
-    public static final int EVENT=65;
-    public static final int MULTI_LINE_COMMENT=74;
-    public static final int DURATION=34;
-    public static final int WS=67;
-    public static final int EVAL=44;
-    public static final int TEMPLATE=19;
-    public static final int WHEN=21;
-    public static final int UnicodeEscape=70;
-    public static final int ENTRY_POINT=52;
-    public static final int LEFT_CURLY=14;
-    public static final int OR=37;
-    public static final int LEFT_PAREN=10;
-    public static final int QUERY=17;
-    public static final int DECLARE=13;
-    public static final int MISC=75;
-    public static final int REVERSE=49;
-    public static final int END=18;
-    public static final int GLOBAL=9;
-    public static final int FROM=41;
-    public static final int COLLECT=51;
-    public static final int LEFT_SQUARE=62;
-    public static final int INIT=47;
-    public static final int OctalEscape=71;
-    public static final int EscapeSequence=68;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=73;
-    public static final int STRING=16;
-    public static final int DATE_EXPIRES=24;
+    public static final int ENABLED=26;
+    public static final int RIGHT_SQUARE=55;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=76;
+    public static final int ENTRY_POINT=53;
 
         public DRLParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[86+1];
+            ruleMemo = new HashMap[90+1];
          }
         
 
@@ -340,14 +295,14 @@
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==76) ) {
+            if ( (LA1_0==79) ) {
                 alt1=1;
             }
             switch (alt1) {
                 case 1 :
                     // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ';'
                     {
-                    match(input,76,FOLLOW_76_in_opt_semicolon39); if (failed) return ;
+                    match(input,79,FOLLOW_79_in_opt_semicolon39); if (failed) return ;
 
                     }
                     break;
@@ -390,7 +345,7 @@
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( ((LA2_0>=IMPORT && LA2_0<=FUNCTION)||LA2_0==GLOBAL||LA2_0==DECLARE||LA2_0==QUERY||(LA2_0>=TEMPLATE && LA2_0<=RULE)||(LA2_0>=DATE_EFFECTIVE && LA2_0<=ENABLED)||LA2_0==SALIENCE||(LA2_0>=NO_LOOP && LA2_0<=LOCK_ON_ACTIVE)) ) {
+                if ( ((LA2_0>=IMPORT && LA2_0<=FUNCTION)||LA2_0==GLOBAL||LA2_0==DECLARE||(LA2_0>=QUERY && LA2_0<=RULE)||LA2_0==DATE_EFFECTIVE||(LA2_0>=DATE_EXPIRES && LA2_0<=ENABLED)||LA2_0==SALIENCE||(LA2_0>=NO_LOOP && LA2_0<=LOCK_ON_ACTIVE)) ) {
                     alt2=1;
                 }
 
@@ -902,7 +857,7 @@
             int alt6=2;
             int LA6_0 = input.LA(1);
 
-            if ( (LA6_0==77) ) {
+            if ( (LA6_0==80) ) {
                 alt6=1;
             }
             switch (alt6) {
@@ -910,7 +865,7 @@
                     // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:296:5: star= '.*'
                     {
                     star=(Token)input.LT(1);
-                    match(input,77,FOLLOW_77_in_import_name402); if (failed) return name;
+                    match(input,80,FOLLOW_80_in_import_name402); if (failed) return name;
                     if ( backtracking==0 ) {
                        
                       		        name = name + star.getText(); 
@@ -1031,10 +986,10 @@
             int alt7=2;
             int LA7_0 = input.LA(1);
 
-            if ( ((LA7_0>=PACKAGE && LA7_0<=ID)||LA7_0==GLOBAL||(LA7_0>=QUERY && LA7_0<=ATTRIBUTES)||LA7_0==ENABLED||LA7_0==SALIENCE||(LA7_0>=DURATION && LA7_0<=DIALECT)||LA7_0==FROM||(LA7_0>=INIT && LA7_0<=RESULT)||LA7_0==IN||(LA7_0>=THEN && LA7_0<=EVENT)) ) {
+            if ( ((LA7_0>=PACKAGE && LA7_0<=ID)||LA7_0==GLOBAL||LA7_0==END||(LA7_0>=QUERY && LA7_0<=ATTRIBUTES)||LA7_0==ENABLED||LA7_0==SALIENCE||(LA7_0>=DURATION && LA7_0<=DIALECT)||LA7_0==FROM||(LA7_0>=INIT && LA7_0<=RESULT)||LA7_0==IN||(LA7_0>=THEN && LA7_0<=EVENT)) ) {
                 int LA7_1 = input.LA(2);
 
-                if ( ((LA7_1>=PACKAGE && LA7_1<=GLOBAL)||(LA7_1>=QUERY && LA7_1<=ATTRIBUTES)||LA7_1==ENABLED||LA7_1==SALIENCE||(LA7_1>=DURATION && LA7_1<=DIALECT)||LA7_1==FROM||(LA7_1>=INIT && LA7_1<=RESULT)||LA7_1==IN||LA7_1==LEFT_SQUARE||(LA7_1>=THEN && LA7_1<=EVENT)) ) {
+                if ( ((LA7_1>=PACKAGE && LA7_1<=GLOBAL)||LA7_1==END||(LA7_1>=QUERY && LA7_1<=ATTRIBUTES)||LA7_1==ENABLED||LA7_1==SALIENCE||(LA7_1>=DURATION && LA7_1<=DIALECT)||LA7_1==FROM||(LA7_1>=INIT && LA7_1<=RESULT)||LA7_1==LEFT_SQUARE||LA7_1==IN||(LA7_1>=THEN && LA7_1<=EVENT)) ) {
                     alt7=1;
                 }
             }
@@ -1071,7 +1026,7 @@
             int alt11=2;
             int LA11_0 = input.LA(1);
 
-            if ( ((LA11_0>=PACKAGE && LA11_0<=ID)||LA11_0==GLOBAL||(LA11_0>=QUERY && LA11_0<=ATTRIBUTES)||LA11_0==ENABLED||LA11_0==SALIENCE||(LA11_0>=DURATION && LA11_0<=DIALECT)||LA11_0==FROM||(LA11_0>=INIT && LA11_0<=RESULT)||LA11_0==IN||(LA11_0>=THEN && LA11_0<=EVENT)) ) {
+            if ( ((LA11_0>=PACKAGE && LA11_0<=ID)||LA11_0==GLOBAL||LA11_0==END||(LA11_0>=QUERY && LA11_0<=ATTRIBUTES)||LA11_0==ENABLED||LA11_0==SALIENCE||(LA11_0>=DURATION && LA11_0<=DIALECT)||LA11_0==FROM||(LA11_0>=INIT && LA11_0<=RESULT)||LA11_0==IN||(LA11_0>=THEN && LA11_0<=EVENT)) ) {
                 alt11=1;
             }
             switch (alt11) {
@@ -1258,7 +1213,7 @@
 
 
     // $ANTLR start type_declaration
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:374:1: type_declaration returns [TypeDeclarationDescr declaration] : DECLARE id= identifier LEFT_CURLY type_decl_attribute[$declaration] ( COMMA type_decl_attribute[$declaration] )* RIGHT_CURLY ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:374:1: type_declaration returns [TypeDeclarationDescr declaration] : DECLARE id= identifier ( decl_metadata[$declaration] )* ( decl_field[$declaration] )* END ;
     public final TypeDeclarationDescr type_declaration() throws RecognitionException {
         TypeDeclarationDescr declaration = null;
 
@@ -1269,8 +1224,8 @@
                         declaration = factory.createTypeDeclaration();
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:378:9: ( DECLARE id= identifier LEFT_CURLY type_decl_attribute[$declaration] ( COMMA type_decl_attribute[$declaration] )* RIGHT_CURLY )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:378:11: DECLARE id= identifier LEFT_CURLY type_decl_attribute[$declaration] ( COMMA type_decl_attribute[$declaration] )* RIGHT_CURLY
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:378:9: ( DECLARE id= identifier ( decl_metadata[$declaration] )* ( decl_field[$declaration] )* END )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:378:11: DECLARE id= identifier ( decl_metadata[$declaration] )* ( decl_field[$declaration] )* END
             {
             match(input,DECLARE,FOLLOW_DECLARE_in_type_declaration645); if (failed) return declaration;
             pushFollow(FOLLOW_identifier_in_type_declaration649);
@@ -1282,29 +1237,23 @@
                                           declaration.setTypeName( input.toString(id.start,id.stop) );
                                       
             }
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_type_declaration694); if (failed) return declaration;
-            pushFollow(FOLLOW_type_decl_attribute_in_type_declaration720);
-            type_decl_attribute(declaration);
-            _fsp--;
-            if (failed) return declaration;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:59: ( COMMA type_decl_attribute[$declaration] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:382:25: ( decl_metadata[$declaration] )*
             loop13:
             do {
                 int alt13=2;
                 int LA13_0 = input.LA(1);
 
-                if ( (LA13_0==COMMA) ) {
+                if ( (LA13_0==AT) ) {
                     alt13=1;
                 }
 
 
                 switch (alt13) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:61: COMMA type_decl_attribute[$declaration]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:382:25: decl_metadata[$declaration]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_type_declaration725); if (failed) return declaration;
-            	    pushFollow(FOLLOW_type_decl_attribute_in_type_declaration727);
-            	    type_decl_attribute(declaration);
+            	    pushFollow(FOLLOW_decl_metadata_in_type_declaration702);
+            	    decl_metadata(declaration);
             	    _fsp--;
             	    if (failed) return declaration;
 
@@ -1316,8 +1265,45 @@
                 }
             } while (true);
 
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_type_declaration749); if (failed) return declaration;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:25: ( decl_field[$declaration] )*
+            loop14:
+            do {
+                int alt14=2;
+                int LA14_0 = input.LA(1);
 
+                if ( (LA14_0==END) ) {
+                    int LA14_1 = input.LA(2);
+
+                    if ( ((LA14_1>=COLON && LA14_1<=EQUALS)) ) {
+                        alt14=1;
+                    }
+
+
+                }
+                else if ( ((LA14_0>=PACKAGE && LA14_0<=ID)||LA14_0==GLOBAL||(LA14_0>=QUERY && LA14_0<=ATTRIBUTES)||LA14_0==ENABLED||LA14_0==SALIENCE||(LA14_0>=DURATION && LA14_0<=DIALECT)||LA14_0==FROM||(LA14_0>=INIT && LA14_0<=RESULT)||LA14_0==IN||(LA14_0>=THEN && LA14_0<=EVENT)) ) {
+                    alt14=1;
+                }
+
+
+                switch (alt14) {
+            	case 1 :
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:25: decl_field[$declaration]
+            	    {
+            	    pushFollow(FOLLOW_decl_field_in_type_declaration730);
+            	    decl_field(declaration);
+            	    _fsp--;
+            	    if (failed) return declaration;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop14;
+                }
+            } while (true);
+
+            match(input,END,FOLLOW_END_in_type_declaration750); if (failed) return declaration;
+
             }
 
         }
@@ -1332,75 +1318,137 @@
     // $ANTLR end type_declaration
 
 
-    // $ANTLR start type_decl_attribute
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:1: type_decl_attribute[TypeDeclarationDescr declaration] : att= identifier (val= STRING | cl= dotted_name ) ;
-    public final void type_decl_attribute(TypeDeclarationDescr declaration) throws RecognitionException {
-        Token val=null;
+    // $ANTLR start decl_metadata
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:1: decl_metadata[BaseDescr declaration] : AT att= identifier val= paren_chunk ;
+    public final void decl_metadata(BaseDescr declaration) throws RecognitionException {
         identifier_return att = null;
 
-        String cl = null;
+        paren_chunk_return val = null;
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:9: (att= identifier (val= STRING | cl= dotted_name ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:11: att= identifier (val= STRING | cl= dotted_name )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:9: ( AT att= identifier val= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:388:11: AT att= identifier val= paren_chunk
             {
-            pushFollow(FOLLOW_identifier_in_type_decl_attribute785);
+            match(input,AT,FOLLOW_AT_in_decl_metadata784); if (failed) return ;
+            pushFollow(FOLLOW_identifier_in_decl_metadata788);
             att=identifier();
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:389:17: (val= STRING | cl= dotted_name )
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            pushFollow(FOLLOW_paren_chunk_in_decl_metadata792);
+            val=paren_chunk();
+            _fsp--;
+            if (failed) return ;
+            if ( backtracking==0 ) {
 
-            if ( (LA14_0==STRING) ) {
-                alt14=1;
+                                  if( declaration instanceof TypeDeclarationDescr )
+                                      ((TypeDeclarationDescr)declaration).addMetaAttribute( input.toString(att.start,att.stop), getString( input.toString(val.start,val.stop) ).trim() );
+                                  else
+                                      ((TypeFieldDescr)declaration).addMetaAttribute( input.toString(att.start,att.stop), getString( input.toString(val.start,val.stop) ).trim() );
+                              
             }
-            else if ( ((LA14_0>=PACKAGE && LA14_0<=ID)||LA14_0==GLOBAL||(LA14_0>=QUERY && LA14_0<=ATTRIBUTES)||LA14_0==ENABLED||LA14_0==SALIENCE||(LA14_0>=DURATION && LA14_0<=DIALECT)||LA14_0==FROM||(LA14_0>=INIT && LA14_0<=RESULT)||LA14_0==IN||(LA14_0>=THEN && LA14_0<=EVENT)) ) {
-                alt14=2;
+
             }
-            else {
-                if (backtracking>0) {failed=true; return ;}
-                NoViableAltException nvae =
-                    new NoViableAltException("389:17: (val= STRING | cl= dotted_name )", 14, 0, input);
 
-                throw nvae;
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end decl_metadata
+
+
+    // $ANTLR start decl_field
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:397:1: decl_field[TypeDeclarationDescr declaration] : id= identifier (init= initialization )? COLON type= fact[null] ( decl_metadata[field] )* ;
+    public final void decl_field(TypeDeclarationDescr declaration) throws RecognitionException {
+        identifier_return id = null;
+
+        String init = null;
+
+        BaseDescr type = null;
+
+
+
+                TypeFieldDescr field = null;
+
+        try {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401:2: (id= identifier (init= initialization )? COLON type= fact[null] ( decl_metadata[field] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401:9: id= identifier (init= initialization )? COLON type= fact[null] ( decl_metadata[field] )*
+            {
+            pushFollow(FOLLOW_identifier_in_decl_field853);
+            id=identifier();
+            _fsp--;
+            if (failed) return ;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401:27: (init= initialization )?
+            int alt15=2;
+            int LA15_0 = input.LA(1);
+
+            if ( (LA15_0==EQUALS) ) {
+                alt15=1;
             }
-            switch (alt14) {
+            switch (alt15) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:389:19: val= STRING
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401:27: init= initialization
                     {
-                    val=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_type_decl_attribute808); if (failed) return ;
-                    if ( backtracking==0 ) {
-
-                                          declaration.addAttribute( input.toString(att.start,att.stop), getString( val.getText() ) );
-                                      
-                    }
-
-                    }
-                    break;
-                case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:393:19: cl= dotted_name
-                    {
-                    pushFollow(FOLLOW_dotted_name_in_type_decl_attribute849);
-                    cl=dotted_name();
+                    pushFollow(FOLLOW_initialization_in_decl_field857);
+                    init=initialization();
                     _fsp--;
                     if (failed) return ;
-                    if ( backtracking==0 ) {
 
-                                          declaration.addAttribute( input.toString(att.start,att.stop), cl );
-                                      
                     }
-
-                    }
                     break;
 
             }
 
+            match(input,COLON,FOLLOW_COLON_in_decl_field860); if (failed) return ;
+            pushFollow(FOLLOW_fact_in_decl_field864);
+            type=fact(null);
+            _fsp--;
+            if (failed) return ;
+            if ( backtracking==0 ) {
 
+              		    field = new TypeFieldDescr( input.toString(id.start,id.stop) );
+              		    if( init != null )
+              		        field.setInitExpr( init );
+              		    field.setPattern( (PatternDescr) type );
+              		    declaration.addField( field );
+              		
             }
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:3: ( decl_metadata[field] )*
+            loop16:
+            do {
+                int alt16=2;
+                int LA16_0 = input.LA(1);
 
+                if ( (LA16_0==AT) ) {
+                    alt16=1;
+                }
+
+
+                switch (alt16) {
+            	case 1 :
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:3: decl_metadata[field]
+            	    {
+            	    pushFollow(FOLLOW_decl_metadata_in_decl_field874);
+            	    decl_metadata(field);
+            	    _fsp--;
+            	    if (failed) return ;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop16;
+                }
+            } while (true);
+
+
+            }
+
         }
         catch (RecognitionException re) {
             reportError(re);
@@ -1410,11 +1458,48 @@
         }
         return ;
     }
-    // $ANTLR end type_decl_attribute
+    // $ANTLR end decl_field
 
 
+    // $ANTLR start initialization
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:1: initialization returns [String expr] : EQUALS val= paren_chunk ;
+    public final String initialization() throws RecognitionException {
+        String expr = null;
+
+        paren_chunk_return val = null;
+
+
+        try {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:2: ( EQUALS val= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:9: EQUALS val= paren_chunk
+            {
+            match(input,EQUALS,FOLLOW_EQUALS_in_initialization901); if (failed) return expr;
+            pushFollow(FOLLOW_paren_chunk_in_initialization905);
+            val=paren_chunk();
+            _fsp--;
+            if (failed) return expr;
+            if ( backtracking==0 ) {
+
+              	           expr = getString( input.toString(val.start,val.stop) ).trim();
+              	       
+            }
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return expr;
+    }
+    // $ANTLR end initialization
+
+
     // $ANTLR start query
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:400:1: query returns [QueryDescr query] : QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:1: query returns [QueryDescr query] : QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon ;
     public final QueryDescr query() throws RecognitionException {
         QueryDescr query = null;
 
@@ -1434,12 +1519,12 @@
          
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:408:2: ( QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:3: QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:427:2: ( QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:428:3: QUERY queryName= name ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )? normal_lhs_block[lhs] END opt_semicolon
             {
             QUERY7=(Token)input.LT(1);
-            match(input,QUERY,FOLLOW_QUERY_in_query922); if (failed) return query;
-            pushFollow(FOLLOW_name_in_query926);
+            match(input,QUERY,FOLLOW_QUERY_in_query939); if (failed) return query;
+            pushFollow(FOLLOW_name_in_query943);
             queryName=name();
             _fsp--;
             if (failed) return query;
@@ -1453,47 +1538,47 @@
                                       location.setType( Location.LOCATION_RULE_HEADER );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:418:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?
-            int alt19=2;
-            alt19 = dfa19.predict(input);
-            switch (alt19) {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:437:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?
+            int alt21=2;
+            alt21 = dfa21.predict(input);
+            switch (alt21) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:418:5: LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:437:5: LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_query936); if (failed) return query;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:11: ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )?
-                    int alt18=2;
-                    int LA18_0 = input.LA(1);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_query953); if (failed) return query;
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:438:11: ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )?
+                    int alt20=2;
+                    int LA20_0 = input.LA(1);
 
-                    if ( (LA18_0==ID) ) {
-                        alt18=1;
+                    if ( (LA20_0==ID) ) {
+                        alt20=1;
                     }
-                    switch (alt18) {
+                    switch (alt20) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:419:13: ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )*
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:438:13: ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )*
                             {
                             if ( backtracking==0 ) {
                                params = new ArrayList(); types = new ArrayList();
                             }
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:421:15: ( (paramType= qualified_id )? paramName= ID )
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:421:16: (paramType= qualified_id )? paramName= ID
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:15: ( (paramType= qualified_id )? paramName= ID )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:16: (paramType= qualified_id )? paramName= ID
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:421:25: (paramType= qualified_id )?
-                            int alt15=2;
-                            int LA15_0 = input.LA(1);
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:25: (paramType= qualified_id )?
+                            int alt17=2;
+                            int LA17_0 = input.LA(1);
 
-                            if ( (LA15_0==ID) ) {
-                                int LA15_1 = input.LA(2);
+                            if ( (LA17_0==ID) ) {
+                                int LA17_1 = input.LA(2);
 
-                                if ( ((LA15_1>=ID && LA15_1<=DOT)||LA15_1==LEFT_SQUARE) ) {
-                                    alt15=1;
+                                if ( ((LA17_1>=ID && LA17_1<=DOT)||LA17_1==LEFT_SQUARE) ) {
+                                    alt17=1;
                                 }
                             }
-                            switch (alt15) {
+                            switch (alt17) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:421:25: paramType= qualified_id
+                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:25: paramType= qualified_id
                                     {
-                                    pushFollow(FOLLOW_qualified_id_in_query971);
+                                    pushFollow(FOLLOW_qualified_id_in_query988);
                                     paramType=qualified_id();
                                     _fsp--;
                                     if (failed) return query;
@@ -1504,45 +1589,45 @@
                             }
 
                             paramName=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_query976); if (failed) return query;
+                            match(input,ID,FOLLOW_ID_in_query993); if (failed) return query;
                             if ( backtracking==0 ) {
                                params.add( paramName.getText() ); String type = (paramType != null) ? paramType.text : "Object"; types.add( type ); 
                             }
 
                             }
 
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:15: ( COMMA (paramType= qualified_id )? paramName= ID )*
-                            loop17:
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:441:15: ( COMMA (paramType= qualified_id )? paramName= ID )*
+                            loop19:
                             do {
-                                int alt17=2;
-                                int LA17_0 = input.LA(1);
+                                int alt19=2;
+                                int LA19_0 = input.LA(1);
 
-                                if ( (LA17_0==COMMA) ) {
-                                    alt17=1;
+                                if ( (LA19_0==COMMA) ) {
+                                    alt19=1;
                                 }
 
 
-                                switch (alt17) {
+                                switch (alt19) {
                             	case 1 :
-                            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:16: COMMA (paramType= qualified_id )? paramName= ID
+                            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:441:16: COMMA (paramType= qualified_id )? paramName= ID
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_query997); if (failed) return query;
-                            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:31: (paramType= qualified_id )?
-                            	    int alt16=2;
-                            	    int LA16_0 = input.LA(1);
+                            	    match(input,COMMA,FOLLOW_COMMA_in_query1014); if (failed) return query;
+                            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:441:31: (paramType= qualified_id )?
+                            	    int alt18=2;
+                            	    int LA18_0 = input.LA(1);
 
-                            	    if ( (LA16_0==ID) ) {
-                            	        int LA16_1 = input.LA(2);
+                            	    if ( (LA18_0==ID) ) {
+                            	        int LA18_1 = input.LA(2);
 
-                            	        if ( ((LA16_1>=ID && LA16_1<=DOT)||LA16_1==LEFT_SQUARE) ) {
-                            	            alt16=1;
+                            	        if ( ((LA18_1>=ID && LA18_1<=DOT)||LA18_1==LEFT_SQUARE) ) {
+                            	            alt18=1;
                             	        }
                             	    }
-                            	    switch (alt16) {
+                            	    switch (alt18) {
                             	        case 1 :
-                            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:422:31: paramType= qualified_id
+                            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:441:31: paramType= qualified_id
                             	            {
-                            	            pushFollow(FOLLOW_qualified_id_in_query1001);
+                            	            pushFollow(FOLLOW_qualified_id_in_query1018);
                             	            paramType=qualified_id();
                             	            _fsp--;
                             	            if (failed) return query;
@@ -1553,7 +1638,7 @@
                             	    }
 
                             	    paramName=(Token)input.LT(1);
-                            	    match(input,ID,FOLLOW_ID_in_query1006); if (failed) return query;
+                            	    match(input,ID,FOLLOW_ID_in_query1023); if (failed) return query;
                             	    if ( backtracking==0 ) {
                             	       params.add( paramName.getText() );  String type = (paramType != null) ? paramType.text : "Object"; types.add( type );  
                             	    }
@@ -1562,7 +1647,7 @@
                             	    break;
 
                             	default :
-                            	    break loop17;
+                            	    break loop19;
                                 }
                             } while (true);
 
@@ -1577,7 +1662,7 @@
 
                     }
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_query1056); if (failed) return query;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_query1073); if (failed) return query;
 
                     }
                     break;
@@ -1589,13 +1674,13 @@
                                       location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
               	        
             }
-            pushFollow(FOLLOW_normal_lhs_block_in_query1085);
+            pushFollow(FOLLOW_normal_lhs_block_in_query1102);
             normal_lhs_block(lhs);
             _fsp--;
             if (failed) return query;
             END8=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_query1090); if (failed) return query;
-            pushFollow(FOLLOW_opt_semicolon_in_query1092);
+            match(input,END,FOLLOW_END_in_query1107); if (failed) return query;
+            pushFollow(FOLLOW_opt_semicolon_in_query1109);
             opt_semicolon();
             _fsp--;
             if (failed) return query;
@@ -1620,7 +1705,7 @@
 
 
     // $ANTLR start template
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:440:1: template returns [FactTemplateDescr template] : TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:459:1: template returns [FactTemplateDescr template] : TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon ;
     public final FactTemplateDescr template() throws RecognitionException {
         FactTemplateDescr template = null;
 
@@ -1635,16 +1720,16 @@
         		template = null;		
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:444:2: ( TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:445:3: TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:463:2: ( TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:464:3: TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon
             {
             TEMPLATE9=(Token)input.LT(1);
-            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template1120); if (failed) return template;
-            pushFollow(FOLLOW_name_in_template1124);
+            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template1137); if (failed) return template;
+            pushFollow(FOLLOW_name_in_template1141);
             templateName=name();
             _fsp--;
             if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template1126);
+            pushFollow(FOLLOW_opt_semicolon_in_template1143);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
@@ -1655,23 +1740,23 @@
               			template.setStartCharacter( ((CommonToken)TEMPLATE9).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:451:3: (slot= template_slot )+
-            int cnt20=0;
-            loop20:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:470:3: (slot= template_slot )+
+            int cnt22=0;
+            loop22:
             do {
-                int alt20=2;
-                int LA20_0 = input.LA(1);
+                int alt22=2;
+                int LA22_0 = input.LA(1);
 
-                if ( (LA20_0==ID) ) {
-                    alt20=1;
+                if ( (LA22_0==ID) ) {
+                    alt22=1;
                 }
 
 
-                switch (alt20) {
+                switch (alt22) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:452:4: slot= template_slot
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:471:4: slot= template_slot
             	    {
-            	    pushFollow(FOLLOW_template_slot_in_template1141);
+            	    pushFollow(FOLLOW_template_slot_in_template1158);
             	    slot=template_slot();
             	    _fsp--;
             	    if (failed) return template;
@@ -1685,18 +1770,18 @@
             	    break;
 
             	default :
-            	    if ( cnt20 >= 1 ) break loop20;
+            	    if ( cnt22 >= 1 ) break loop22;
             	    if (backtracking>0) {failed=true; return template;}
                         EarlyExitException eee =
-                            new EarlyExitException(20, input);
+                            new EarlyExitException(22, input);
                         throw eee;
                 }
-                cnt20++;
+                cnt22++;
             } while (true);
 
             END10=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template1156); if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template1158);
+            match(input,END,FOLLOW_END_in_template1173); if (failed) return template;
+            pushFollow(FOLLOW_opt_semicolon_in_template1175);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
@@ -1721,7 +1806,7 @@
 
 
     // $ANTLR start template_slot
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:463:1: template_slot returns [FieldTemplateDescr field] : fieldType= qualified_id id= identifier opt_semicolon ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:482:1: template_slot returns [FieldTemplateDescr field] : fieldType= qualified_id id= identifier opt_semicolon ;
     public final FieldTemplateDescr template_slot() throws RecognitionException {
         FieldTemplateDescr field = null;
 
@@ -1734,15 +1819,15 @@
         		field = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:467:2: (fieldType= qualified_id id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:468:11: fieldType= qualified_id id= identifier opt_semicolon
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:486:2: (fieldType= qualified_id id= identifier opt_semicolon )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:487:11: fieldType= qualified_id id= identifier opt_semicolon
             {
             if ( backtracking==0 ) {
 
               			field = factory.createFieldTemplate();
               	         
             }
-            pushFollow(FOLLOW_qualified_id_in_template_slot1204);
+            pushFollow(FOLLOW_qualified_id_in_template_slot1221);
             fieldType=qualified_id();
             _fsp--;
             if (failed) return field;
@@ -1753,11 +1838,11 @@
               			field.setEndCharacter( ((CommonToken)((Token)fieldType.stop)).getStopIndex() );
               		 
             }
-            pushFollow(FOLLOW_identifier_in_template_slot1220);
+            pushFollow(FOLLOW_identifier_in_template_slot1237);
             id=identifier();
             _fsp--;
             if (failed) return field;
-            pushFollow(FOLLOW_opt_semicolon_in_template_slot1222);
+            pushFollow(FOLLOW_opt_semicolon_in_template_slot1239);
             opt_semicolon();
             _fsp--;
             if (failed) return field;
@@ -1784,7 +1869,7 @@
 
 
     // $ANTLR start rule
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:486:1: rule returns [RuleDescr rule] : RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:505:1: rule returns [RuleDescr rule] : RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( COLON )? normal_lhs_block[lhs] )? rhs_chunk[$rule] ;
     public final RuleDescr rule() throws RecognitionException {
         RuleDescr rule = null;
 
@@ -1798,12 +1883,12 @@
         		AndDescr lhs = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:2: ( RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:492:3: RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule]
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:510:2: ( RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( COLON )? normal_lhs_block[lhs] )? rhs_chunk[$rule] )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:3: RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( COLON )? normal_lhs_block[lhs] )? rhs_chunk[$rule]
             {
             RULE11=(Token)input.LT(1);
-            match(input,RULE,FOLLOW_RULE_in_rule1253); if (failed) return rule;
-            pushFollow(FOLLOW_name_in_rule1257);
+            match(input,RULE,FOLLOW_RULE_in_rule1270); if (failed) return rule;
+            pushFollow(FOLLOW_name_in_rule1274);
             ruleName=name();
             _fsp--;
             if (failed) return rule;
@@ -1818,18 +1903,18 @@
               			rule.setLhs( lhs ); 
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:502:3: ( rule_attributes[$rule] )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:3: ( rule_attributes[$rule] )?
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( ((LA21_0>=ATTRIBUTES && LA21_0<=ENABLED)||LA21_0==SALIENCE||(LA21_0>=NO_LOOP && LA21_0<=LOCK_ON_ACTIVE)) ) {
-                alt21=1;
+            if ( ((LA23_0>=ATTRIBUTES && LA23_0<=DATE_EFFECTIVE)||(LA23_0>=DATE_EXPIRES && LA23_0<=ENABLED)||LA23_0==SALIENCE||(LA23_0>=NO_LOOP && LA23_0<=LOCK_ON_ACTIVE)) ) {
+                alt23=1;
             }
-            switch (alt21) {
+            switch (alt23) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:502:3: rule_attributes[$rule]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:3: rule_attributes[$rule]
                     {
-                    pushFollow(FOLLOW_rule_attributes_in_rule1266);
+                    pushFollow(FOLLOW_rule_attributes_in_rule1283);
                     rule_attributes(rule);
                     _fsp--;
                     if (failed) return rule;
@@ -1839,31 +1924,31 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:503:3: ( WHEN ( ':' )? normal_lhs_block[lhs] )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:522:3: ( WHEN ( COLON )? normal_lhs_block[lhs] )?
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA23_0==WHEN) ) {
-                alt23=1;
+            if ( (LA25_0==WHEN) ) {
+                alt25=1;
             }
-            switch (alt23) {
+            switch (alt25) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:504:4: WHEN ( ':' )? normal_lhs_block[lhs]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523:4: WHEN ( COLON )? normal_lhs_block[lhs]
                     {
                     WHEN12=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_rule1278); if (failed) return rule;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:504:9: ( ':' )?
-                    int alt22=2;
-                    int LA22_0 = input.LA(1);
+                    match(input,WHEN,FOLLOW_WHEN_in_rule1295); if (failed) return rule;
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523:9: ( COLON )?
+                    int alt24=2;
+                    int LA24_0 = input.LA(1);
 
-                    if ( (LA22_0==78) ) {
-                        alt22=1;
+                    if ( (LA24_0==COLON) ) {
+                        alt24=1;
                     }
-                    switch (alt22) {
+                    switch (alt24) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:504:9: ':'
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523:9: COLON
                             {
-                            match(input,78,FOLLOW_78_in_rule1280); if (failed) return rule;
+                            match(input,COLON,FOLLOW_COLON_in_rule1297); if (failed) return rule;
 
                             }
                             break;
@@ -1877,7 +1962,7 @@
                       				lhs.setStartCharacter( ((CommonToken)WHEN12).getStartIndex() );
                       			
                     }
-                    pushFollow(FOLLOW_normal_lhs_block_in_rule1291);
+                    pushFollow(FOLLOW_normal_lhs_block_in_rule1308);
                     normal_lhs_block(lhs);
                     _fsp--;
                     if (failed) return rule;
@@ -1887,7 +1972,7 @@
 
             }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule1301);
+            pushFollow(FOLLOW_rhs_chunk_in_rule1318);
             rhs_chunk(rule);
             _fsp--;
             if (failed) return rule;
@@ -1907,75 +1992,75 @@
 
 
     // $ANTLR start rule_attributes
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:517:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:536:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES COLON )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* ;
     public final void rule_attributes(RuleDescr rule) throws RecognitionException {
         AttributeDescr attr = null;
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:518:2: ( ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:519:2: ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:537:2: ( ( ATTRIBUTES COLON )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:538:2: ( ATTRIBUTES COLON )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )*
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:519:2: ( ATTRIBUTES ':' )?
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:538:2: ( ATTRIBUTES COLON )?
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA24_0==ATTRIBUTES) ) {
-                alt24=1;
+            if ( (LA26_0==ATTRIBUTES) ) {
+                alt26=1;
             }
-            switch (alt24) {
+            switch (alt26) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:519:4: ATTRIBUTES ':'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:538:4: ATTRIBUTES COLON
                     {
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1321); if (failed) return ;
-                    match(input,78,FOLLOW_78_in_rule_attributes1323); if (failed) return ;
+                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1338); if (failed) return ;
+                    match(input,COLON,FOLLOW_COLON_in_rule_attributes1340); if (failed) return ;
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1331);
+            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1348);
             attr=rule_attribute();
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
                rule.addAttribute( attr ); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:2: ( ( ',' )? attr= rule_attribute )*
-            loop26:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:2: ( ( ',' )? attr= rule_attribute )*
+            loop28:
             do {
-                int alt26=2;
-                int LA26_0 = input.LA(1);
+                int alt28=2;
+                int LA28_0 = input.LA(1);
 
-                if ( (LA26_0==COMMA||(LA26_0>=DATE_EFFECTIVE && LA26_0<=ENABLED)||LA26_0==SALIENCE||(LA26_0>=NO_LOOP && LA26_0<=LOCK_ON_ACTIVE)) ) {
-                    alt26=1;
+                if ( (LA28_0==COMMA||LA28_0==DATE_EFFECTIVE||(LA28_0>=DATE_EXPIRES && LA28_0<=ENABLED)||LA28_0==SALIENCE||(LA28_0>=NO_LOOP && LA28_0<=LOCK_ON_ACTIVE)) ) {
+                    alt28=1;
                 }
 
 
-                switch (alt26) {
+                switch (alt28) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:4: ( ',' )? attr= rule_attribute
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:4: ( ',' )? attr= rule_attribute
             	    {
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:4: ( ',' )?
-            	    int alt25=2;
-            	    int LA25_0 = input.LA(1);
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:4: ( ',' )?
+            	    int alt27=2;
+            	    int LA27_0 = input.LA(1);
 
-            	    if ( (LA25_0==COMMA) ) {
-            	        alt25=1;
+            	    if ( (LA27_0==COMMA) ) {
+            	        alt27=1;
             	    }
-            	    switch (alt25) {
+            	    switch (alt27) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:521:4: ','
+            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:4: ','
             	            {
-            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1338); if (failed) return ;
+            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1355); if (failed) return ;
 
             	            }
             	            break;
 
             	    }
 
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1343);
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1360);
             	    attr=rule_attribute();
             	    _fsp--;
             	    if (failed) return ;
@@ -1987,7 +2072,7 @@
             	    break;
 
             	default :
-            	    break loop26;
+            	    break loop28;
                 }
             } while (true);
 
@@ -2007,7 +2092,7 @@
 
 
     // $ANTLR start rule_attribute
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:526:1: rule_attribute returns [AttributeDescr attr] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:545:1: rule_attribute returns [AttributeDescr attr] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );
     public final AttributeDescr rule_attribute() throws RecognitionException {
         AttributeDescr attr = null;
 
@@ -2018,82 +2103,82 @@
         		attr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:533:2: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect )
-            int alt27=12;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:2: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect )
+            int alt29=12;
             switch ( input.LA(1) ) {
             case SALIENCE:
                 {
-                alt27=1;
+                alt29=1;
                 }
                 break;
             case NO_LOOP:
                 {
-                alt27=2;
+                alt29=2;
                 }
                 break;
             case AGENDA_GROUP:
                 {
-                alt27=3;
+                alt29=3;
                 }
                 break;
             case DURATION:
                 {
-                alt27=4;
+                alt29=4;
                 }
                 break;
             case ACTIVATION_GROUP:
                 {
-                alt27=5;
+                alt29=5;
                 }
                 break;
             case AUTO_FOCUS:
                 {
-                alt27=6;
+                alt29=6;
                 }
                 break;
             case DATE_EFFECTIVE:
                 {
-                alt27=7;
+                alt29=7;
                 }
                 break;
             case DATE_EXPIRES:
                 {
-                alt27=8;
+                alt29=8;
                 }
                 break;
             case ENABLED:
                 {
-                alt27=9;
+                alt29=9;
                 }
                 break;
             case RULEFLOW_GROUP:
                 {
-                alt27=10;
+                alt29=10;
                 }
                 break;
             case LOCK_ON_ACTIVE:
                 {
-                alt27=11;
+                alt29=11;
                 }
                 break;
             case DIALECT:
                 {
-                alt27=12;
+                alt29=12;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return attr;}
                 NoViableAltException nvae =
-                    new NoViableAltException("526:1: rule_attribute returns [AttributeDescr attr] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );", 27, 0, input);
+                    new NoViableAltException("545:1: rule_attribute returns [AttributeDescr attr] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus | a= date_effective | a= date_expires | a= enabled | a= ruleflow_group | a= lock_on_active | a= dialect );", 29, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt27) {
+            switch (alt29) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:533:4: a= salience
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:4: a= salience
                     {
-                    pushFollow(FOLLOW_salience_in_rule_attribute1380);
+                    pushFollow(FOLLOW_salience_in_rule_attribute1397);
                     a=salience();
                     _fsp--;
                     if (failed) return attr;
@@ -2101,9 +2186,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:534:4: a= no_loop
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:553:4: a= no_loop
                     {
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute1388);
+                    pushFollow(FOLLOW_no_loop_in_rule_attribute1405);
                     a=no_loop();
                     _fsp--;
                     if (failed) return attr;
@@ -2111,9 +2196,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:4: a= agenda_group
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:554:4: a= agenda_group
                     {
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1397);
+                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1414);
                     a=agenda_group();
                     _fsp--;
                     if (failed) return attr;
@@ -2121,9 +2206,9 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:536:4: a= duration
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:555:4: a= duration
                     {
-                    pushFollow(FOLLOW_duration_in_rule_attribute1406);
+                    pushFollow(FOLLOW_duration_in_rule_attribute1423);
                     a=duration();
                     _fsp--;
                     if (failed) return attr;
@@ -2131,9 +2216,9 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:537:4: a= activation_group
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:4: a= activation_group
                     {
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute1415);
+                    pushFollow(FOLLOW_activation_group_in_rule_attribute1432);
                     a=activation_group();
                     _fsp--;
                     if (failed) return attr;
@@ -2141,9 +2226,9 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:538:4: a= auto_focus
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:557:4: a= auto_focus
                     {
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1423);
+                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1440);
                     a=auto_focus();
                     _fsp--;
                     if (failed) return attr;
@@ -2151,9 +2236,9 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:539:4: a= date_effective
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:4: a= date_effective
                     {
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1431);
+                    pushFollow(FOLLOW_date_effective_in_rule_attribute1448);
                     a=date_effective();
                     _fsp--;
                     if (failed) return attr;
@@ -2161,9 +2246,9 @@
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:540:4: a= date_expires
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:559:4: a= date_expires
                     {
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1439);
+                    pushFollow(FOLLOW_date_expires_in_rule_attribute1456);
                     a=date_expires();
                     _fsp--;
                     if (failed) return attr;
@@ -2171,9 +2256,9 @@
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:541:4: a= enabled
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:560:4: a= enabled
                     {
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1447);
+                    pushFollow(FOLLOW_enabled_in_rule_attribute1464);
                     a=enabled();
                     _fsp--;
                     if (failed) return attr;
@@ -2181,9 +2266,9 @@
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:542:4: a= ruleflow_group
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:561:4: a= ruleflow_group
                     {
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1455);
+                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1472);
                     a=ruleflow_group();
                     _fsp--;
                     if (failed) return attr;
@@ -2191,9 +2276,9 @@
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:543:4: a= lock_on_active
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:562:4: a= lock_on_active
                     {
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1463);
+                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1480);
                     a=lock_on_active();
                     _fsp--;
                     if (failed) return attr;
@@ -2201,9 +2286,9 @@
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:4: a= dialect
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:563:4: a= dialect
                     {
-                    pushFollow(FOLLOW_dialect_in_rule_attribute1470);
+                    pushFollow(FOLLOW_dialect_in_rule_attribute1487);
                     a=dialect();
                     _fsp--;
                     if (failed) return attr;
@@ -2230,7 +2315,7 @@
 
 
     // $ANTLR start date_effective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:547:1: date_effective returns [AttributeDescr descr] : DATE_EFFECTIVE STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:566:1: date_effective returns [AttributeDescr descr] : DATE_EFFECTIVE STRING ;
     public final AttributeDescr date_effective() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2241,13 +2326,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:551:2: ( DATE_EFFECTIVE STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:3: DATE_EFFECTIVE STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:570:2: ( DATE_EFFECTIVE STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:571:3: DATE_EFFECTIVE STRING
             {
             DATE_EFFECTIVE14=(Token)input.LT(1);
-            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1496); if (failed) return descr;
+            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1513); if (failed) return descr;
             STRING13=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1498); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_date_effective1515); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "date-effective", getString( STRING13.getText() ) );
@@ -2272,7 +2357,7 @@
 
 
     // $ANTLR start date_expires
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:562:1: date_expires returns [AttributeDescr descr] : DATE_EXPIRES STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:581:1: date_expires returns [AttributeDescr descr] : DATE_EXPIRES STRING ;
     public final AttributeDescr date_expires() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2283,13 +2368,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:566:2: ( DATE_EXPIRES STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:566:4: DATE_EXPIRES STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:585:2: ( DATE_EXPIRES STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:585:4: DATE_EXPIRES STRING
             {
             DATE_EXPIRES16=(Token)input.LT(1);
-            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1527); if (failed) return descr;
+            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1544); if (failed) return descr;
             STRING15=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1529); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_date_expires1546); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "date-expires", getString( STRING15.getText() ) );
@@ -2314,7 +2399,7 @@
 
 
     // $ANTLR start enabled
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:575:1: enabled returns [AttributeDescr descr] : ENABLED BOOL ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:594:1: enabled returns [AttributeDescr descr] : ENABLED BOOL ;
     public final AttributeDescr enabled() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2325,13 +2410,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:579:2: ( ENABLED BOOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:579:5: ENABLED BOOL
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:598:2: ( ENABLED BOOL )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:598:5: ENABLED BOOL
             {
             ENABLED18=(Token)input.LT(1);
-            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1558); if (failed) return descr;
+            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1575); if (failed) return descr;
             BOOL17=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1560); if (failed) return descr;
+            match(input,BOOL,FOLLOW_BOOL_in_enabled1577); if (failed) return descr;
             if ( backtracking==0 ) {
 
               				descr = new AttributeDescr( "enabled", BOOL17.getText() );
@@ -2356,7 +2441,7 @@
 
 
     // $ANTLR start salience
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:588:1: salience returns [AttributeDescr descr] : SALIENCE ( INT | txt= paren_chunk ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:607:1: salience returns [AttributeDescr descr] : SALIENCE ( INT | txt= paren_chunk ) ;
     public final AttributeDescr salience() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2369,11 +2454,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:592:2: ( SALIENCE ( INT | txt= paren_chunk ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:593:3: SALIENCE ( INT | txt= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:611:2: ( SALIENCE ( INT | txt= paren_chunk ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:612:3: SALIENCE ( INT | txt= paren_chunk )
             {
             SALIENCE19=(Token)input.LT(1);
-            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1593); if (failed) return descr;
+            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1610); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "salience" );
@@ -2381,29 +2466,29 @@
               			descr.setStartCharacter( ((CommonToken)SALIENCE19).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:599:3: ( INT | txt= paren_chunk )
-            int alt28=2;
-            int LA28_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:3: ( INT | txt= paren_chunk )
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA28_0==INT) ) {
-                alt28=1;
+            if ( (LA30_0==INT) ) {
+                alt30=1;
             }
-            else if ( (LA28_0==LEFT_PAREN) ) {
-                alt28=2;
+            else if ( (LA30_0==LEFT_PAREN) ) {
+                alt30=2;
             }
             else {
                 if (backtracking>0) {failed=true; return descr;}
                 NoViableAltException nvae =
-                    new NoViableAltException("599:3: ( INT | txt= paren_chunk )", 28, 0, input);
+                    new NoViableAltException("618:3: ( INT | txt= paren_chunk )", 30, 0, input);
 
                 throw nvae;
             }
-            switch (alt28) {
+            switch (alt30) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:599:5: INT
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:618:5: INT
                     {
                     INT20=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1604); if (failed) return descr;
+                    match(input,INT,FOLLOW_INT_in_salience1621); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       			descr.setValue( INT20.getText() );
@@ -2414,9 +2499,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:604:5: txt= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:5: txt= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1619);
+                    pushFollow(FOLLOW_paren_chunk_in_salience1636);
                     txt=paren_chunk();
                     _fsp--;
                     if (failed) return descr;
@@ -2448,7 +2533,7 @@
 
 
     // $ANTLR start no_loop
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:612:1: no_loop returns [AttributeDescr descr] : NO_LOOP ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:631:1: no_loop returns [AttributeDescr descr] : NO_LOOP ( BOOL )? ;
     public final AttributeDescr no_loop() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2459,11 +2544,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:616:2: ( NO_LOOP ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:616:4: NO_LOOP ( BOOL )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:2: ( NO_LOOP ( BOOL )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:4: NO_LOOP ( BOOL )?
             {
             NO_LOOP21=(Token)input.LT(1);
-            match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1649); if (failed) return descr;
+            match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1666); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "no-loop", "true" );
@@ -2472,19 +2557,19 @@
               			descr.setEndCharacter( ((CommonToken)NO_LOOP21).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:3: ( BOOL )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:3: ( BOOL )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA29_0==BOOL) ) {
-                alt29=1;
+            if ( (LA31_0==BOOL) ) {
+                alt31=1;
             }
-            switch (alt29) {
+            switch (alt31) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:5: BOOL
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:5: BOOL
                     {
                     BOOL22=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1662); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1679); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL22.getText() );
@@ -2513,7 +2598,7 @@
 
 
     // $ANTLR start auto_focus
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:631:1: auto_focus returns [AttributeDescr descr] : AUTO_FOCUS ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:650:1: auto_focus returns [AttributeDescr descr] : AUTO_FOCUS ( BOOL )? ;
     public final AttributeDescr auto_focus() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2524,11 +2609,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:2: ( AUTO_FOCUS ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:635:4: AUTO_FOCUS ( BOOL )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:654:2: ( AUTO_FOCUS ( BOOL )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:654:4: AUTO_FOCUS ( BOOL )?
             {
             AUTO_FOCUS23=(Token)input.LT(1);
-            match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1697); if (failed) return descr;
+            match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1714); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "auto-focus", "true" );
@@ -2537,19 +2622,19 @@
               			descr.setEndCharacter( ((CommonToken)AUTO_FOCUS23).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:3: ( BOOL )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:661:3: ( BOOL )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA30_0==BOOL) ) {
-                alt30=1;
+            if ( (LA32_0==BOOL) ) {
+                alt32=1;
             }
-            switch (alt30) {
+            switch (alt32) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:5: BOOL
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:661:5: BOOL
                     {
                     BOOL24=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1710); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1727); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL24.getText() );
@@ -2578,7 +2663,7 @@
 
 
     // $ANTLR start activation_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:650:1: activation_group returns [AttributeDescr descr] : ACTIVATION_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:669:1: activation_group returns [AttributeDescr descr] : ACTIVATION_GROUP STRING ;
     public final AttributeDescr activation_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2589,13 +2674,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:654:2: ( ACTIVATION_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:654:4: ACTIVATION_GROUP STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:2: ( ACTIVATION_GROUP STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:673:4: ACTIVATION_GROUP STRING
             {
             ACTIVATION_GROUP26=(Token)input.LT(1);
-            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1746); if (failed) return descr;
+            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1763); if (failed) return descr;
             STRING25=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1748); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_activation_group1765); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "activation-group", getString( STRING25.getText() ) );
@@ -2620,7 +2705,7 @@
 
 
     // $ANTLR start ruleflow_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:663:1: ruleflow_group returns [AttributeDescr descr] : RULEFLOW_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:682:1: ruleflow_group returns [AttributeDescr descr] : RULEFLOW_GROUP STRING ;
     public final AttributeDescr ruleflow_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2631,13 +2716,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:667:2: ( RULEFLOW_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:667:4: RULEFLOW_GROUP STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:686:2: ( RULEFLOW_GROUP STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:686:4: RULEFLOW_GROUP STRING
             {
             RULEFLOW_GROUP28=(Token)input.LT(1);
-            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1776); if (failed) return descr;
+            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1793); if (failed) return descr;
             STRING27=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1778); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1795); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "ruleflow-group", getString( STRING27.getText() ) );
@@ -2662,7 +2747,7 @@
 
 
     // $ANTLR start agenda_group
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:676:1: agenda_group returns [AttributeDescr descr] : AGENDA_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:695:1: agenda_group returns [AttributeDescr descr] : AGENDA_GROUP STRING ;
     public final AttributeDescr agenda_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2673,13 +2758,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:680:2: ( AGENDA_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:680:4: AGENDA_GROUP STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:699:2: ( AGENDA_GROUP STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:699:4: AGENDA_GROUP STRING
             {
             AGENDA_GROUP30=(Token)input.LT(1);
-            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1806); if (failed) return descr;
+            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1823); if (failed) return descr;
             STRING29=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1808); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1825); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "agenda-group", getString( STRING29.getText() ) );
@@ -2704,7 +2789,7 @@
 
 
     // $ANTLR start duration
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:689:1: duration returns [AttributeDescr descr] : DURATION INT ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:708:1: duration returns [AttributeDescr descr] : DURATION INT ;
     public final AttributeDescr duration() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2715,13 +2800,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:693:2: ( DURATION INT )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:693:4: DURATION INT
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:2: ( DURATION INT )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:712:4: DURATION INT
             {
             DURATION32=(Token)input.LT(1);
-            match(input,DURATION,FOLLOW_DURATION_in_duration1836); if (failed) return descr;
+            match(input,DURATION,FOLLOW_DURATION_in_duration1853); if (failed) return descr;
             INT31=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1838); if (failed) return descr;
+            match(input,INT,FOLLOW_INT_in_duration1855); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "duration", INT31.getText() );
@@ -2746,7 +2831,7 @@
 
 
     // $ANTLR start dialect
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:702:1: dialect returns [AttributeDescr descr] : DIALECT STRING ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:721:1: dialect returns [AttributeDescr descr] : DIALECT STRING ;
     public final AttributeDescr dialect() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2757,13 +2842,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:706:2: ( DIALECT STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:706:4: DIALECT STRING
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:2: ( DIALECT STRING )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:725:4: DIALECT STRING
             {
             DIALECT34=(Token)input.LT(1);
-            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1866); if (failed) return descr;
+            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1883); if (failed) return descr;
             STRING33=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1868); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_dialect1885); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "dialect", getString( STRING33.getText() ) );
@@ -2788,7 +2873,7 @@
 
 
     // $ANTLR start lock_on_active
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:715:1: lock_on_active returns [AttributeDescr descr] : LOCK_ON_ACTIVE ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:734:1: lock_on_active returns [AttributeDescr descr] : LOCK_ON_ACTIVE ( BOOL )? ;
     public final AttributeDescr lock_on_active() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2799,11 +2884,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:719:2: ( LOCK_ON_ACTIVE ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:719:4: LOCK_ON_ACTIVE ( BOOL )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:2: ( LOCK_ON_ACTIVE ( BOOL )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:4: LOCK_ON_ACTIVE ( BOOL )?
             {
             LOCK_ON_ACTIVE35=(Token)input.LT(1);
-            match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1900); if (failed) return descr;
+            match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1917); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "lock-on-active", "true" );
@@ -2812,19 +2897,19 @@
               			descr.setEndCharacter( ((CommonToken)LOCK_ON_ACTIVE35).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:3: ( BOOL )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:745:3: ( BOOL )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA31_0==BOOL) ) {
-                alt31=1;
+            if ( (LA33_0==BOOL) ) {
+                alt33=1;
             }
-            switch (alt31) {
+            switch (alt33) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:5: BOOL
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:745:5: BOOL
                     {
                     BOOL36=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1913); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1930); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL36.getText() );
@@ -2853,7 +2938,7 @@
 
 
     // $ANTLR start normal_lhs_block
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:734:1: normal_lhs_block[AndDescr descr] : (d= lhs[$descr] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:753:1: normal_lhs_block[AndDescr descr] : (d= lhs[$descr] )* ;
     public final void normal_lhs_block(AndDescr descr) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2862,25 +2947,25 @@
         		location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:738:2: ( (d= lhs[$descr] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:3: (d= lhs[$descr] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:757:2: ( (d= lhs[$descr] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:3: (d= lhs[$descr] )*
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:3: (d= lhs[$descr] )*
-            loop32:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:3: (d= lhs[$descr] )*
+            loop34:
             do {
-                int alt32=2;
-                int LA32_0 = input.LA(1);
+                int alt34=2;
+                int LA34_0 = input.LA(1);
 
-                if ( (LA32_0==ID||LA32_0==LEFT_PAREN||(LA32_0>=EXISTS && LA32_0<=FORALL)) ) {
-                    alt32=1;
+                if ( (LA34_0==ID||LA34_0==LEFT_PAREN||(LA34_0>=EXISTS && LA34_0<=FORALL)) ) {
+                    alt34=1;
                 }
 
 
-                switch (alt32) {
+                switch (alt34) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:5: d= lhs[$descr]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:5: d= lhs[$descr]
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1952);
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1969);
             	    d=lhs(descr);
             	    _fsp--;
             	    if (failed) return ;
@@ -2892,7 +2977,7 @@
             	    break;
 
             	default :
-            	    break loop32;
+            	    break loop34;
                 }
             } while (true);
 
@@ -2912,7 +2997,7 @@
 
 
     // $ANTLR start lhs
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:745:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:764:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
     public final BaseDescr lhs(ConditionalElementDescr ce) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2923,10 +3008,10 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:749:2: (l= lhs_or )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:749:4: l= lhs_or
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:2: (l= lhs_or )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:768:4: l= lhs_or
             {
-            pushFollow(FOLLOW_lhs_or_in_lhs1989);
+            pushFollow(FOLLOW_lhs_or_in_lhs2006);
             l=lhs_or();
             _fsp--;
             if (failed) return d;
@@ -2949,7 +3034,7 @@
 
 
     // $ANTLR start lhs_or
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:753:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:772:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );
     public final BaseDescr lhs_or() throws RecognitionException {
         BaseDescr d = null;
 
@@ -2965,43 +3050,43 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:2: ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* )
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:777:2: ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA35_0==LEFT_PAREN) ) {
-                int LA35_1 = input.LA(2);
+            if ( (LA37_0==LEFT_PAREN) ) {
+                int LA37_1 = input.LA(2);
 
-                if ( (LA35_1==ID||LA35_1==LEFT_PAREN||LA35_1==AND||(LA35_1>=EXISTS && LA35_1<=FORALL)) ) {
-                    alt35=2;
+                if ( (LA37_1==OR) ) {
+                    alt37=1;
                 }
-                else if ( (LA35_1==OR) ) {
-                    alt35=1;
+                else if ( (LA37_1==ID||LA37_1==LEFT_PAREN||LA37_1==AND||(LA37_1>=EXISTS && LA37_1<=FORALL)) ) {
+                    alt37=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("753:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 35, 1, input);
+                        new NoViableAltException("772:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 37, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA35_0==ID||(LA35_0>=EXISTS && LA35_0<=FORALL)) ) {
-                alt35=2;
+            else if ( (LA37_0==ID||(LA37_0>=EXISTS && LA37_0<=FORALL)) ) {
+                alt37=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("753:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 35, 0, input);
+                    new NoViableAltException("772:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 37, 0, input);
 
                 throw nvae;
             }
-            switch (alt35) {
+            switch (alt37) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:758:4: LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:777:4: LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2014); if (failed) return d;
-                    match(input,OR,FOLLOW_OR_in_lhs_or2016); if (failed) return d;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or2031); if (failed) return d;
+                    match(input,OR,FOLLOW_OR_in_lhs_or2033); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       			or = new OrDescr();
@@ -3009,23 +3094,23 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:764:3: (lhsand= lhs_and )+
-                    int cnt33=0;
-                    loop33:
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:3: (lhsand= lhs_and )+
+                    int cnt35=0;
+                    loop35:
                     do {
-                        int alt33=2;
-                        int LA33_0 = input.LA(1);
+                        int alt35=2;
+                        int LA35_0 = input.LA(1);
 
-                        if ( (LA33_0==ID||LA33_0==LEFT_PAREN||(LA33_0>=EXISTS && LA33_0<=FORALL)) ) {
-                            alt33=1;
+                        if ( (LA35_0==ID||LA35_0==LEFT_PAREN||(LA35_0>=EXISTS && LA35_0<=FORALL)) ) {
+                            alt35=1;
                         }
 
 
-                        switch (alt33) {
+                        switch (alt35) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:764:5: lhsand= lhs_and
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:5: lhsand= lhs_and
                     	    {
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2029);
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2046);
                     	    lhsand=lhs_and();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3039,43 +3124,43 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt33 >= 1 ) break loop33;
+                    	    if ( cnt35 >= 1 ) break loop35;
                     	    if (backtracking>0) {failed=true; return d;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(33, input);
+                                    new EarlyExitException(35, input);
                                 throw eee;
                         }
-                        cnt33++;
+                        cnt35++;
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2040); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or2057); if (failed) return d;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:770:10: left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:10: left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
                     {
-                    pushFollow(FOLLOW_lhs_and_in_lhs_or2058);
+                    pushFollow(FOLLOW_lhs_and_in_lhs_or2075);
                     left=lhs_and();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:771:3: ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
-                    loop34:
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:790:3: ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
+                    loop36:
                     do {
-                        int alt34=2;
-                        int LA34_0 = input.LA(1);
+                        int alt36=2;
+                        int LA36_0 = input.LA(1);
 
-                        if ( ((LA34_0>=OR && LA34_0<=DOUBLE_PIPE)) ) {
-                            alt34=1;
+                        if ( ((LA36_0>=OR && LA36_0<=DOUBLE_PIPE)) ) {
+                            alt36=1;
                         }
 
 
-                        switch (alt34) {
+                        switch (alt36) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:771:5: ( OR | DOUBLE_PIPE ) right= lhs_and
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:790:5: ( OR | DOUBLE_PIPE ) right= lhs_and
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -3085,7 +3170,7 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2066);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2083);    throw mse;
                     	    }
 
                     	    if ( backtracking==0 ) {
@@ -3093,7 +3178,7 @@
                     	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                     	      			
                     	    }
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2082);
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or2099);
                     	    right=lhs_and();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3113,7 +3198,7 @@
                     	    break;
 
                     	default :
-                    	    break loop34;
+                    	    break loop36;
                         }
                     } while (true);
 
@@ -3135,7 +3220,7 @@
 
 
     // $ANTLR start lhs_and
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:788:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:807:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );
     public final BaseDescr lhs_and() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3151,43 +3236,43 @@
         		AndDescr and = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:793:2: ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:812:2: ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA38_0==LEFT_PAREN) ) {
-                int LA38_1 = input.LA(2);
+            if ( (LA40_0==LEFT_PAREN) ) {
+                int LA40_1 = input.LA(2);
 
-                if ( (LA38_1==AND) ) {
-                    alt38=1;
+                if ( (LA40_1==AND) ) {
+                    alt40=1;
                 }
-                else if ( (LA38_1==ID||LA38_1==LEFT_PAREN||(LA38_1>=EXISTS && LA38_1<=FORALL)) ) {
-                    alt38=2;
+                else if ( (LA40_1==ID||LA40_1==LEFT_PAREN||(LA40_1>=EXISTS && LA40_1<=FORALL)) ) {
+                    alt40=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("788:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 38, 1, input);
+                        new NoViableAltException("807:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 40, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( (LA38_0==ID||(LA38_0>=EXISTS && LA38_0<=FORALL)) ) {
-                alt38=2;
+            else if ( (LA40_0==ID||(LA40_0>=EXISTS && LA40_0<=FORALL)) ) {
+                alt40=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("788:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 38, 0, input);
+                    new NoViableAltException("807:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 40, 0, input);
 
                 throw nvae;
             }
-            switch (alt38) {
+            switch (alt40) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:793:4: LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:812:4: LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2113); if (failed) return d;
-                    match(input,AND,FOLLOW_AND_in_lhs_and2115); if (failed) return d;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and2130); if (failed) return d;
+                    match(input,AND,FOLLOW_AND_in_lhs_and2132); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       			and = new AndDescr();
@@ -3195,23 +3280,23 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:799:3: (lhsunary= lhs_unary )+
-                    int cnt36=0;
-                    loop36:
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:3: (lhsunary= lhs_unary )+
+                    int cnt38=0;
+                    loop38:
                     do {
-                        int alt36=2;
-                        int LA36_0 = input.LA(1);
+                        int alt38=2;
+                        int LA38_0 = input.LA(1);
 
-                        if ( (LA36_0==ID||LA36_0==LEFT_PAREN||(LA36_0>=EXISTS && LA36_0<=FORALL)) ) {
-                            alt36=1;
+                        if ( (LA38_0==ID||LA38_0==LEFT_PAREN||(LA38_0>=EXISTS && LA38_0<=FORALL)) ) {
+                            alt38=1;
                         }
 
 
-                        switch (alt36) {
+                        switch (alt38) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:799:4: lhsunary= lhs_unary
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:4: lhsunary= lhs_unary
                     	    {
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2127);
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2144);
                     	    lhsunary=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3225,43 +3310,43 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt36 >= 1 ) break loop36;
+                    	    if ( cnt38 >= 1 ) break loop38;
                     	    if (backtracking>0) {failed=true; return d;}
                                 EarlyExitException eee =
-                                    new EarlyExitException(36, input);
+                                    new EarlyExitException(38, input);
                                 throw eee;
                         }
-                        cnt36++;
+                        cnt38++;
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2137); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and2154); if (failed) return d;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:805:10: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:824:10: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
                     {
-                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2155);
+                    pushFollow(FOLLOW_lhs_unary_in_lhs_and2172);
                     left=lhs_unary();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:806:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
-                    loop37:
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:825:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+                    loop39:
                     do {
-                        int alt37=2;
-                        int LA37_0 = input.LA(1);
+                        int alt39=2;
+                        int LA39_0 = input.LA(1);
 
-                        if ( ((LA37_0>=AND && LA37_0<=DOUBLE_AMPER)) ) {
-                            alt37=1;
+                        if ( ((LA39_0>=AND && LA39_0<=DOUBLE_AMPER)) ) {
+                            alt39=1;
                         }
 
 
-                        switch (alt37) {
+                        switch (alt39) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:806:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:825:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
                     	    {
                     	    if ( (input.LA(1)>=AND && input.LA(1)<=DOUBLE_AMPER) ) {
                     	        input.consume();
@@ -3271,7 +3356,7 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2163);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2180);    throw mse;
                     	    }
 
                     	    if ( backtracking==0 ) {
@@ -3279,7 +3364,7 @@
                     	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                     	      			
                     	    }
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2179);
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and2196);
                     	    right=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3299,7 +3384,7 @@
                     	    break;
 
                     	default :
-                    	    break loop37;
+                    	    break loop39;
                         }
                     } while (true);
 
@@ -3321,7 +3406,7 @@
 
 
     // $ANTLR start lhs_unary
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:823:1: lhs_unary returns [BaseDescr d] : ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:1: lhs_unary returns [BaseDescr d] : ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon ;
     public final BaseDescr lhs_unary() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3334,43 +3419,43 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:2: ( ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:2: ( ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source ) opt_semicolon
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source )
-            int alt39=6;
-            int LA39_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source )
+            int alt41=6;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA39_0==EXISTS) && (synpred1())) {
-                alt39=1;
+            if ( (LA41_0==EXISTS) && (synpred1())) {
+                alt41=1;
             }
-            else if ( (LA39_0==NOT) && (synpred2())) {
-                alt39=2;
+            else if ( (LA41_0==NOT) && (synpred2())) {
+                alt41=2;
             }
-            else if ( (LA39_0==EVAL) && (synpred3())) {
-                alt39=3;
+            else if ( (LA41_0==EVAL) && (synpred3())) {
+                alt41=3;
             }
-            else if ( (LA39_0==FORALL) && (synpred4())) {
-                alt39=4;
+            else if ( (LA41_0==FORALL) && (synpred4())) {
+                alt41=4;
             }
-            else if ( (LA39_0==LEFT_PAREN) && (synpred5())) {
-                alt39=5;
+            else if ( (LA41_0==LEFT_PAREN) && (synpred5())) {
+                alt41=5;
             }
-            else if ( (LA39_0==ID) ) {
-                alt39=6;
+            else if ( (LA41_0==ID) ) {
+                alt41=6;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("827:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source )", 39, 0, input);
+                    new NoViableAltException("846:4: ( ( EXISTS )=>u= lhs_exist | ( NOT )=>u= lhs_not | ( EVAL )=>u= lhs_eval | ( FORALL )=>u= lhs_forall | ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN | ps= pattern_source )", 41, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt41) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:6: ( EXISTS )=>u= lhs_exist
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:6: ( EXISTS )=>u= lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2224);
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary2241);
                     u=lhs_exist();
                     _fsp--;
                     if (failed) return d;
@@ -3381,9 +3466,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:828:5: ( NOT )=>u= lhs_not
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:5: ( NOT )=>u= lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2242);
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary2259);
                     u=lhs_not();
                     _fsp--;
                     if (failed) return d;
@@ -3394,9 +3479,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:829:5: ( EVAL )=>u= lhs_eval
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:5: ( EVAL )=>u= lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2261);
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2278);
                     u=lhs_eval();
                     _fsp--;
                     if (failed) return d;
@@ -3407,9 +3492,9 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:830:5: ( FORALL )=>u= lhs_forall
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:5: ( FORALL )=>u= lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2280);
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2297);
                     u=lhs_forall();
                     _fsp--;
                     if (failed) return d;
@@ -3420,14 +3505,14 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:5: ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:850:5: ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2297); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2301);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2314); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2318);
                     u=lhs_or();
                     _fsp--;
                     if (failed) return d;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2303); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2320); if (failed) return d;
                     if ( backtracking==0 ) {
                        d = u; 
                     }
@@ -3435,9 +3520,9 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:832:5: ps= pattern_source
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:851:5: ps= pattern_source
                     {
-                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2314);
+                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2331);
                     ps=pattern_source();
                     _fsp--;
                     if (failed) return d;
@@ -3450,7 +3535,7 @@
 
             }
 
-            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary2326);
+            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary2343);
             opt_semicolon();
             _fsp--;
             if (failed) return d;
@@ -3470,7 +3555,7 @@
 
 
     // $ANTLR start pattern_source
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:837:1: pattern_source returns [BaseDescr d] : u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:856:1: pattern_source returns [BaseDescr d] : u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? ;
     public final BaseDescr pattern_source() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3489,39 +3574,39 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:841:2: (u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:3: u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:860:2: (u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:861:3: u= lhs_pattern ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
             {
-            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2353);
+            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2370);
             u=lhs_pattern();
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
                d = u; 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:843:3: ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
-            int alt41=3;
-            int LA41_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:3: ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
+            int alt43=3;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA41_0==FROM) ) {
-                int LA41_1 = input.LA(2);
+            if ( (LA43_0==FROM) ) {
+                int LA43_1 = input.LA(2);
 
-                if ( (LA41_1==ENTRY_POINT) && (synpred6())) {
-                    alt41=1;
+                if ( (LA43_1==ENTRY_POINT) && (synpred6())) {
+                    alt43=1;
                 }
-                else if ( ((LA41_1>=PACKAGE && LA41_1<=ID)||LA41_1==GLOBAL||(LA41_1>=QUERY && LA41_1<=ATTRIBUTES)||LA41_1==ENABLED||LA41_1==SALIENCE||(LA41_1>=DURATION && LA41_1<=DIALECT)||LA41_1==FROM||(LA41_1>=ACCUMULATE && LA41_1<=COLLECT)||LA41_1==IN||(LA41_1>=THEN && LA41_1<=EVENT)) ) {
-                    alt41=2;
+                else if ( ((LA43_1>=PACKAGE && LA43_1<=ID)||LA43_1==GLOBAL||LA43_1==END||(LA43_1>=QUERY && LA43_1<=ATTRIBUTES)||LA43_1==ENABLED||LA43_1==SALIENCE||(LA43_1>=DURATION && LA43_1<=DIALECT)||LA43_1==FROM||(LA43_1>=ACCUMULATE && LA43_1<=COLLECT)||LA43_1==IN||(LA43_1>=THEN && LA43_1<=EVENT)) ) {
+                    alt43=2;
                 }
             }
-            switch (alt41) {
+            switch (alt43) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:13: ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:13: ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement
                     {
-                    match(input,FROM,FOLLOW_FROM_in_pattern_source2404); if (failed) return d;
-                    pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2408);
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2421); if (failed) return d;
+                    pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2425);
                     ep=entrypoint_statement();
                     _fsp--;
                     if (failed) return d;
@@ -3535,26 +3620,26 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:4: FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:867:4: FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
                     {
-                    match(input,FROM,FOLLOW_FROM_in_pattern_source2428); if (failed) return d;
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2445); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       				location.setType(Location.LOCATION_LHS_FROM);
                       				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
                       		        
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:853:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
-                    int alt40=3;
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:872:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
+                    int alt42=3;
                     switch ( input.LA(1) ) {
                     case ACCUMULATE:
                         {
-                        alt40=1;
+                        alt42=1;
                         }
                         break;
                     case COLLECT:
                         {
-                        alt40=2;
+                        alt42=2;
                         }
                         break;
                     case PACKAGE:
@@ -3562,8 +3647,8 @@
                     case FUNCTION:
                     case ID:
                     case GLOBAL:
+                    case END:
                     case QUERY:
-                    case END:
                     case TEMPLATE:
                     case RULE:
                     case WHEN:
@@ -3581,25 +3666,25 @@
                     case THEN:
                     case EVENT:
                         {
-                        alt40=3;
+                        alt42=3;
                         }
                         break;
                     default:
                         if (backtracking>0) {failed=true; return d;}
                         NoViableAltException nvae =
-                            new NoViableAltException("853:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )", 40, 0, input);
+                            new NoViableAltException("872:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )", 42, 0, input);
 
                         throw nvae;
                     }
 
-                    switch (alt40) {
+                    switch (alt42) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:854:13: (ac= accumulate_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:13: (ac= accumulate_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:854:13: (ac= accumulate_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:854:15: ac= accumulate_statement
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:13: (ac= accumulate_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:15: ac= accumulate_statement
                             {
-                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2486);
+                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2503);
                             ac=accumulate_statement();
                             _fsp--;
                             if (failed) return d;
@@ -3613,12 +3698,12 @@
                             }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:855:15: (cs= collect_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:15: (cs= collect_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:855:15: (cs= collect_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:855:17: cs= collect_statement
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:15: (cs= collect_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:874:17: cs= collect_statement
                             {
-                            pushFollow(FOLLOW_collect_statement_in_pattern_source2509);
+                            pushFollow(FOLLOW_collect_statement_in_pattern_source2526);
                             cs=collect_statement();
                             _fsp--;
                             if (failed) return d;
@@ -3632,12 +3717,12 @@
                             }
                             break;
                         case 3 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:15: (fm= from_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:876:15: (fm= from_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:15: (fm= from_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:857:17: fm= from_statement
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:876:15: (fm= from_statement )
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:876:17: fm= from_statement
                             {
-                            pushFollow(FOLLOW_from_statement_in_pattern_source2546);
+                            pushFollow(FOLLOW_from_statement_in_pattern_source2563);
                             fm=from_statement();
                             _fsp--;
                             if (failed) return d;
@@ -3675,7 +3760,7 @@
 
 
     // $ANTLR start lhs_exist
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:862:1: lhs_exist returns [BaseDescr d] : EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:881:1: lhs_exist returns [BaseDescr d] : EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
     public final BaseDescr lhs_exist() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3690,11 +3775,11 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:866:2: ( EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:866:4: EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:885:2: ( EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:885:4: EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             {
             EXISTS37=(Token)input.LT(1);
-            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist2589); if (failed) return d;
+            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist2606); if (failed) return d;
             if ( backtracking==0 ) {
 
               			d = new ExistsDescr( ); 
@@ -3703,32 +3788,32 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
-            int alt42=2;
-            int LA42_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA42_0==LEFT_PAREN) ) {
-                alt42=1;
+            if ( (LA44_0==LEFT_PAREN) ) {
+                alt44=1;
             }
-            else if ( (LA42_0==ID) ) {
-                alt42=2;
+            else if ( (LA44_0==ID) ) {
+                alt44=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("873:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 42, 0, input);
+                    new NoViableAltException("892:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 44, 0, input);
 
                 throw nvae;
             }
-            switch (alt42) {
+            switch (alt44) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:14: LEFT_PAREN or= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:14: LEFT_PAREN or= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2609); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2613);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2626); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2630);
                     or=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -3736,7 +3821,7 @@
                        if ( or != null ) ((ExistsDescr)d).addDescr( or ); 
                     }
                     RIGHT_PAREN38=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2643); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2660); if (failed) return d;
                     if ( backtracking==0 ) {
                        d.setEndCharacter( ((CommonToken)RIGHT_PAREN38).getStopIndex() ); 
                     }
@@ -3747,9 +3832,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:878:12: pattern= lhs_pattern
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:897:12: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2693);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2710);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
@@ -3783,7 +3868,7 @@
 
 
     // $ANTLR start lhs_not
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:888:1: lhs_not returns [NotDescr d] : NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:907:1: lhs_not returns [NotDescr d] : NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
     public final NotDescr lhs_not() throws RecognitionException {
         NotDescr d = null;
 
@@ -3798,11 +3883,11 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:2: ( NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:892:4: NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:911:2: ( NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:911:4: NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             {
             NOT39=(Token)input.LT(1);
-            match(input,NOT,FOLLOW_NOT_in_lhs_not2745); if (failed) return d;
+            match(input,NOT,FOLLOW_NOT_in_lhs_not2762); if (failed) return d;
             if ( backtracking==0 ) {
 
               			d = new NotDescr( ); 
@@ -3811,32 +3896,32 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:899:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:918:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            int alt45=2;
+            int LA45_0 = input.LA(1);
 
-            if ( (LA43_0==LEFT_PAREN) ) {
-                alt43=1;
+            if ( (LA45_0==LEFT_PAREN) ) {
+                alt45=1;
             }
-            else if ( (LA43_0==ID) ) {
-                alt43=2;
+            else if ( (LA45_0==ID) ) {
+                alt45=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("899:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 43, 0, input);
+                    new NoViableAltException("918:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 45, 0, input);
 
                 throw nvae;
             }
-            switch (alt43) {
+            switch (alt45) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:899:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:918:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:899:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:899:7: LEFT_PAREN or= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:918:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:918:7: LEFT_PAREN or= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2758); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2762);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2775); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2779);
                     or=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -3844,7 +3929,7 @@
                        if ( or != null ) d.addDescr( or ); 
                     }
                     RIGHT_PAREN40=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2793); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2810); if (failed) return d;
                     if ( backtracking==0 ) {
                        d.setEndCharacter( ((CommonToken)RIGHT_PAREN40).getStopIndex() ); 
                     }
@@ -3855,9 +3940,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:905:3: pattern= lhs_pattern
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:924:3: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2830);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2847);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
@@ -3891,7 +3976,7 @@
 
 
     // $ANTLR start lhs_eval
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:915:1: lhs_eval returns [BaseDescr d] : EVAL c= paren_chunk ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:934:1: lhs_eval returns [BaseDescr d] : EVAL c= paren_chunk ;
     public final BaseDescr lhs_eval() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3903,17 +3988,17 @@
         		d = new EvalDescr( );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:919:2: ( EVAL c= paren_chunk )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:920:3: EVAL c= paren_chunk
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:938:2: ( EVAL c= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:939:3: EVAL c= paren_chunk
             {
             EVAL41=(Token)input.LT(1);
-            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval2876); if (failed) return d;
+            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval2893); if (failed) return d;
             if ( backtracking==0 ) {
 
               			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
               		
             }
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2887);
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2904);
             c=paren_chunk();
             _fsp--;
             if (failed) return d;
@@ -3948,7 +4033,7 @@
 
 
     // $ANTLR start lhs_forall
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:940:1: lhs_forall returns [ForallDescr d] : FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:959:1: lhs_forall returns [ForallDescr d] : FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN ;
     public final ForallDescr lhs_forall() throws RecognitionException {
         ForallDescr d = null;
 
@@ -3963,13 +4048,13 @@
         		d = factory.createForall();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:944:2: ( FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:944:4: FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:2: ( FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:4: FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN
             {
             FORALL42=(Token)input.LT(1);
-            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall2913); if (failed) return d;
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2915); if (failed) return d;
-            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2919);
+            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall2930); if (failed) return d;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2932); if (failed) return d;
+            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2936);
             base=lhs_pattern();
             _fsp--;
             if (failed) return d;
@@ -3981,22 +4066,22 @@
               			d.setLocation( offset(FORALL42.getLine()), FORALL42.getCharPositionInLine() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:951:3: (pattern= lhs_pattern )*
-            loop44:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:3: (pattern= lhs_pattern )*
+            loop46:
             do {
-                int alt44=2;
-                int LA44_0 = input.LA(1);
+                int alt46=2;
+                int LA46_0 = input.LA(1);
 
-                if ( (LA44_0==ID) ) {
-                    alt44=1;
+                if ( (LA46_0==ID) ) {
+                    alt46=1;
                 }
 
 
-                switch (alt44) {
+                switch (alt46) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:951:5: pattern= lhs_pattern
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:5: pattern= lhs_pattern
             	    {
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2934);
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2951);
             	    pattern=lhs_pattern();
             	    _fsp--;
             	    if (failed) return d;
@@ -4011,12 +4096,12 @@
             	    break;
 
             	default :
-            	    break loop44;
+            	    break loop46;
                 }
             } while (true);
 
             RIGHT_PAREN43=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2950); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2967); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        d.setEndCharacter( ((CommonToken)RIGHT_PAREN43).getStopIndex() );
@@ -4038,7 +4123,7 @@
 
 
     // $ANTLR start lhs_pattern
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:982:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );
     public final BaseDescr lhs_pattern() throws RecognitionException {
         BaseDescr d = null;
 
@@ -4049,23 +4134,23 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:2: (f= fact_binding | f= fact[null] )
-            int alt45=2;
-            int LA45_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:2: (f= fact_binding | f= fact[null] )
+            int alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( (LA45_0==ID) ) {
-                int LA45_1 = input.LA(2);
+            if ( (LA47_0==ID) ) {
+                int LA47_1 = input.LA(2);
 
-                if ( (LA45_1==78) ) {
-                    alt45=1;
+                if ( (LA47_1==COLON) ) {
+                    alt47=1;
                 }
-                else if ( (LA45_1==DOT||LA45_1==LEFT_PAREN||LA45_1==LEFT_SQUARE) ) {
-                    alt45=2;
+                else if ( (LA47_1==DOT||LA47_1==LEFT_PAREN||LA47_1==LEFT_SQUARE) ) {
+                    alt47=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("963:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 45, 1, input);
+                        new NoViableAltException("982:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 47, 1, input);
 
                     throw nvae;
                 }
@@ -4073,15 +4158,15 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("963:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 45, 0, input);
+                    new NoViableAltException("982:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 47, 0, input);
 
                 throw nvae;
             }
-            switch (alt45) {
+            switch (alt47) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:4: f= fact_binding
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:4: f= fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern2983);
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern3000);
                     f=fact_binding();
                     _fsp--;
                     if (failed) return d;
@@ -4089,9 +4174,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:971:4: f= fact[null]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:990:4: f= fact[null]
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern2991);
+                    pushFollow(FOLLOW_fact_in_lhs_pattern3008);
                     f=fact(null);
                     _fsp--;
                     if (failed) return d;
@@ -4118,7 +4203,7 @@
 
 
     // $ANTLR start from_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:974:1: from_statement returns [FromDescr d] : ds= from_source[$d] ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:993:1: from_statement returns [FromDescr d] : ds= from_source[$d] ;
     public final FromDescr from_statement() throws RecognitionException {
         FromDescr d = null;
 
@@ -4129,10 +4214,10 @@
         		d =factory.createFrom();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:978:2: (ds= from_source[$d] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:979:2: ds= from_source[$d]
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:997:2: (ds= from_source[$d] )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:998:2: ds= from_source[$d]
             {
-            pushFollow(FOLLOW_from_source_in_from_statement3018);
+            pushFollow(FOLLOW_from_source_in_from_statement3035);
             ds=from_source(d);
             _fsp--;
             if (failed) return d;
@@ -4157,7 +4242,7 @@
 
 
     // $ANTLR start accumulate_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:986:1: accumulate_statement returns [AccumulateDescr d] : ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1005:1: accumulate_statement returns [AccumulateDescr d] : ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN ;
     public final AccumulateDescr accumulate_statement() throws RecognitionException {
         AccumulateDescr d = null;
 
@@ -4173,11 +4258,11 @@
         		d = factory.createAccumulate();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:990:2: ( ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:991:10: ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1009:2: ( ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1010:10: ACCUMULATE LEFT_PAREN inputCE= lhs_or ( COMMA )? ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) ) RIGHT_PAREN
             {
             ACCUMULATE44=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement3055); if (failed) return d;
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement3072); if (failed) return d;
             if ( backtracking==0 ) {
                
               			d.setLocation( offset(ACCUMULATE44.getLine()), ACCUMULATE44.getCharPositionInLine() );
@@ -4185,23 +4270,23 @@
               			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement3065); if (failed) return d;
-            pushFollow(FOLLOW_lhs_or_in_accumulate_statement3069);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement3082); if (failed) return d;
+            pushFollow(FOLLOW_lhs_or_in_accumulate_statement3086);
             inputCE=lhs_or();
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:997:29: ( COMMA )?
-            int alt46=2;
-            int LA46_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1016:29: ( COMMA )?
+            int alt48=2;
+            int LA48_0 = input.LA(1);
 
-            if ( (LA46_0==COMMA) ) {
-                alt46=1;
+            if ( (LA48_0==COMMA) ) {
+                alt48=1;
             }
-            switch (alt46) {
+            switch (alt48) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:997:29: COMMA
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1016:29: COMMA
                     {
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3071); if (failed) return d;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3088); if (failed) return d;
 
                     }
                     break;
@@ -4213,52 +4298,52 @@
               		        d.setInput( inputCE );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1001:3: ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) )
-            int alt51=2;
-            int LA51_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1020:3: ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) )
+            int alt53=2;
+            int LA53_0 = input.LA(1);
 
-            if ( (LA51_0==INIT) ) {
-                alt51=1;
+            if ( (LA53_0==INIT) ) {
+                alt53=1;
             }
-            else if ( (LA51_0==ID) ) {
-                alt51=2;
+            else if ( (LA53_0==ID) ) {
+                alt53=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1001:3: ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) )", 51, 0, input);
+                    new NoViableAltException("1020:3: ( ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk ) | (id= ID text= paren_chunk ) )", 53, 0, input);
 
                 throw nvae;
             }
-            switch (alt51) {
+            switch (alt53) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1001:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1020:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1001:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1002:4: INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1020:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1021:4: INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk
                     {
-                    match(input,INIT,FOLLOW_INIT_in_accumulate_statement3089); if (failed) return d;
+                    match(input,INIT,FOLLOW_INIT_in_accumulate_statement3106); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
                       			
                     }
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3102);
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3119);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1006:21: ( COMMA )?
-                    int alt47=2;
-                    int LA47_0 = input.LA(1);
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1025:21: ( COMMA )?
+                    int alt49=2;
+                    int LA49_0 = input.LA(1);
 
-                    if ( (LA47_0==COMMA) ) {
-                        alt47=1;
+                    if ( (LA49_0==COMMA) ) {
+                        alt49=1;
                     }
-                    switch (alt47) {
+                    switch (alt49) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1006:21: COMMA
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1025:21: COMMA
                             {
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3104); if (failed) return d;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3121); if (failed) return d;
 
                             }
                             break;
@@ -4274,23 +4359,23 @@
                       				}
                       			
                     }
-                    match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement3115); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3119);
+                    match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement3132); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3136);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:28: ( COMMA )?
-                    int alt48=2;
-                    int LA48_0 = input.LA(1);
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:28: ( COMMA )?
+                    int alt50=2;
+                    int LA50_0 = input.LA(1);
 
-                    if ( (LA48_0==COMMA) ) {
-                        alt48=1;
+                    if ( (LA50_0==COMMA) ) {
+                        alt50=1;
                     }
-                    switch (alt48) {
+                    switch (alt50) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:28: COMMA
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:28: COMMA
                             {
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3121); if (failed) return d;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3138); if (failed) return d;
 
                             }
                             break;
@@ -4306,34 +4391,34 @@
                       				}
                       			
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:4: ( REVERSE text= paren_chunk ( COMMA )? )?
-                    int alt50=2;
-                    int LA50_0 = input.LA(1);
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:4: ( REVERSE text= paren_chunk ( COMMA )? )?
+                    int alt52=2;
+                    int LA52_0 = input.LA(1);
 
-                    if ( (LA50_0==REVERSE) ) {
-                        alt50=1;
+                    if ( (LA52_0==REVERSE) ) {
+                        alt52=1;
                     }
-                    switch (alt50) {
+                    switch (alt52) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:6: REVERSE text= paren_chunk ( COMMA )?
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:6: REVERSE text= paren_chunk ( COMMA )?
                             {
-                            match(input,REVERSE,FOLLOW_REVERSE_in_accumulate_statement3134); if (failed) return d;
-                            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3138);
+                            match(input,REVERSE,FOLLOW_REVERSE_in_accumulate_statement3151); if (failed) return d;
+                            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3155);
                             text=paren_chunk();
                             _fsp--;
                             if (failed) return d;
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:31: ( COMMA )?
-                            int alt49=2;
-                            int LA49_0 = input.LA(1);
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:31: ( COMMA )?
+                            int alt51=2;
+                            int LA51_0 = input.LA(1);
 
-                            if ( (LA49_0==COMMA) ) {
-                                alt49=1;
+                            if ( (LA51_0==COMMA) ) {
+                                alt51=1;
                             }
-                            switch (alt49) {
+                            switch (alt51) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1022:31: COMMA
+                                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:31: COMMA
                                     {
-                                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3140); if (failed) return d;
+                                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement3157); if (failed) return d;
 
                                     }
                                     break;
@@ -4355,8 +4440,8 @@
 
                     }
 
-                    match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement3157); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3161);
+                    match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement3174); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3178);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
@@ -4375,14 +4460,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:3: (id= ID text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:3: (id= ID text= paren_chunk )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1040:3: (id= ID text= paren_chunk )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1041:4: id= ID text= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:3: (id= ID text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1060:4: id= ID text= paren_chunk
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_accumulate_statement3187); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3191);
+                    match(input,ID,FOLLOW_ID_in_accumulate_statement3204); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement3208);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
@@ -4408,7 +4493,7 @@
             }
 
             RIGHT_PAREN45=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement3208); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement3225); if (failed) return d;
             if ( backtracking==0 ) {
 
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
@@ -4431,7 +4516,7 @@
 
 
     // $ANTLR start from_source
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1061:1: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1080:1: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? ;
     public final DeclarativeInvokerDescr from_source(FromDescr from) throws RecognitionException {
         DeclarativeInvokerDescr ds = null;
 
@@ -4446,10 +4531,10 @@
         		FunctionCallDescr fc = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1067:2: (ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1067:4: ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1086:2: (ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1086:4: ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )?
             {
-            pushFollow(FOLLOW_identifier_in_from_source3239);
+            pushFollow(FOLLOW_identifier_in_from_source3256);
             ident=identifier();
             _fsp--;
             if (failed) return ds;
@@ -4463,18 +4548,18 @@
               			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.start.getText());
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1076:3: ( options {k=1; } : args= paren_chunk )?
-            int alt52=2;
-            int LA52_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1095:3: ( options {k=1; } : args= paren_chunk )?
+            int alt54=2;
+            int LA54_0 = input.LA(1);
 
-            if ( (LA52_0==LEFT_PAREN) ) {
-                alt52=1;
+            if ( (LA54_0==LEFT_PAREN) ) {
+                alt54=1;
             }
-            switch (alt52) {
+            switch (alt54) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1083:5: args= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1102:5: args= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source3267);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source3284);
                     args=paren_chunk();
                     _fsp--;
                     if (failed) return ds;
@@ -4498,18 +4583,18 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1097:3: ( expression_chain[$from, ad] )?
-            int alt53=2;
-            int LA53_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1116:3: ( expression_chain[$from, ad] )?
+            int alt55=2;
+            int LA55_0 = input.LA(1);
 
-            if ( (LA53_0==DOT) ) {
-                alt53=1;
+            if ( (LA55_0==DOT) ) {
+                alt55=1;
             }
-            switch (alt53) {
+            switch (alt55) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1097:3: expression_chain[$from, ad]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1116:3: expression_chain[$from, ad]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source3280);
+                    pushFollow(FOLLOW_expression_chain_in_from_source3297);
                     expression_chain(from,  ad);
                     _fsp--;
                     if (failed) return ds;
@@ -4543,7 +4628,7 @@
 
 
     // $ANTLR start expression_chain
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:1: expression_chain[FromDescr from, AccessorDescr as] : ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1127:1: expression_chain[FromDescr from, AccessorDescr as] : ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) ;
     public final void expression_chain(FromDescr from, AccessorDescr as) throws RecognitionException {
         identifier_return field = null;
 
@@ -4557,14 +4642,14 @@
         	    	MethodAccessDescr ma = null;	
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1113:2: ( ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1132:2: ( ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1133:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:4: DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1133:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1133:4: DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )?
             {
-            match(input,DOT,FOLLOW_DOT_in_expression_chain3311); if (failed) return ;
-            pushFollow(FOLLOW_identifier_in_expression_chain3315);
+            match(input,DOT,FOLLOW_DOT_in_expression_chain3328); if (failed) return ;
+            pushFollow(FOLLOW_identifier_in_expression_chain3332);
             field=identifier();
             _fsp--;
             if (failed) return ;
@@ -4576,14 +4661,14 @@
               		fa.setEndCharacter( ((CommonToken)((Token)field.start)).getStopIndex() );
               	    
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1121:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?
-            int alt54=3;
-            alt54 = dfa54.predict(input);
-            switch (alt54) {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1140:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?
+            int alt56=3;
+            alt56 = dfa56.predict(input);
+            switch (alt56) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:6: ( LEFT_SQUARE )=>sqarg= square_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1141:6: ( LEFT_SQUARE )=>sqarg= square_chunk
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain3346);
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain3363);
                     sqarg=square_chunk();
                     _fsp--;
                     if (failed) return ;
@@ -4597,9 +4682,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1128:6: ( LEFT_PAREN )=>paarg= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1147:6: ( LEFT_PAREN )=>paarg= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3379);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3396);
                     paarg=paren_chunk();
                     _fsp--;
                     if (failed) return ;
@@ -4617,18 +4702,18 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1136:4: ( expression_chain[from, as] )?
-            int alt55=2;
-            int LA55_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1155:4: ( expression_chain[from, as] )?
+            int alt57=2;
+            int LA57_0 = input.LA(1);
 
-            if ( (LA55_0==DOT) ) {
-                alt55=1;
+            if ( (LA57_0==DOT) ) {
+                alt57=1;
             }
-            switch (alt55) {
+            switch (alt57) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1136:4: expression_chain[from, as]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1155:4: expression_chain[from, as]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain3394);
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain3411);
                     expression_chain(from,  as);
                     _fsp--;
                     if (failed) return ;
@@ -4665,7 +4750,7 @@
 
 
     // $ANTLR start collect_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1150:1: collect_statement returns [CollectDescr d] : COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:1: collect_statement returns [CollectDescr d] : COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN ;
     public final CollectDescr collect_statement() throws RecognitionException {
         CollectDescr d = null;
 
@@ -4678,11 +4763,11 @@
         		d = factory.createCollect();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1154:2: ( COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1155:10: COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1173:2: ( COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1174:10: COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN
             {
             COLLECT46=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3445); if (failed) return d;
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3462); if (failed) return d;
             if ( backtracking==0 ) {
                
               			d.setLocation( offset(COLLECT46.getLine()), COLLECT46.getCharPositionInLine() );
@@ -4690,13 +4775,13 @@
               			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3455); if (failed) return d;
-            pushFollow(FOLLOW_pattern_source_in_collect_statement3459);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3472); if (failed) return d;
+            pushFollow(FOLLOW_pattern_source_in_collect_statement3476);
             pattern=pattern_source();
             _fsp--;
             if (failed) return d;
             RIGHT_PAREN47=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3461); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3478); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        d.setInputPattern( (PatternDescr) pattern );
@@ -4720,7 +4805,7 @@
 
 
     // $ANTLR start entrypoint_statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1169:1: entrypoint_statement returns [EntryPointDescr d] : ENTRY_POINT id= name ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1188:1: entrypoint_statement returns [EntryPointDescr d] : ENTRY_POINT id= name ;
     public final EntryPointDescr entrypoint_statement() throws RecognitionException {
         EntryPointDescr d = null;
 
@@ -4732,11 +4817,11 @@
         		d = factory.createEntryPoint();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1173:2: ( ENTRY_POINT id= name )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1174:10: ENTRY_POINT id= name
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1192:2: ( ENTRY_POINT id= name )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1193:10: ENTRY_POINT id= name
             {
             ENTRY_POINT48=(Token)input.LT(1);
-            match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_entrypoint_statement3498); if (failed) return d;
+            match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_entrypoint_statement3515); if (failed) return d;
             if ( backtracking==0 ) {
                
               			d.setLocation( offset(ENTRY_POINT48.getLine()), ENTRY_POINT48.getCharPositionInLine() );
@@ -4744,7 +4829,7 @@
               			location.setType( Location.LOCATION_LHS_FROM_ENTRY_POINT );
               		
             }
-            pushFollow(FOLLOW_name_in_entrypoint_statement3510);
+            pushFollow(FOLLOW_name_in_entrypoint_statement3527);
             id=name();
             _fsp--;
             if (failed) return d;
@@ -4771,7 +4856,7 @@
 
 
     // $ANTLR start fact_binding
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1188:1: fact_binding returns [BaseDescr d] : ID ':' (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1207:1: fact_binding returns [BaseDescr d] : ID COLON (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN ) ;
     public final BaseDescr fact_binding() throws RecognitionException {
         BaseDescr d = null;
 
@@ -4788,12 +4873,12 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1193:3: ( ID ':' (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1194:4: ID ':' (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1212:3: ( ID COLON (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1213:4: ID COLON (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
             {
             ID49=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_fact_binding3542); if (failed) return d;
-            match(input,78,FOLLOW_78_in_fact_binding3544); if (failed) return d;
+            match(input,ID,FOLLOW_ID_in_fact_binding3559); if (failed) return d;
+            match(input,COLON,FOLLOW_COLON_in_fact_binding3561); if (failed) return d;
             if ( backtracking==0 ) {
 
                		        // handling incomplete parsing
@@ -4801,28 +4886,28 @@
                		        ((PatternDescr) d).setIdentifier( ID49.getText() );
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1200:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
-            int alt57=2;
-            int LA57_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1219:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
+            int alt59=2;
+            int LA59_0 = input.LA(1);
 
-            if ( (LA57_0==ID) ) {
-                alt57=1;
+            if ( (LA59_0==ID) ) {
+                alt59=1;
             }
-            else if ( (LA57_0==LEFT_PAREN) ) {
-                alt57=2;
+            else if ( (LA59_0==LEFT_PAREN) ) {
+                alt59=2;
             }
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1200:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )", 57, 0, input);
+                    new NoViableAltException("1219:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )", 59, 0, input);
 
                 throw nvae;
             }
-            switch (alt57) {
+            switch (alt59) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1200:5: fe= fact[$ID.text]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1219:5: fe= fact[$ID.text]
                     {
-                    pushFollow(FOLLOW_fact_in_fact_binding3558);
+                    pushFollow(FOLLOW_fact_in_fact_binding3575);
                     fe=fact(ID49.getText());
                     _fsp--;
                     if (failed) return d;
@@ -4839,10 +4924,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1209:4: LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228:4: LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3574); if (failed) return d;
-                    pushFollow(FOLLOW_fact_in_fact_binding3578);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3591); if (failed) return d;
+                    pushFollow(FOLLOW_fact_in_fact_binding3595);
                     left=fact(ID49.getText());
                     _fsp--;
                     if (failed) return d;
@@ -4855,20 +4940,20 @@
                          			}
                        		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1217:4: ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )*
-                    loop56:
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:4: ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )*
+                    loop58:
                     do {
-                        int alt56=2;
-                        int LA56_0 = input.LA(1);
+                        int alt58=2;
+                        int LA58_0 = input.LA(1);
 
-                        if ( ((LA56_0>=OR && LA56_0<=DOUBLE_PIPE)) ) {
-                            alt56=1;
+                        if ( ((LA58_0>=OR && LA58_0<=DOUBLE_PIPE)) ) {
+                            alt58=1;
                         }
 
 
-                        switch (alt56) {
+                        switch (alt58) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1217:6: ( OR | DOUBLE_PIPE ) right= fact[$ID.text]
+                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1236:6: ( OR | DOUBLE_PIPE ) right= fact[$ID.text]
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -4878,10 +4963,10 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_binding3591);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_binding3608);    throw mse;
                     	    }
 
-                    	    pushFollow(FOLLOW_fact_in_fact_binding3603);
+                    	    pushFollow(FOLLOW_fact_in_fact_binding3620);
                     	    right=fact(ID49.getText());
                     	    _fsp--;
                     	    if (failed) return d;
@@ -4900,11 +4985,11 @@
                     	    break;
 
                     	default :
-                    	    break loop56;
+                    	    break loop58;
                         }
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3621); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3638); if (failed) return d;
 
                     }
                     break;
@@ -4927,7 +5012,7 @@
 
 
     // $ANTLR start fact
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1232:1: fact[String ident] returns [BaseDescr d] : id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1251:1: fact[String ident] returns [BaseDescr d] : id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? ;
     public final BaseDescr fact(String ident) throws RecognitionException {
         BaseDescr d = null;
 
@@ -4941,8 +5026,8 @@
         		PatternDescr pattern = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1237:3: (id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1238:11: id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )?
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1256:3: (id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1257:11: id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )?
             {
             if ( backtracking==0 ) {
 
@@ -4953,7 +5038,7 @@
                			d = pattern; 
                	        
             }
-            pushFollow(FOLLOW_qualified_id_in_fact3676);
+            pushFollow(FOLLOW_qualified_id_in_fact3693);
             id=qualified_id();
             _fsp--;
             if (failed) return d;
@@ -4967,7 +5052,7 @@
                		
             }
             LEFT_PAREN50=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3686); if (failed) return d;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3703); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
@@ -4977,18 +5062,18 @@
                			pattern.setLeftParentCharacter( ((CommonToken)LEFT_PAREN50).getStartIndex() );
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1261:4: ( constraints[pattern] )?
-            int alt58=2;
-            int LA58_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1280:4: ( constraints[pattern] )?
+            int alt60=2;
+            int LA60_0 = input.LA(1);
 
-            if ( ((LA58_0>=PACKAGE && LA58_0<=ID)||(LA58_0>=GLOBAL && LA58_0<=LEFT_PAREN)||(LA58_0>=QUERY && LA58_0<=ATTRIBUTES)||LA58_0==ENABLED||LA58_0==SALIENCE||(LA58_0>=DURATION && LA58_0<=DIALECT)||LA58_0==FROM||LA58_0==EVAL||(LA58_0>=INIT && LA58_0<=RESULT)||LA58_0==IN||(LA58_0>=THEN && LA58_0<=EVENT)) ) {
-                alt58=1;
+            if ( ((LA60_0>=PACKAGE && LA60_0<=ID)||(LA60_0>=GLOBAL && LA60_0<=LEFT_PAREN)||LA60_0==END||(LA60_0>=QUERY && LA60_0<=ATTRIBUTES)||LA60_0==ENABLED||LA60_0==SALIENCE||(LA60_0>=DURATION && LA60_0<=DIALECT)||LA60_0==FROM||LA60_0==EVAL||(LA60_0>=INIT && LA60_0<=RESULT)||LA60_0==LEFT_SQUARE||LA60_0==IN||(LA60_0>=THEN && LA60_0<=EVENT)) ) {
+                alt60=1;
             }
-            switch (alt58) {
+            switch (alt60) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1261:4: constraints[pattern]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1280:4: constraints[pattern]
                     {
-                    pushFollow(FOLLOW_constraints_in_fact3698);
+                    pushFollow(FOLLOW_constraints_in_fact3715);
                     constraints(pattern);
                     _fsp--;
                     if (failed) return d;
@@ -4999,7 +5084,7 @@
             }
 
             RIGHT_PAREN51=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3705); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3722); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        if( ")".equals( RIGHT_PAREN51.getText() ) ) {
@@ -5010,18 +5095,18 @@
               		        }
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1271:4: ( EOF )?
-            int alt59=2;
-            int LA59_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1290:4: ( EOF )?
+            int alt61=2;
+            int LA61_0 = input.LA(1);
 
-            if ( (LA59_0==EOF) ) {
-                alt59=1;
+            if ( (LA61_0==EOF) ) {
+                alt61=1;
             }
-            switch (alt59) {
+            switch (alt61) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1271:4: EOF
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1290:4: EOF
                     {
-                    match(input,EOF,FOLLOW_EOF_in_fact3714); if (failed) return d;
+                    match(input,EOF,FOLLOW_EOF_in_fact3731); if (failed) return d;
 
                     }
                     break;
@@ -5044,45 +5129,119 @@
 
 
     // $ANTLR start constraints
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1275:1: constraints[PatternDescr pattern] : constraint[$pattern] ( COMMA constraint[$pattern] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1294:1: constraints[PatternDescr pattern] : ( constraint[$pattern] | behaviors ) ( COMMA ( constraint[$pattern] | behaviors ) )* ;
     public final void constraints(PatternDescr pattern) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:2: ( constraint[$pattern] ( COMMA constraint[$pattern] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1276:4: constraint[$pattern] ( COMMA constraint[$pattern] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:2: ( ( constraint[$pattern] | behaviors ) ( COMMA ( constraint[$pattern] | behaviors ) )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:4: ( constraint[$pattern] | behaviors ) ( COMMA ( constraint[$pattern] | behaviors ) )*
             {
-            pushFollow(FOLLOW_constraint_in_constraints3732);
-            constraint(pattern);
-            _fsp--;
-            if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1277:3: ( COMMA constraint[$pattern] )*
-            loop60:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:4: ( constraint[$pattern] | behaviors )
+            int alt62=2;
+            int LA62_0 = input.LA(1);
+
+            if ( ((LA62_0>=PACKAGE && LA62_0<=ID)||(LA62_0>=GLOBAL && LA62_0<=LEFT_PAREN)||LA62_0==END||(LA62_0>=QUERY && LA62_0<=ATTRIBUTES)||LA62_0==ENABLED||LA62_0==SALIENCE||(LA62_0>=DURATION && LA62_0<=DIALECT)||LA62_0==FROM||LA62_0==EVAL||(LA62_0>=INIT && LA62_0<=RESULT)||LA62_0==IN||(LA62_0>=THEN && LA62_0<=EVENT)) ) {
+                alt62=1;
+            }
+            else if ( (LA62_0==LEFT_SQUARE) ) {
+                alt62=2;
+            }
+            else {
+                if (backtracking>0) {failed=true; return ;}
+                NoViableAltException nvae =
+                    new NoViableAltException("1295:4: ( constraint[$pattern] | behaviors )", 62, 0, input);
+
+                throw nvae;
+            }
+            switch (alt62) {
+                case 1 :
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:5: constraint[$pattern]
+                    {
+                    pushFollow(FOLLOW_constraint_in_constraints3750);
+                    constraint(pattern);
+                    _fsp--;
+                    if (failed) return ;
+
+                    }
+                    break;
+                case 2 :
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:26: behaviors
+                    {
+                    pushFollow(FOLLOW_behaviors_in_constraints3753);
+                    behaviors();
+                    _fsp--;
+                    if (failed) return ;
+
+                    }
+                    break;
+
+            }
+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1296:3: ( COMMA ( constraint[$pattern] | behaviors ) )*
+            loop64:
             do {
-                int alt60=2;
-                int LA60_0 = input.LA(1);
+                int alt64=2;
+                int LA64_0 = input.LA(1);
 
-                if ( (LA60_0==COMMA) ) {
-                    alt60=1;
+                if ( (LA64_0==COMMA) ) {
+                    alt64=1;
                 }
 
 
-                switch (alt60) {
+                switch (alt64) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1277:5: COMMA constraint[$pattern]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1296:5: COMMA ( constraint[$pattern] | behaviors )
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3739); if (failed) return ;
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3760); if (failed) return ;
             	    if ( backtracking==0 ) {
             	       location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); 
             	    }
-            	    pushFollow(FOLLOW_constraint_in_constraints3748);
-            	    constraint(pattern);
-            	    _fsp--;
-            	    if (failed) return ;
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1297:5: ( constraint[$pattern] | behaviors )
+            	    int alt63=2;
+            	    int LA63_0 = input.LA(1);
 
+            	    if ( ((LA63_0>=PACKAGE && LA63_0<=ID)||(LA63_0>=GLOBAL && LA63_0<=LEFT_PAREN)||LA63_0==END||(LA63_0>=QUERY && LA63_0<=ATTRIBUTES)||LA63_0==ENABLED||LA63_0==SALIENCE||(LA63_0>=DURATION && LA63_0<=DIALECT)||LA63_0==FROM||LA63_0==EVAL||(LA63_0>=INIT && LA63_0<=RESULT)||LA63_0==IN||(LA63_0>=THEN && LA63_0<=EVENT)) ) {
+            	        alt63=1;
             	    }
+            	    else if ( (LA63_0==LEFT_SQUARE) ) {
+            	        alt63=2;
+            	    }
+            	    else {
+            	        if (backtracking>0) {failed=true; return ;}
+            	        NoViableAltException nvae =
+            	            new NoViableAltException("1297:5: ( constraint[$pattern] | behaviors )", 63, 0, input);
+
+            	        throw nvae;
+            	    }
+            	    switch (alt63) {
+            	        case 1 :
+            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1297:6: constraint[$pattern]
+            	            {
+            	            pushFollow(FOLLOW_constraint_in_constraints3770);
+            	            constraint(pattern);
+            	            _fsp--;
+            	            if (failed) return ;
+
+            	            }
+            	            break;
+            	        case 2 :
+            	            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1297:27: behaviors
+            	            {
+            	            pushFollow(FOLLOW_behaviors_in_constraints3773);
+            	            behaviors();
+            	            _fsp--;
+            	            if (failed) return ;
+
+            	            }
+            	            break;
+
+            	    }
+
+
+            	    }
             	    break;
 
             	default :
-            	    break loop60;
+            	    break loop64;
                 }
             } while (true);
 
@@ -5102,7 +5261,7 @@
 
 
     // $ANTLR start constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1282:1: constraint[PatternDescr pattern] : or_constr[top] ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1301:1: constraint[PatternDescr pattern] : or_constr[top] ;
     public final void constraint(PatternDescr pattern) throws RecognitionException {
 
         		ConditionalElementDescr top = null;
@@ -5110,15 +5269,15 @@
         		location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, input.LT(1).getText() );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1288:2: ( or_constr[top] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1289:3: or_constr[top]
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1307:2: ( or_constr[top] )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1308:3: or_constr[top]
             {
             if ( backtracking==0 ) {
 
               			top = pattern.getConstraint();
               		
             }
-            pushFollow(FOLLOW_or_constr_in_constraint3781);
+            pushFollow(FOLLOW_or_constr_in_constraint3806);
             or_constr(top);
             _fsp--;
             if (failed) return ;
@@ -5137,42 +5296,162 @@
     // $ANTLR end constraint
 
 
+    // $ANTLR start behaviors
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1314:1: behaviors : LEFT_SQUARE behavior ( COMMA behavior )* RIGHT_SQUARE ;
+    public final void behaviors() throws RecognitionException {
+        try {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1315:2: ( LEFT_SQUARE behavior ( COMMA behavior )* RIGHT_SQUARE )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1315:4: LEFT_SQUARE behavior ( COMMA behavior )* RIGHT_SQUARE
+            {
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_behaviors3821); if (failed) return ;
+            pushFollow(FOLLOW_behavior_in_behaviors3823);
+            behavior();
+            _fsp--;
+            if (failed) return ;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1315:25: ( COMMA behavior )*
+            loop65:
+            do {
+                int alt65=2;
+                int LA65_0 = input.LA(1);
+
+                if ( (LA65_0==COMMA) ) {
+                    alt65=1;
+                }
+
+
+                switch (alt65) {
+            	case 1 :
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1315:27: COMMA behavior
+            	    {
+            	    match(input,COMMA,FOLLOW_COMMA_in_behaviors3827); if (failed) return ;
+            	    pushFollow(FOLLOW_behavior_in_behaviors3829);
+            	    behavior();
+            	    _fsp--;
+            	    if (failed) return ;
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop65;
+                }
+            } while (true);
+
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_behaviors3834); if (failed) return ;
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end behaviors
+
+
+    // $ANTLR start behavior
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1318:1: behavior : ID ( COLON ID )? ( paren_chunk )? ;
+    public final void behavior() throws RecognitionException {
+        try {
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:2: ( ID ( COLON ID )? ( paren_chunk )? )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:4: ID ( COLON ID )? ( paren_chunk )?
+            {
+            match(input,ID,FOLLOW_ID_in_behavior3848); if (failed) return ;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:7: ( COLON ID )?
+            int alt66=2;
+            int LA66_0 = input.LA(1);
+
+            if ( (LA66_0==COLON) ) {
+                alt66=1;
+            }
+            switch (alt66) {
+                case 1 :
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:8: COLON ID
+                    {
+                    match(input,COLON,FOLLOW_COLON_in_behavior3851); if (failed) return ;
+                    match(input,ID,FOLLOW_ID_in_behavior3853); if (failed) return ;
+
+                    }
+                    break;
+
+            }
+
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:19: ( paren_chunk )?
+            int alt67=2;
+            int LA67_0 = input.LA(1);
+
+            if ( (LA67_0==LEFT_PAREN) ) {
+                alt67=1;
+            }
+            switch (alt67) {
+                case 1 :
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:19: paren_chunk
+                    {
+                    pushFollow(FOLLOW_paren_chunk_in_behavior3857);
+                    paren_chunk();
+                    _fsp--;
+                    if (failed) return ;
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end behavior
+
+
     // $ANTLR start or_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1295:1: or_constr[ConditionalElementDescr base] : and_constr[or] ( DOUBLE_PIPE and_constr[or] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1322:1: or_constr[ConditionalElementDescr base] : and_constr[or] ( DOUBLE_PIPE and_constr[or] )* ;
     public final void or_constr(ConditionalElementDescr base) throws RecognitionException {
 
         		OrDescr or = new OrDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1299:2: ( and_constr[or] ( DOUBLE_PIPE and_constr[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1300:3: and_constr[or] ( DOUBLE_PIPE and_constr[or] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1326:2: ( and_constr[or] ( DOUBLE_PIPE and_constr[or] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1327:3: and_constr[or] ( DOUBLE_PIPE and_constr[or] )*
             {
-            pushFollow(FOLLOW_and_constr_in_or_constr3804);
+            pushFollow(FOLLOW_and_constr_in_or_constr3879);
             and_constr(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1301:3: ( DOUBLE_PIPE and_constr[or] )*
-            loop61:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1328:3: ( DOUBLE_PIPE and_constr[or] )*
+            loop68:
             do {
-                int alt61=2;
-                int LA61_0 = input.LA(1);
+                int alt68=2;
+                int LA68_0 = input.LA(1);
 
-                if ( (LA61_0==DOUBLE_PIPE) ) {
-                    alt61=1;
+                if ( (LA68_0==DOUBLE_PIPE) ) {
+                    alt68=1;
                 }
 
 
-                switch (alt61) {
+                switch (alt68) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1301:5: DOUBLE_PIPE and_constr[or]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1328:5: DOUBLE_PIPE and_constr[or]
             	    {
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3812); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3887); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      		
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr3821);
+            	    pushFollow(FOLLOW_and_constr_in_or_constr3896);
             	    and_constr(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -5181,7 +5460,7 @@
             	    break;
 
             	default :
-            	    break loop61;
+            	    break loop68;
                 }
             } while (true);
 
@@ -5210,41 +5489,41 @@
 
 
     // $ANTLR start and_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1316:1: and_constr[ConditionalElementDescr base] : unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1343:1: and_constr[ConditionalElementDescr base] : unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* ;
     public final void and_constr(ConditionalElementDescr base) throws RecognitionException {
 
         		AndDescr and = new AndDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1320:2: ( unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1321:3: unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1347:2: ( unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1348:3: unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )*
             {
-            pushFollow(FOLLOW_unary_constr_in_and_constr3853);
+            pushFollow(FOLLOW_unary_constr_in_and_constr3928);
             unary_constr(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1322:3: ( DOUBLE_AMPER unary_constr[and] )*
-            loop62:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1349:3: ( DOUBLE_AMPER unary_constr[and] )*
+            loop69:
             do {
-                int alt62=2;
-                int LA62_0 = input.LA(1);
+                int alt69=2;
+                int LA69_0 = input.LA(1);
 
-                if ( (LA62_0==DOUBLE_AMPER) ) {
-                    alt62=1;
+                if ( (LA69_0==DOUBLE_AMPER) ) {
+                    alt69=1;
                 }
 
 
-                switch (alt62) {
+                switch (alt69) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1322:5: DOUBLE_AMPER unary_constr[and]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1349:5: DOUBLE_AMPER unary_constr[and]
             	    {
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3861); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3936); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      		
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr3870);
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr3945);
             	    unary_constr(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -5253,7 +5532,7 @@
             	    break;
 
             	default :
-            	    break loop62;
+            	    break loop69;
                 }
             } while (true);
 
@@ -5282,22 +5561,22 @@
 
 
     // $ANTLR start unary_constr
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1337:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1364:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) ;
     public final void unary_constr(ConditionalElementDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1338:2: ( ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1339:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1365:2: ( ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1366:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1339:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
-            int alt63=3;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1366:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
+            int alt70=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
             case IMPORT:
             case FUNCTION:
             case ID:
             case GLOBAL:
+            case END:
             case QUERY:
-            case END:
             case TEMPLATE:
             case RULE:
             case WHEN:
@@ -5315,32 +5594,32 @@
             case THEN:
             case EVENT:
                 {
-                alt63=1;
+                alt70=1;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt63=2;
+                alt70=2;
                 }
                 break;
             case EVAL:
                 {
-                alt63=3;
+                alt70=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1339:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )", 63, 0, input);
+                    new NoViableAltException("1366:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )", 70, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt63) {
+            switch (alt70) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1339:5: field_constraint[$base]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1366:5: field_constraint[$base]
                     {
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr3898);
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr3973);
                     field_constraint(base);
                     _fsp--;
                     if (failed) return ;
@@ -5348,22 +5627,22 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1340:5: LEFT_PAREN or_constr[$base] RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1367:5: LEFT_PAREN or_constr[$base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3906); if (failed) return ;
-                    pushFollow(FOLLOW_or_constr_in_unary_constr3908);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3981); if (failed) return ;
+                    pushFollow(FOLLOW_or_constr_in_unary_constr3983);
                     or_constr(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3911); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3986); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1341:5: EVAL predicate[$base]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1368:5: EVAL predicate[$base]
                     {
-                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr3917); if (failed) return ;
-                    pushFollow(FOLLOW_predicate_in_unary_constr3919);
+                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr3992); if (failed) return ;
+                    pushFollow(FOLLOW_predicate_in_unary_constr3994);
                     predicate(base);
                     _fsp--;
                     if (failed) return ;
@@ -5389,7 +5668,7 @@
 
 
     // $ANTLR start field_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1345:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1372:1: field_constraint[ConditionalElementDescr base] : ( ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );
     public final void field_constraint(ConditionalElementDescr base) throws RecognitionException {
         Token ID52=null;
         accessor_path_return f = null;
@@ -5401,47 +5680,47 @@
         		RestrictionConnectiveDescr top = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1351:2: ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) )
-            int alt65=2;
-            int LA65_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1378:2: ( ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) )
+            int alt72=2;
+            int LA72_0 = input.LA(1);
 
-            if ( (LA65_0==ID) ) {
-                int LA65_1 = input.LA(2);
+            if ( (LA72_0==ID) ) {
+                int LA72_1 = input.LA(2);
 
-                if ( (LA65_1==78) ) {
-                    alt65=1;
+                if ( (LA72_1==COLON) ) {
+                    alt72=1;
                 }
-                else if ( (LA65_1==DOT||LA65_1==LEFT_PAREN||LA65_1==NOT||(LA65_1>=CONTAINS && LA65_1<=IN)||LA65_1==LEFT_SQUARE||(LA65_1>=80 && LA65_1<=85)) ) {
-                    alt65=2;
+                else if ( (LA72_1==DOT||LA72_1==LEFT_PAREN||LA72_1==NOT||LA72_1==LEFT_SQUARE||(LA72_1>=CONTAINS && LA72_1<=IN)||(LA72_1>=82 && LA72_1<=87)) ) {
+                    alt72=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1345:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 65, 1, input);
+                        new NoViableAltException("1372:1: field_constraint[ConditionalElementDescr base] : ( ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 72, 1, input);
 
                     throw nvae;
                 }
             }
-            else if ( ((LA65_0>=PACKAGE && LA65_0<=FUNCTION)||LA65_0==GLOBAL||(LA65_0>=QUERY && LA65_0<=ATTRIBUTES)||LA65_0==ENABLED||LA65_0==SALIENCE||(LA65_0>=DURATION && LA65_0<=DIALECT)||LA65_0==FROM||(LA65_0>=INIT && LA65_0<=RESULT)||LA65_0==IN||(LA65_0>=THEN && LA65_0<=EVENT)) ) {
-                alt65=2;
+            else if ( ((LA72_0>=PACKAGE && LA72_0<=FUNCTION)||LA72_0==GLOBAL||LA72_0==END||(LA72_0>=QUERY && LA72_0<=ATTRIBUTES)||LA72_0==ENABLED||LA72_0==SALIENCE||(LA72_0>=DURATION && LA72_0<=DIALECT)||LA72_0==FROM||(LA72_0>=INIT && LA72_0<=RESULT)||LA72_0==IN||(LA72_0>=THEN && LA72_0<=EVENT)) ) {
+                alt72=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1345:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 65, 0, input);
+                    new NoViableAltException("1372:1: field_constraint[ConditionalElementDescr base] : ( ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 72, 0, input);
 
                 throw nvae;
             }
-            switch (alt65) {
+            switch (alt72) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1352:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1379:10: ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1352:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1353:3: ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )?
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1379:10: ( ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1380:3: ID COLON f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )?
                     {
                     ID52=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_field_constraint3958); if (failed) return ;
-                    match(input,78,FOLLOW_78_in_field_constraint3960); if (failed) return ;
+                    match(input,ID,FOLLOW_ID_in_field_constraint4033); if (failed) return ;
+                    match(input,COLON,FOLLOW_COLON_in_field_constraint4035); if (failed) return ;
                     if ( backtracking==0 ) {
                        
                       			fbd = new FieldBindingDescr();
@@ -5452,7 +5731,7 @@
 
                       		    
                     }
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3979);
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint4054);
                     f=accessor_path();
                     _fsp--;
                     if (failed) return ;
@@ -5481,21 +5760,21 @@
                       		    }
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1387:3: ( or_restr_connective[top] | '->' predicate[$base] )?
-                    int alt64=3;
-                    int LA64_0 = input.LA(1);
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1414:3: ( or_restr_connective[top] | '->' predicate[$base] )?
+                    int alt71=3;
+                    int LA71_0 = input.LA(1);
 
-                    if ( (LA64_0==LEFT_PAREN||LA64_0==NOT||(LA64_0>=CONTAINS && LA64_0<=IN)||(LA64_0>=80 && LA64_0<=85)) ) {
-                        alt64=1;
+                    if ( (LA71_0==LEFT_PAREN||LA71_0==NOT||(LA71_0>=CONTAINS && LA71_0<=IN)||(LA71_0>=82 && LA71_0<=87)) ) {
+                        alt71=1;
                     }
-                    else if ( (LA64_0==79) ) {
-                        alt64=2;
+                    else if ( (LA71_0==81) ) {
+                        alt71=2;
                     }
-                    switch (alt64) {
+                    switch (alt71) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1388:4: or_restr_connective[top]
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1415:4: or_restr_connective[top]
                             {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3993);
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint4068);
                             or_restr_connective(top);
                             _fsp--;
                             if (failed) return ;
@@ -5511,10 +5790,10 @@
                             }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1396:4: '->' predicate[$base]
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1423:4: '->' predicate[$base]
                             {
-                            match(input,79,FOLLOW_79_in_field_constraint4008); if (failed) return ;
-                            pushFollow(FOLLOW_predicate_in_field_constraint4010);
+                            match(input,81,FOLLOW_81_in_field_constraint4083); if (failed) return ;
+                            pushFollow(FOLLOW_predicate_in_field_constraint4085);
                             predicate(base);
                             _fsp--;
                             if (failed) return ;
@@ -5531,12 +5810,12 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400:3: (f= accessor_path or_restr_connective[top] )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1427:3: (f= accessor_path or_restr_connective[top] )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400:3: (f= accessor_path or_restr_connective[top] )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1401:3: f= accessor_path or_restr_connective[top]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1427:3: (f= accessor_path or_restr_connective[top] )
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1428:3: f= accessor_path or_restr_connective[top]
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint4036);
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint4111);
                     f=accessor_path();
                     _fsp--;
                     if (failed) return ;
@@ -5557,7 +5836,7 @@
                       		    }
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint4045);
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint4120);
                     or_restr_connective(top);
                     _fsp--;
                     if (failed) return ;
@@ -5591,36 +5870,36 @@
 
 
     // $ANTLR start or_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:1: or_restr_connective[ RestrictionConnectiveDescr base ] options {backtrack=true; } : and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1460:1: or_restr_connective[ RestrictionConnectiveDescr base ] options {backtrack=true; } : and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* ;
     public final void or_restr_connective(RestrictionConnectiveDescr base) throws RecognitionException {
 
         		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1440:2: ( and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1441:3: and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1467:2: ( and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1468:3: and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
             {
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4092);
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4167);
             and_restr_connective(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1442:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
-            loop66:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1469:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
+            loop73:
             do {
-                int alt66=2;
-                int LA66_0 = input.LA(1);
+                int alt73=2;
+                int LA73_0 = input.LA(1);
 
-                if ( (LA66_0==DOUBLE_PIPE) ) {
+                if ( (LA73_0==DOUBLE_PIPE) ) {
                     switch ( input.LA(2) ) {
                     case IN:
                         {
-                        int LA66_3 = input.LA(3);
+                        int LA73_3 = input.LA(3);
 
-                        if ( (LA66_3==LEFT_PAREN) ) {
-                            int LA66_6 = input.LA(4);
+                        if ( (LA73_3==LEFT_PAREN) ) {
+                            int LA73_6 = input.LA(4);
 
                             if ( (synpred11()) ) {
-                                alt66=1;
+                                alt73=1;
                             }
 
 
@@ -5629,17 +5908,6 @@
 
                         }
                         break;
-                    case LEFT_PAREN:
-                        {
-                        int LA66_4 = input.LA(3);
-
-                        if ( (synpred11()) ) {
-                            alt66=1;
-                        }
-
-
-                        }
-                        break;
                     case NOT:
                     case CONTAINS:
                     case EXCLUDES:
@@ -5647,33 +5915,44 @@
                     case SOUNDSLIKE:
                     case MEMBEROF:
                     case TILDE:
-                    case 80:
-                    case 81:
                     case 82:
                     case 83:
                     case 84:
                     case 85:
+                    case 86:
+                    case 87:
                         {
-                        alt66=1;
+                        alt73=1;
                         }
                         break;
+                    case LEFT_PAREN:
+                        {
+                        int LA73_5 = input.LA(3);
 
+                        if ( (synpred11()) ) {
+                            alt73=1;
+                        }
+
+
+                        }
+                        break;
+
                     }
 
                 }
 
 
-                switch (alt66) {
+                switch (alt73) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1444:4: DOUBLE_PIPE and_restr_connective[or]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1471:4: DOUBLE_PIPE and_restr_connective[or]
             	    {
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4116); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective4191); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4127);
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective4202);
             	    and_restr_connective(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -5682,7 +5961,7 @@
             	    break;
 
             	default :
-            	    break loop66;
+            	    break loop73;
                 }
             } while (true);
 
@@ -5709,7 +5988,7 @@
 
 
     // $ANTLR start and_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1459:1: and_restr_connective[ RestrictionConnectiveDescr base ] : constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1486:1: and_restr_connective[ RestrictionConnectiveDescr base ] : constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* ;
     public final void and_restr_connective(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
 
@@ -5717,50 +5996,61 @@
         		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1463:2: ( constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1464:3: constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1490:2: ( constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1491:3: constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
             {
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4159);
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4234);
             constraint_expression(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1465:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
-            loop67:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1492:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
+            loop74:
             do {
-                int alt67=2;
-                int LA67_0 = input.LA(1);
+                int alt74=2;
+                int LA74_0 = input.LA(1);
 
-                if ( (LA67_0==DOUBLE_AMPER) ) {
+                if ( (LA74_0==DOUBLE_AMPER) ) {
                     switch ( input.LA(2) ) {
                     case IN:
                         {
-                        int LA67_3 = input.LA(3);
+                        int LA74_3 = input.LA(3);
 
-                        if ( (LA67_3==LEFT_PAREN) ) {
+                        if ( (LA74_3==LEFT_PAREN) ) {
                             switch ( input.LA(4) ) {
                             case IN:
                                 {
-                                int LA67_9 = input.LA(5);
+                                int LA74_9 = input.LA(5);
 
-                                if ( (LA67_9==DOT||(LA67_9>=COMMA && LA67_9<=RIGHT_PAREN)||LA67_9==LEFT_SQUARE) ) {
-                                    alt67=1;
+                                if ( (LA74_9==DOT||(LA74_9>=COMMA && LA74_9<=RIGHT_PAREN)||LA74_9==LEFT_SQUARE) ) {
+                                    alt74=1;
                                 }
 
 
                                 }
                                 break;
+                            case LEFT_PAREN:
+                                {
+                                int LA74_10 = input.LA(5);
+
+                                if ( (synpred12()) ) {
+                                    alt74=1;
+                                }
+
+
+                                }
+                                break;
                             case PACKAGE:
                             case IMPORT:
                             case FUNCTION:
                             case ID:
                             case GLOBAL:
-                            case STRING:
+                            case END:
                             case QUERY:
-                            case END:
                             case TEMPLATE:
                             case RULE:
                             case WHEN:
                             case ATTRIBUTES:
+                            case STRING:
                             case ENABLED:
                             case BOOL:
                             case SALIENCE:
@@ -5777,21 +6067,10 @@
                             case THEN:
                             case EVENT:
                                 {
-                                alt67=1;
+                                alt74=1;
                                 }
                                 break;
-                            case LEFT_PAREN:
-                                {
-                                int LA67_10 = input.LA(5);
 
-                                if ( (synpred12()) ) {
-                                    alt67=1;
-                                }
-
-
-                                }
-                                break;
-
                             }
 
                         }
@@ -5806,14 +6085,14 @@
                     case SOUNDSLIKE:
                     case MEMBEROF:
                     case TILDE:
-                    case 80:
-                    case 81:
                     case 82:
                     case 83:
                     case 84:
                     case 85:
+                    case 86:
+                    case 87:
                         {
-                        alt67=1;
+                        alt74=1;
                         }
                         break;
                     case LEFT_PAREN:
@@ -5821,13 +6100,13 @@
                         switch ( input.LA(3) ) {
                         case IN:
                             {
-                            int LA67_7 = input.LA(4);
+                            int LA74_7 = input.LA(4);
 
-                            if ( (LA67_7==LEFT_PAREN) ) {
-                                int LA67_11 = input.LA(5);
+                            if ( (LA74_7==LEFT_PAREN) ) {
+                                int LA74_11 = input.LA(5);
 
                                 if ( (synpred12()) ) {
-                                    alt67=1;
+                                    alt74=1;
                                 }
 
 
@@ -5838,10 +6117,10 @@
                             break;
                         case LEFT_PAREN:
                             {
-                            int LA67_8 = input.LA(4);
+                            int LA74_8 = input.LA(4);
 
                             if ( (synpred12()) ) {
-                                alt67=1;
+                                alt74=1;
                             }
 
 
@@ -5854,14 +6133,14 @@
                         case SOUNDSLIKE:
                         case MEMBEROF:
                         case TILDE:
-                        case 80:
-                        case 81:
                         case 82:
                         case 83:
                         case 84:
                         case 85:
+                        case 86:
+                        case 87:
                             {
-                            alt67=1;
+                            alt74=1;
                             }
                             break;
 
@@ -5875,18 +6154,18 @@
                 }
 
 
-                switch (alt67) {
+                switch (alt74) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:5: t= DOUBLE_AMPER constraint_expression[and]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493:5: t= DOUBLE_AMPER constraint_expression[and]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4179); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective4254); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4190);
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective4265);
             	    constraint_expression(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -5895,7 +6174,7 @@
             	    break;
 
             	default :
-            	    break loop67;
+            	    break loop74;
                 }
             } while (true);
 
@@ -5922,34 +6201,34 @@
 
 
     // $ANTLR start constraint_expression
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1481:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) ;
     public final void constraint_expression(RestrictionConnectiveDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:9: ( ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1509:9: ( ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1510:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
-            int alt68=3;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1510:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
+            int alt75=3;
             switch ( input.LA(1) ) {
             case IN:
                 {
-                alt68=1;
+                alt75=1;
                 }
                 break;
             case NOT:
                 {
-                int LA68_2 = input.LA(2);
+                int LA75_2 = input.LA(2);
 
-                if ( (LA68_2==CONTAINS||LA68_2==MATCHES||(LA68_2>=MEMBEROF && LA68_2<=TILDE)) ) {
-                    alt68=2;
+                if ( (LA75_2==CONTAINS||LA75_2==MATCHES||(LA75_2>=MEMBEROF && LA75_2<=TILDE)) ) {
+                    alt75=2;
                 }
-                else if ( (LA68_2==IN) ) {
-                    alt68=1;
+                else if ( (LA75_2==IN) ) {
+                    alt75=1;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1483:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 68, 2, input);
+                        new NoViableAltException("1510:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 75, 2, input);
 
                     throw nvae;
                 }
@@ -5961,34 +6240,34 @@
             case SOUNDSLIKE:
             case MEMBEROF:
             case TILDE:
-            case 80:
-            case 81:
             case 82:
             case 83:
             case 84:
             case 85:
+            case 86:
+            case 87:
                 {
-                alt68=2;
+                alt75=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt68=3;
+                alt75=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1483:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 68, 0, input);
+                    new NoViableAltException("1510:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 75, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt68) {
+            switch (alt75) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:5: compound_operator[$base]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1510:5: compound_operator[$base]
                     {
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4227);
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression4302);
                     compound_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -5996,9 +6275,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1484:5: simple_operator[$base]
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1511:5: simple_operator[$base]
                     {
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4234);
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression4309);
                     simple_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -6006,19 +6285,19 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1485:5: LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1512:5: LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4242); if (failed) return ;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression4317); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4251);
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4326);
                     or_restr_connective(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4256); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4331); if (failed) return ;
 
                     }
                     break;
@@ -6041,7 +6320,7 @@
 
 
     // $ANTLR start simple_operator
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1494:1: simple_operator[RestrictionConnectiveDescr base] : (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText] ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1521:1: simple_operator[RestrictionConnectiveDescr base] : (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText] ;
     public final void simple_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
         Token n=null;
@@ -6056,74 +6335,74 @@
         		boolean isNegated = false;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1500:2: ( (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1501:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText]
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1527:2: ( (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText] )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1528:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? ) rd= expression_value[$base, op, isNegated, paramText]
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1501:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )
-            int alt71=16;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1528:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )
+            int alt78=16;
             switch ( input.LA(1) ) {
-            case 80:
+            case 82:
                 {
-                alt71=1;
+                alt78=1;
                 }
                 break;
-            case 81:
+            case 83:
                 {
-                alt71=2;
+                alt78=2;
                 }
                 break;
-            case 82:
+            case 84:
                 {
-                alt71=3;
+                alt78=3;
                 }
                 break;
-            case 83:
+            case 85:
                 {
-                alt71=4;
+                alt78=4;
                 }
                 break;
-            case 84:
+            case 86:
                 {
-                alt71=5;
+                alt78=5;
                 }
                 break;
-            case 85:
+            case 87:
                 {
-                alt71=6;
+                alt78=6;
                 }
                 break;
             case CONTAINS:
                 {
-                alt71=7;
+                alt78=7;
                 }
                 break;
             case NOT:
                 {
                 switch ( input.LA(2) ) {
-                case TILDE:
+                case CONTAINS:
                     {
-                    alt71=16;
+                    alt78=8;
                     }
                     break;
                 case MATCHES:
                     {
-                    alt71=12;
+                    alt78=12;
                     }
                     break;
-                case CONTAINS:
+                case TILDE:
                     {
-                    alt71=8;
+                    alt78=16;
                     }
                     break;
                 case MEMBEROF:
                     {
-                    alt71=14;
+                    alt78=14;
                     }
                     break;
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1501:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )", 71, 8, input);
+                        new NoViableAltException("1528:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )", 78, 8, input);
 
                     throw nvae;
                 }
@@ -6132,174 +6411,174 @@
                 break;
             case EXCLUDES:
                 {
-                alt71=9;
+                alt78=9;
                 }
                 break;
             case MATCHES:
                 {
-                alt71=10;
+                alt78=10;
                 }
                 break;
             case SOUNDSLIKE:
                 {
-                alt71=11;
+                alt78=11;
                 }
                 break;
             case MEMBEROF:
                 {
-                alt71=13;
+                alt78=13;
                 }
                 break;
             case TILDE:
                 {
-                alt71=15;
+                alt78=15;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1501:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )", 71, 0, input);
+                    new NoViableAltException("1528:3: (t= '==' | t= '>' | t= '>=' | t= '<' | t= '<=' | t= '!=' | t= CONTAINS | n= NOT t= CONTAINS | t= EXCLUDES | t= MATCHES | t= SOUNDSLIKE | n= NOT t= MATCHES | t= MEMBEROF | n= NOT t= MEMBEROF | TILDE t= ID (param= square_chunk )? | n= NOT TILDE t= ID (param= square_chunk )? )", 78, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt71) {
+            switch (alt78) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1501:5: t= '=='
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1528:5: t= '=='
                     {
                     t=(Token)input.LT(1);
-                    match(input,80,FOLLOW_80_in_simple_operator4287); if (failed) return ;
+                    match(input,82,FOLLOW_82_in_simple_operator4362); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502:5: t= '>'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1529:5: t= '>'
                     {
                     t=(Token)input.LT(1);
-                    match(input,81,FOLLOW_81_in_simple_operator4295); if (failed) return ;
+                    match(input,83,FOLLOW_83_in_simple_operator4370); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1503:5: t= '>='
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1530:5: t= '>='
                     {
                     t=(Token)input.LT(1);
-                    match(input,82,FOLLOW_82_in_simple_operator4303); if (failed) return ;
+                    match(input,84,FOLLOW_84_in_simple_operator4378); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1504:5: t= '<'
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1531:5: t= '<'
                     {
                     t=(Token)input.LT(1);
-                    match(input,83,FOLLOW_83_in_simple_operator4311); if (failed) return ;
+                    match(input,85,FOLLOW_85_in_simple_operator4386); if (failed) return ;
 
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1505:5: t= '<='
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1532:5: t= '<='
                     {
                     t=(Token)input.LT(1);
-                    match(input,84,FOLLOW_84_in_simple_operator4319); if (failed) return ;
+                    match(input,86,FOLLOW_86_in_simple_operator4394); if (failed) return ;
 
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1506:5: t= '!='
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533:5: t= '!='
                     {
                     t=(Token)input.LT(1);
-                    match(input,85,FOLLOW_85_in_simple_operator4327); if (failed) return ;
+                    match(input,87,FOLLOW_87_in_simple_operator4402); if (failed) return ;
 
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507:25: t= CONTAINS
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1534:25: t= CONTAINS
                     {
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4355); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4430); if (failed) return ;
 
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:25: n= NOT t= CONTAINS
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1535:25: n= NOT t= CONTAINS
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4383); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4458); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4387); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4462); if (failed) return ;
 
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1509:25: t= EXCLUDES
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1536:25: t= EXCLUDES
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4415); if (failed) return ;
+                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4490); if (failed) return ;
 
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1510:25: t= MATCHES
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:25: t= MATCHES
                     {
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4443); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4518); if (failed) return ;
 
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1511:25: t= SOUNDSLIKE
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:25: t= SOUNDSLIKE
                     {
                     t=(Token)input.LT(1);
-                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4471); if (failed) return ;
+                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4546); if (failed) return ;
 
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1512:25: n= NOT t= MATCHES
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1539:25: n= NOT t= MATCHES
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4499); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4574); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4503); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4578); if (failed) return ;
 
                     }
                     break;
                 case 13 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1513:25: t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1540:25: t= MEMBEROF
                     {
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4531); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4606); if (failed) return ;
 
                     }
                     break;
                 case 14 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1514:25: n= NOT t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1541:25: n= NOT t= MEMBEROF
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4559); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4634); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4563); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4638); if (failed) return ;
 
                     }
                     break;
                 case 15 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1515:5: TILDE t= ID (param= square_chunk )?
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1542:5: TILDE t= ID (param= square_chunk )?
                     {
-                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4569); if (failed) return ;
+                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4644); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4573); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1515:21: (param= square_chunk )?
-                    int alt69=2;
-                    int LA69_0 = input.LA(1);
+                    match(input,ID,FOLLOW_ID_in_simple_operator4648); if (failed) return ;
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1542:21: (param= square_chunk )?
+                    int alt76=2;
+                    int LA76_0 = input.LA(1);
 
-                    if ( (LA69_0==LEFT_SQUARE) ) {
-                        alt69=1;
+                    if ( (LA76_0==LEFT_SQUARE) ) {
+                        alt76=1;
                     }
-                    switch (alt69) {
+                    switch (alt76) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1515:21: param= square_chunk
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1542:21: param= square_chunk
                             {
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4577);
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4652);
                             param=square_chunk();
                             _fsp--;
                             if (failed) return ;
@@ -6313,25 +6592,25 @@
                     }
                     break;
                 case 16 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1516:5: n= NOT TILDE t= ID (param= square_chunk )?
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1543:5: n= NOT TILDE t= ID (param= square_chunk )?
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4586); if (failed) return ;
-                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4588); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4661); if (failed) return ;
+                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4663); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4592); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1516:27: (param= square_chunk )?
-                    int alt70=2;
-                    int LA70_0 = input.LA(1);
+                    match(input,ID,FOLLOW_ID_in_simple_operator4667); if (failed) return ;
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1543:27: (param= square_chunk )?
+                    int alt77=2;
+                    int LA77_0 = input.LA(1);
 
-                    if ( (LA70_0==LEFT_SQUARE) ) {
-                        alt70=1;
+                    if ( (LA77_0==LEFT_SQUARE) ) {
+                        alt77=1;
                     }
-                    switch (alt70) {
+                    switch (alt77) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1516:27: param= square_chunk
+                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1543:27: param= square_chunk
                             {
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4596);
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4671);
                             param=square_chunk();
                             _fsp--;
                             if (failed) return ;
@@ -6358,7 +6637,7 @@
                	            } 
               		
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator4611);
+            pushFollow(FOLLOW_expression_value_in_simple_operator4686);
             rd=expression_value(base,  op,  isNegated,  paramText);
             _fsp--;
             if (failed) return ;
@@ -6383,7 +6662,7 @@
 
 
     // $ANTLR start compound_operator
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1535:1: compound_operator[RestrictionConnectiveDescr base] : ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:1: compound_operator[RestrictionConnectiveDescr base] : ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN ;
     public final void compound_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         RestrictionDescr rd = null;
 
@@ -6393,31 +6672,31 @@
         		RestrictionConnectiveDescr group = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1540:2: ( ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1541:3: ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:2: ( ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1568:3: ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op, false, null] ( COMMA rd= expression_value[group, op, false, null] )* RIGHT_PAREN
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1541:3: ( IN | NOT IN )
-            int alt72=2;
-            int LA72_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1568:3: ( IN | NOT IN )
+            int alt79=2;
+            int LA79_0 = input.LA(1);
 
-            if ( (LA72_0==IN) ) {
-                alt72=1;
+            if ( (LA79_0==IN) ) {
+                alt79=1;
             }
-            else if ( (LA72_0==NOT) ) {
-                alt72=2;
+            else if ( (LA79_0==NOT) ) {
+                alt79=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1541:3: ( IN | NOT IN )", 72, 0, input);
+                    new NoViableAltException("1568:3: ( IN | NOT IN )", 79, 0, input);
 
                 throw nvae;
             }
-            switch (alt72) {
+            switch (alt79) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1541:5: IN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1568:5: IN
                     {
-                    match(input,IN,FOLLOW_IN_in_compound_operator4641); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4716); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "==";
@@ -6431,10 +6710,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1549:5: NOT IN
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1576:5: NOT IN
                     {
-                    match(input,NOT,FOLLOW_NOT_in_compound_operator4653); if (failed) return ;
-                    match(input,IN,FOLLOW_IN_in_compound_operator4655); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_compound_operator4728); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4730); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "!=";
@@ -6450,28 +6729,28 @@
 
             }
 
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4670); if (failed) return ;
-            pushFollow(FOLLOW_expression_value_in_compound_operator4674);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4745); if (failed) return ;
+            pushFollow(FOLLOW_expression_value_in_compound_operator4749);
             rd=expression_value(group,  op,  false,  null);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1559:3: ( COMMA rd= expression_value[group, op, false, null] )*
-            loop73:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1586:3: ( COMMA rd= expression_value[group, op, false, null] )*
+            loop80:
             do {
-                int alt73=2;
-                int LA73_0 = input.LA(1);
+                int alt80=2;
+                int LA80_0 = input.LA(1);
 
-                if ( (LA73_0==COMMA) ) {
-                    alt73=1;
+                if ( (LA80_0==COMMA) ) {
+                    alt80=1;
                 }
 
 
-                switch (alt73) {
+                switch (alt80) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1559:5: COMMA rd= expression_value[group, op, false, null]
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1586:5: COMMA rd= expression_value[group, op, false, null]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4681); if (failed) return ;
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator4685);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4756); if (failed) return ;
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4760);
             	    rd=expression_value(group,  op,  false,  null);
             	    _fsp--;
             	    if (failed) return ;
@@ -6480,11 +6759,11 @@
             	    break;
 
             	default :
-            	    break loop73;
+            	    break loop80;
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4694); if (failed) return ;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4769); if (failed) return ;
             if ( backtracking==0 ) {
 
               			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
@@ -6506,7 +6785,7 @@
 
 
     // $ANTLR start expression_value
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1566:1: expression_value[RestrictionConnectiveDescr base, String op, boolean isNegated, String paramText] returns [RestrictionDescr rd] : (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1593:1: expression_value[RestrictionConnectiveDescr base, String op, boolean isNegated, String paramText] returns [RestrictionDescr rd] : (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) ;
     public final RestrictionDescr expression_value(RestrictionConnectiveDescr base, String op, boolean isNegated, String paramText) throws RecognitionException {
         RestrictionDescr rd = null;
 
@@ -6521,19 +6800,19 @@
         		rd = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1570:2: ( (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1597:2: ( (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1598:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
-            int alt74=3;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1598:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
+            int alt81=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
             case IMPORT:
             case FUNCTION:
             case ID:
             case GLOBAL:
+            case END:
             case QUERY:
-            case END:
             case TEMPLATE:
             case RULE:
             case WHEN:
@@ -6551,7 +6830,7 @@
             case THEN:
             case EVENT:
                 {
-                alt74=1;
+                alt81=1;
                 }
                 break;
             case STRING:
@@ -6560,27 +6839,27 @@
             case FLOAT:
             case NULL:
                 {
-                alt74=2;
+                alt81=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt74=3;
+                alt81=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return rd;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1571:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 74, 0, input);
+                    new NoViableAltException("1598:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 81, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt74) {
+            switch (alt81) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571:5: ap= accessor_path
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1598:5: ap= accessor_path
                     {
-                    pushFollow(FOLLOW_accessor_path_in_expression_value4728);
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4803);
                     ap=accessor_path();
                     _fsp--;
                     if (failed) return rd;
@@ -6597,9 +6876,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1579:5: lc= literal_constraint
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1606:5: lc= literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value4748);
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4823);
                     lc=literal_constraint();
                     _fsp--;
                     if (failed) return rd;
@@ -6612,9 +6891,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1583:5: rvc= paren_chunk
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1610:5: rvc= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value4762);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4837);
                     rvc=paren_chunk();
                     _fsp--;
                     if (failed) return rd;
@@ -6657,7 +6936,7 @@
     };
 
     // $ANTLR start literal_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1596:1: literal_constraint returns [String text, int type] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1623:1: literal_constraint returns [String text, int type] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) ;
     public final literal_constraint_return literal_constraint() throws RecognitionException {
         literal_constraint_return retval = new literal_constraint_return();
         retval.start = input.LT(1);
@@ -6668,51 +6947,51 @@
         		retval.text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:2: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:2: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
-            int alt75=5;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            int alt82=5;
             switch ( input.LA(1) ) {
             case STRING:
                 {
-                alt75=1;
+                alt82=1;
                 }
                 break;
             case INT:
                 {
-                alt75=2;
+                alt82=2;
                 }
                 break;
             case FLOAT:
                 {
-                alt75=3;
+                alt82=3;
                 }
                 break;
             case BOOL:
                 {
-                alt75=4;
+                alt82=4;
                 }
                 break;
             case NULL:
                 {
-                alt75=5;
+                alt82=5;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1600:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 75, 0, input);
+                    new NoViableAltException("1627:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 82, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt75) {
+            switch (alt82) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:6: t= STRING
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:6: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4805); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4880); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = getString( t.getText() ); retval.type = LiteralRestrictionDescr.TYPE_STRING; 
                     }
@@ -6720,10 +6999,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1601:5: t= INT
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1628:5: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint4816); if (failed) return retval;
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4891); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6731,10 +7010,10 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1602:5: t= FLOAT
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1629:5: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4829); if (failed) return retval;
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4904); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6742,10 +7021,10 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1603:5: t= BOOL
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1630:5: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4840); if (failed) return retval;
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4915); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_BOOLEAN; 
                     }
@@ -6753,10 +7032,10 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:5: t= NULL
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1631:5: t= NULL
                     {
                     t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4852); if (failed) return retval;
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4927); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = null; retval.type = LiteralRestrictionDescr.TYPE_NULL; 
                     }
@@ -6784,7 +7063,7 @@
 
 
     // $ANTLR start predicate
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1608:1: predicate[ConditionalElementDescr base] : text= paren_chunk ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1635:1: predicate[ConditionalElementDescr base] : text= paren_chunk ;
     public final void predicate(ConditionalElementDescr base) throws RecognitionException {
         paren_chunk_return text = null;
 
@@ -6793,10 +7072,10 @@
         		PredicateDescr d = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1612:2: (text= paren_chunk )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1613:3: text= paren_chunk
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:2: (text= paren_chunk )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1640:3: text= paren_chunk
             {
-            pushFollow(FOLLOW_paren_chunk_in_predicate4890);
+            pushFollow(FOLLOW_paren_chunk_in_predicate4965);
             text=paren_chunk();
             _fsp--;
             if (failed) return ;
@@ -6828,35 +7107,35 @@
     };
 
     // $ANTLR start curly_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1625:1: curly_chunk : LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1652:1: curly_chunk : LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY ;
     public final curly_chunk_return curly_chunk() throws RecognitionException {
         curly_chunk_return retval = new curly_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1626:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:3: LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1653:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:3: LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY
             {
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk4908); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:14: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )*
-            loop76:
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk4983); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:14: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )*
+            loop83:
             do {
-                int alt76=3;
-                int LA76_0 = input.LA(1);
+                int alt83=3;
+                int LA83_0 = input.LA(1);
 
-                if ( ((LA76_0>=PACKAGE && LA76_0<=DECLARE)||(LA76_0>=STRING && LA76_0<=85)) ) {
-                    alt76=1;
+                if ( ((LA83_0>=PACKAGE && LA83_0<=NULL)||(LA83_0>=THEN && LA83_0<=87)) ) {
+                    alt83=1;
                 }
-                else if ( (LA76_0==LEFT_CURLY) ) {
-                    alt76=2;
+                else if ( (LA83_0==LEFT_CURLY) ) {
+                    alt83=2;
                 }
 
 
-                switch (alt76) {
+                switch (alt83) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=DECLARE)||(input.LA(1)>=STRING && input.LA(1)<=85) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=THEN && input.LA(1)<=87) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6864,16 +7143,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4912);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4987);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:44: curly_chunk
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1654:44: curly_chunk
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4921);
+            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4996);
             	    curly_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6882,11 +7161,11 @@
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop83;
                 }
             } while (true);
 
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk4926); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk5001); if (failed) return retval;
 
             }
 
@@ -6907,35 +7186,35 @@
     };
 
     // $ANTLR start paren_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1630:1: paren_chunk : LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:1: paren_chunk : LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN ;
     public final paren_chunk_return paren_chunk() throws RecognitionException {
         paren_chunk_return retval = new paren_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1631:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1632:3: LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1658:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:3: LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN
             {
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk4940); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1632:14: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )*
-            loop77:
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk5015); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:14: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )*
+            loop84:
             do {
-                int alt77=3;
-                int LA77_0 = input.LA(1);
+                int alt84=3;
+                int LA84_0 = input.LA(1);
 
-                if ( ((LA77_0>=PACKAGE && LA77_0<=GLOBAL)||LA77_0==COMMA||(LA77_0>=DECLARE && LA77_0<=85)) ) {
-                    alt77=1;
+                if ( ((LA84_0>=PACKAGE && LA84_0<=GLOBAL)||LA84_0==COMMA||(LA84_0>=DECLARE && LA84_0<=87)) ) {
+                    alt84=1;
                 }
-                else if ( (LA77_0==LEFT_PAREN) ) {
-                    alt77=2;
+                else if ( (LA84_0==LEFT_PAREN) ) {
+                    alt84=2;
                 }
 
 
-                switch (alt77) {
+                switch (alt84) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1632:16: ~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:16: ~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=GLOBAL)||input.LA(1)==COMMA||(input.LA(1)>=DECLARE && input.LA(1)<=85) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=GLOBAL)||input.LA(1)==COMMA||(input.LA(1)>=DECLARE && input.LA(1)<=87) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6943,16 +7222,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk4944);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk5019);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1632:44: paren_chunk
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:44: paren_chunk
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk4953);
+            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk5028);
             	    paren_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6961,11 +7240,11 @@
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop84;
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk4958); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk5033); if (failed) return retval;
 
             }
 
@@ -6986,35 +7265,35 @@
     };
 
     // $ANTLR start square_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1635:1: square_chunk : LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1662:1: square_chunk : LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE ;
     public final square_chunk_return square_chunk() throws RecognitionException {
         square_chunk_return retval = new square_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1636:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:3: LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1663:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1664:3: LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE
             {
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk4971); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:15: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )*
-            loop78:
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk5046); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1664:15: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )*
+            loop85:
             do {
-                int alt78=3;
-                int LA78_0 = input.LA(1);
+                int alt85=3;
+                int LA85_0 = input.LA(1);
 
-                if ( ((LA78_0>=PACKAGE && LA78_0<=NULL)||(LA78_0>=THEN && LA78_0<=85)) ) {
-                    alt78=1;
+                if ( ((LA85_0>=PACKAGE && LA85_0<=ENTRY_POINT)||(LA85_0>=CONTAINS && LA85_0<=87)) ) {
+                    alt85=1;
                 }
-                else if ( (LA78_0==LEFT_SQUARE) ) {
-                    alt78=2;
+                else if ( (LA85_0==LEFT_SQUARE) ) {
+                    alt85=2;
                 }
 
 
-                switch (alt78) {
+                switch (alt85) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1664:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=THEN && input.LA(1)<=85) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=ENTRY_POINT)||(input.LA(1)>=CONTAINS && input.LA(1)<=87) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -7022,16 +7301,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk4975);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk5050);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:47: square_chunk
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1664:47: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_square_chunk4984);
+            	    pushFollow(FOLLOW_square_chunk_in_square_chunk5059);
             	    square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -7040,11 +7319,11 @@
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop85;
                 }
             } while (true);
 
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk4989); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk5064); if (failed) return retval;
 
             }
 
@@ -7066,7 +7345,7 @@
     };
 
     // $ANTLR start qualified_id
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1640:1: qualified_id returns [ String text ] : ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1667:1: qualified_id returns [ String text ] : ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
     public final qualified_id_return qualified_id() throws RecognitionException {
         qualified_id_return retval = new qualified_id_return();
         retval.start = input.LT(1);
@@ -7079,31 +7358,31 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:2: ( ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:5: ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:2: ( ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:5: ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
             {
             ID53=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_qualified_id5018); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_qualified_id5093); if (failed) return retval;
             if ( backtracking==0 ) {
               buf.append(ID53.getText());
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:32: ( DOT identifier )*
-            loop79:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:32: ( DOT identifier )*
+            loop86:
             do {
-                int alt79=2;
-                int LA79_0 = input.LA(1);
+                int alt86=2;
+                int LA86_0 = input.LA(1);
 
-                if ( (LA79_0==DOT) ) {
-                    alt79=1;
+                if ( (LA86_0==DOT) ) {
+                    alt86=1;
                 }
 
 
-                switch (alt79) {
+                switch (alt86) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:34: DOT identifier
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:34: DOT identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_qualified_id5024); if (failed) return retval;
-            	    pushFollow(FOLLOW_identifier_in_qualified_id5026);
+            	    match(input,DOT,FOLLOW_DOT_in_qualified_id5099); if (failed) return retval;
+            	    pushFollow(FOLLOW_identifier_in_qualified_id5101);
             	    identifier54=identifier();
             	    _fsp--;
             	    if (failed) return retval;
@@ -7115,27 +7394,27 @@
             	    break;
 
             	default :
-            	    break loop79;
+            	    break loop86;
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:88: ( LEFT_SQUARE RIGHT_SQUARE )*
-            loop80:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:88: ( LEFT_SQUARE RIGHT_SQUARE )*
+            loop87:
             do {
-                int alt80=2;
-                int LA80_0 = input.LA(1);
+                int alt87=2;
+                int LA87_0 = input.LA(1);
 
-                if ( (LA80_0==LEFT_SQUARE) ) {
-                    alt80=1;
+                if ( (LA87_0==LEFT_SQUARE) ) {
+                    alt87=1;
                 }
 
 
-                switch (alt80) {
+                switch (alt87) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1647:90: LEFT_SQUARE RIGHT_SQUARE
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:90: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_qualified_id5035); if (failed) return retval;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_qualified_id5037); if (failed) return retval;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_qualified_id5110); if (failed) return retval;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_qualified_id5112); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -7144,7 +7423,7 @@
             	    break;
 
             	default :
-            	    break loop80;
+            	    break loop87;
                 }
             } while (true);
 
@@ -7171,7 +7450,7 @@
 
 
     // $ANTLR start dotted_name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1650:1: dotted_name returns [ String text ] : i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1677:1: dotted_name returns [ String text ] : i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
     public final String dotted_name() throws RecognitionException {
         String text = null;
 
@@ -7182,33 +7461,33 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:2: (i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:4: i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:2: (i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:4: i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
             {
-            pushFollow(FOLLOW_identifier_in_dotted_name5071);
+            pushFollow(FOLLOW_identifier_in_dotted_name5146);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:40: ( DOT i= identifier )*
-            loop81:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:40: ( DOT i= identifier )*
+            loop88:
             do {
-                int alt81=2;
-                int LA81_0 = input.LA(1);
+                int alt88=2;
+                int LA88_0 = input.LA(1);
 
-                if ( (LA81_0==DOT) ) {
-                    alt81=1;
+                if ( (LA88_0==DOT) ) {
+                    alt88=1;
                 }
 
 
-                switch (alt81) {
+                switch (alt88) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:42: DOT i= identifier
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:42: DOT i= identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_dotted_name5077); if (failed) return text;
-            	    pushFollow(FOLLOW_identifier_in_dotted_name5081);
+            	    match(input,DOT,FOLLOW_DOT_in_dotted_name5152); if (failed) return text;
+            	    pushFollow(FOLLOW_identifier_in_dotted_name5156);
             	    i=identifier();
             	    _fsp--;
             	    if (failed) return text;
@@ -7220,27 +7499,27 @@
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop88;
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:89: ( LEFT_SQUARE RIGHT_SQUARE )*
-            loop82:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:89: ( LEFT_SQUARE RIGHT_SQUARE )*
+            loop89:
             do {
-                int alt82=2;
-                int LA82_0 = input.LA(1);
+                int alt89=2;
+                int LA89_0 = input.LA(1);
 
-                if ( (LA82_0==LEFT_SQUARE) ) {
-                    alt82=1;
+                if ( (LA89_0==LEFT_SQUARE) ) {
+                    alt89=1;
                 }
 
 
-                switch (alt82) {
+                switch (alt89) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1657:91: LEFT_SQUARE RIGHT_SQUARE
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:91: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name5090); if (failed) return text;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name5092); if (failed) return text;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name5165); if (failed) return text;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name5167); if (failed) return text;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -7249,7 +7528,7 @@
             	    break;
 
             	default :
-            	    break loop82;
+            	    break loop89;
                 }
             } while (true);
 
@@ -7277,7 +7556,7 @@
     };
 
     // $ANTLR start accessor_path
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1660:1: accessor_path returns [ String text ] : a= accessor_element ( DOT a= accessor_element )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1687:1: accessor_path returns [ String text ] : a= accessor_element ( DOT a= accessor_element )* ;
     public final accessor_path_return accessor_path() throws RecognitionException {
         accessor_path_return retval = new accessor_path_return();
         retval.start = input.LT(1);
@@ -7289,33 +7568,33 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1667:2: (a= accessor_element ( DOT a= accessor_element )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1667:4: a= accessor_element ( DOT a= accessor_element )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:2: (a= accessor_element ( DOT a= accessor_element )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:4: a= accessor_element ( DOT a= accessor_element )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path5126);
+            pushFollow(FOLLOW_accessor_element_in_accessor_path5201);
             a=accessor_element();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) {
               buf.append(a);
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1667:46: ( DOT a= accessor_element )*
-            loop83:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:46: ( DOT a= accessor_element )*
+            loop90:
             do {
-                int alt83=2;
-                int LA83_0 = input.LA(1);
+                int alt90=2;
+                int LA90_0 = input.LA(1);
 
-                if ( (LA83_0==DOT) ) {
-                    alt83=1;
+                if ( (LA90_0==DOT) ) {
+                    alt90=1;
                 }
 
 
-                switch (alt83) {
+                switch (alt90) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1667:48: DOT a= accessor_element
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1694:48: DOT a= accessor_element
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path5132); if (failed) return retval;
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path5136);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path5207); if (failed) return retval;
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path5211);
             	    a=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
@@ -7327,7 +7606,7 @@
             	    break;
 
             	default :
-            	    break loop83;
+            	    break loop90;
                 }
             } while (true);
 
@@ -7354,7 +7633,7 @@
 
 
     // $ANTLR start accessor_element
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:1: accessor_element returns [ String text ] : i= identifier (s= square_chunk )* ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1697:1: accessor_element returns [ String text ] : i= identifier (s= square_chunk )* ;
     public final String accessor_element() throws RecognitionException {
         String text = null;
 
@@ -7367,32 +7646,32 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1677:2: (i= identifier (s= square_chunk )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1678:3: i= identifier (s= square_chunk )*
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1704:2: (i= identifier (s= square_chunk )* )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1705:3: i= identifier (s= square_chunk )*
             {
-            pushFollow(FOLLOW_identifier_in_accessor_element5174);
+            pushFollow(FOLLOW_identifier_in_accessor_element5249);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1678:39: (s= square_chunk )*
-            loop84:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1705:39: (s= square_chunk )*
+            loop91:
             do {
-                int alt84=2;
-                int LA84_0 = input.LA(1);
+                int alt91=2;
+                int LA91_0 = input.LA(1);
 
-                if ( (LA84_0==LEFT_SQUARE) ) {
-                    alt84=1;
+                if ( (LA91_0==LEFT_SQUARE) ) {
+                    alt91=1;
                 }
 
 
-                switch (alt84) {
+                switch (alt91) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1678:40: s= square_chunk
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1705:40: s= square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element5181);
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element5256);
             	    s=square_chunk();
             	    _fsp--;
             	    if (failed) return text;
@@ -7404,7 +7683,7 @@
             	    break;
 
             	default :
-            	    break loop84;
+            	    break loop91;
                 }
             } while (true);
 
@@ -7429,36 +7708,36 @@
 
 
     // $ANTLR start rhs_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1681:1: rhs_chunk[RuleDescr rule] : THEN (~ END )* loc= END opt_semicolon ;
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:1: rhs_chunk[RuleDescr rule] : THEN (~ END )* loc= END opt_semicolon ;
     public final void rhs_chunk(RuleDescr rule) throws RecognitionException {
         Token loc=null;
         Token THEN55=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1682:2: ( THEN (~ END )* loc= END opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1683:3: THEN (~ END )* loc= END opt_semicolon
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:2: ( THEN (~ END )* loc= END opt_semicolon )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1710:3: THEN (~ END )* loc= END opt_semicolon
             {
             THEN55=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk5202); if (failed) return ;
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk5277); if (failed) return ;
             if ( backtracking==0 ) {
                location.setType( Location.LOCATION_RHS ); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:3: (~ END )*
-            loop85:
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1711:3: (~ END )*
+            loop92:
             do {
-                int alt85=2;
-                int LA85_0 = input.LA(1);
+                int alt92=2;
+                int LA92_0 = input.LA(1);
 
-                if ( ((LA85_0>=PACKAGE && LA85_0<=QUERY)||(LA85_0>=TEMPLATE && LA85_0<=85)) ) {
-                    alt85=1;
+                if ( ((LA92_0>=PACKAGE && LA92_0<=DECLARE)||(LA92_0>=AT && LA92_0<=87)) ) {
+                    alt92=1;
                 }
 
 
-                switch (alt85) {
+                switch (alt92) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1684:5: ~ END
+            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1711:5: ~ END
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=85) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=DECLARE)||(input.LA(1)>=AT && input.LA(1)<=87) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -7466,7 +7745,7 @@
             	        if (backtracking>0) {failed=true; return ;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk5210);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk5285);    throw mse;
             	    }
 
 
@@ -7474,13 +7753,13 @@
             	    break;
 
             	default :
-            	    break loop85;
+            	    break loop92;
                 }
             } while (true);
 
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk5234); if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk5236);
+            match(input,END,FOLLOW_END_in_rhs_chunk5309); if (failed) return ;
+            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk5311);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -7521,7 +7800,7 @@
     };
 
     // $ANTLR start name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1704:1: name returns [String name] : ( ID | STRING );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:1: name returns [String name] : ( ID | STRING );
     public final name_return name() throws RecognitionException {
         name_return retval = new name_return();
         retval.start = input.LT(1);
@@ -7530,29 +7809,29 @@
         Token STRING57=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1705:2: ( ID | STRING )
-            int alt86=2;
-            int LA86_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:2: ( ID | STRING )
+            int alt93=2;
+            int LA93_0 = input.LA(1);
 
-            if ( (LA86_0==ID) ) {
-                alt86=1;
+            if ( (LA93_0==ID) ) {
+                alt93=1;
             }
-            else if ( (LA86_0==STRING) ) {
-                alt86=2;
+            else if ( (LA93_0==STRING) ) {
+                alt93=2;
             }
             else {
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1704:1: name returns [String name] : ( ID | STRING );", 86, 0, input);
+                    new NoViableAltException("1731:1: name returns [String name] : ( ID | STRING );", 93, 0, input);
 
                 throw nvae;
             }
-            switch (alt86) {
+            switch (alt93) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1705:5: ID
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:5: ID
                     {
                     ID56=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_name5270); if (failed) return retval;
+                    match(input,ID,FOLLOW_ID_in_name5345); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.name = ID56.getText(); 
                     }
@@ -7560,10 +7839,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:5: STRING
+                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:5: STRING
                     {
                     STRING57=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_name5278); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_name5353); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.name = getString( STRING57.getText() ); 
                     }
@@ -7589,16 +7868,16 @@
     };
 
     // $ANTLR start identifier
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:1: identifier : ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | WHEN | THEN | END | IN );
+    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:1: identifier : ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | WHEN | THEN | END | IN );
     public final identifier_return identifier() throws RecognitionException {
         identifier_return retval = new identifier_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1710:2: ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | WHEN | THEN | END | IN )
+            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1737:2: ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | WHEN | THEN | END | IN )
             // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
             {
-            if ( (input.LA(1)>=PACKAGE && input.LA(1)<=ID)||input.LA(1)==GLOBAL||(input.LA(1)>=QUERY && input.LA(1)<=ATTRIBUTES)||input.LA(1)==ENABLED||input.LA(1)==SALIENCE||(input.LA(1)>=DURATION && input.LA(1)<=DIALECT)||input.LA(1)==FROM||(input.LA(1)>=INIT && input.LA(1)<=RESULT)||input.LA(1)==IN||(input.LA(1)>=THEN && input.LA(1)<=EVENT) ) {
+            if ( (input.LA(1)>=PACKAGE && input.LA(1)<=ID)||input.LA(1)==GLOBAL||input.LA(1)==END||(input.LA(1)>=QUERY && input.LA(1)<=ATTRIBUTES)||input.LA(1)==ENABLED||input.LA(1)==SALIENCE||(input.LA(1)>=DURATION && input.LA(1)<=DIALECT)||input.LA(1)==FROM||(input.LA(1)>=INIT && input.LA(1)<=RESULT)||input.LA(1)==IN||(input.LA(1)>=THEN && input.LA(1)<=EVENT) ) {
                 input.consume();
                 errorRecovery=false;failed=false;
             }
@@ -7627,10 +7906,10 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:6: ( EXISTS )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:8: EXISTS
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:6: ( EXISTS )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:8: EXISTS
         {
-        match(input,EXISTS,FOLLOW_EXISTS_in_synpred12216); if (failed) return ;
+        match(input,EXISTS,FOLLOW_EXISTS_in_synpred12233); if (failed) return ;
 
         }
     }
@@ -7638,10 +7917,10 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:828:5: ( NOT )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:828:7: NOT
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:5: ( NOT )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:7: NOT
         {
-        match(input,NOT,FOLLOW_NOT_in_synpred22234); if (failed) return ;
+        match(input,NOT,FOLLOW_NOT_in_synpred22251); if (failed) return ;
 
         }
     }
@@ -7649,10 +7928,10 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:829:5: ( EVAL )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:829:7: EVAL
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:5: ( EVAL )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:848:7: EVAL
         {
-        match(input,EVAL,FOLLOW_EVAL_in_synpred32253); if (failed) return ;
+        match(input,EVAL,FOLLOW_EVAL_in_synpred32270); if (failed) return ;
 
         }
     }
@@ -7660,10 +7939,10 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:830:5: ( FORALL )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:830:7: FORALL
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:5: ( FORALL )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:7: FORALL
         {
-        match(input,FORALL,FOLLOW_FORALL_in_synpred42272); if (failed) return ;
+        match(input,FORALL,FOLLOW_FORALL_in_synpred42289); if (failed) return ;
 
         }
     }
@@ -7671,10 +7950,10 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:5: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:7: LEFT_PAREN
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:850:5: ( LEFT_PAREN )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:850:7: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred52291); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred52308); if (failed) return ;
 
         }
     }
@@ -7682,11 +7961,11 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:13: ( FROM ENTRY_POINT )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:14: FROM ENTRY_POINT
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:13: ( FROM ENTRY_POINT )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:14: FROM ENTRY_POINT
         {
-        match(input,FROM,FOLLOW_FROM_in_synpred62397); if (failed) return ;
-        match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_synpred62399); if (failed) return ;
+        match(input,FROM,FOLLOW_FROM_in_synpred62414); if (failed) return ;
+        match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_synpred62416); if (failed) return ;
 
         }
     }
@@ -7694,10 +7973,10 @@
 
     // $ANTLR start synpred9
     public final void synpred9_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:6: ( LEFT_SQUARE )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:8: LEFT_SQUARE
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1141:6: ( LEFT_SQUARE )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1141:8: LEFT_SQUARE
         {
-        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred93338); if (failed) return ;
+        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred93355); if (failed) return ;
 
         }
     }
@@ -7705,10 +7984,10 @@
 
     // $ANTLR start synpred10
     public final void synpred10_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1128:6: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1128:8: LEFT_PAREN
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1147:6: ( LEFT_PAREN )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1147:8: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred103371); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred103388); if (failed) return ;
 
         }
     }
@@ -7716,11 +7995,11 @@
 
     // $ANTLR start synpred11
     public final void synpred11_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1444:4: ( DOUBLE_PIPE and_restr_connective[or] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1444:4: DOUBLE_PIPE and_restr_connective[or]
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1471:4: ( DOUBLE_PIPE and_restr_connective[or] )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1471:4: DOUBLE_PIPE and_restr_connective[or]
         {
-        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred114116); if (failed) return ;
-        pushFollow(FOLLOW_and_restr_connective_in_synpred114127);
+        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred114191); if (failed) return ;
+        pushFollow(FOLLOW_and_restr_connective_in_synpred114202);
         and_restr_connective(or);
         _fsp--;
         if (failed) return ;
@@ -7731,11 +8010,11 @@
 
     // $ANTLR start synpred12
     public final void synpred12_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:5: ( DOUBLE_AMPER constraint_expression[and] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1466:5: DOUBLE_AMPER constraint_expression[and]
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493:5: ( DOUBLE_AMPER constraint_expression[and] )
+        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493:5: DOUBLE_AMPER constraint_expression[and]
         {
-        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred124179); if (failed) return ;
-        pushFollow(FOLLOW_constraint_expression_in_synpred124190);
+        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred124254); if (failed) return ;
+        pushFollow(FOLLOW_constraint_expression_in_synpred124265);
         constraint_expression(and);
         _fsp--;
         if (failed) return ;
@@ -7744,11 +8023,11 @@
     }
     // $ANTLR end synpred12
 
-    public final boolean synpred9() {
+    public final boolean synpred12() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred9_fragment(); // can never throw exception
+            synpred12_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7758,11 +8037,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred5() {
+    public final boolean synpred4() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred5_fragment(); // can never throw exception
+            synpred4_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7772,11 +8051,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred6() {
+    public final boolean synpred9() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred6_fragment(); // can never throw exception
+            synpred9_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7786,11 +8065,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred10() {
+    public final boolean synpred2() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred10_fragment(); // can never throw exception
+            synpred2_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7800,11 +8079,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred1() {
+    public final boolean synpred3() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred1_fragment(); // can never throw exception
+            synpred3_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7814,11 +8093,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred11() {
+    public final boolean synpred1() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred11_fragment(); // can never throw exception
+            synpred1_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7828,11 +8107,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred2() {
+    public final boolean synpred11() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred2_fragment(); // can never throw exception
+            synpred11_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7842,11 +8121,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred12() {
+    public final boolean synpred5() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred12_fragment(); // can never throw exception
+            synpred5_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7856,11 +8135,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred3() {
+    public final boolean synpred6() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred3_fragment(); // can never throw exception
+            synpred6_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7870,11 +8149,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred4() {
+    public final boolean synpred10() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred4_fragment(); // can never throw exception
+            synpred10_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7888,32 +8167,33 @@
 
     protected DFA8 dfa8 = new DFA8(this);
     protected DFA9 dfa9 = new DFA9(this);
-    protected DFA19 dfa19 = new DFA19(this);
-    protected DFA54 dfa54 = new DFA54(this);
+    protected DFA21 dfa21 = new DFA21(this);
+    protected DFA56 dfa56 = new DFA56(this);
     static final String DFA8_eotS =
         "\6\uffff";
     static final String DFA8_eofS =
         "\6\uffff";
     static final String DFA8_minS =
-        "\2\4\1\77\2\uffff\1\4";
+        "\2\4\1\uffff\1\67\1\uffff\1\4";
     static final String DFA8_maxS =
-        "\2\101\1\77\2\uffff\1\101";
+        "\2\104\1\uffff\1\67\1\uffff\1\104";
     static final String DFA8_acceptS =
-        "\3\uffff\1\2\1\1\1\uffff";
+        "\2\uffff\1\1\1\uffff\1\2\1\uffff";
     static final String DFA8_specialS =
         "\6\uffff}>";
     static final String[] DFA8_transitionS = {
-            "\4\1\1\uffff\1\1\7\uffff\6\1\2\uffff\1\1\1\uffff\1\1\6\uffff"+
-            "\2\1\5\uffff\1\1\5\uffff\4\1\10\uffff\1\1\4\uffff\2\1",
-            "\6\4\1\uffff\2\3\4\uffff\6\4\2\uffff\1\4\1\uffff\1\4\6\uffff"+
-            "\2\4\5\uffff\1\4\5\uffff\4\4\10\uffff\1\4\2\uffff\1\2\1\uffff"+
-            "\2\4",
+            "\4\1\1\uffff\1\1\4\uffff\1\1\3\uffff\5\1\3\uffff\1\1\1\uffff"+
+            "\1\1\6\uffff\2\1\5\uffff\1\1\5\uffff\4\1\12\uffff\1\1\4\uffff"+
+            "\2\1",
+            "\6\2\1\uffff\2\4\1\uffff\1\2\3\uffff\5\2\3\uffff\1\2\1\uffff"+
+            "\1\2\6\uffff\2\2\5\uffff\1\2\5\uffff\4\2\2\uffff\1\3\7\uffff"+
+            "\1\2\4\uffff\2\2",
+            "",
             "\1\5",
             "",
-            "",
-            "\4\4\1\uffff\1\4\1\uffff\2\3\4\uffff\6\4\2\uffff\1\4\1\uffff"+
-            "\1\4\6\uffff\2\4\5\uffff\1\4\5\uffff\4\4\10\uffff\1\4\2\uffff"+
-            "\1\2\1\uffff\2\4"
+            "\4\2\1\uffff\1\2\1\uffff\2\4\1\uffff\1\2\3\uffff\5\2\3\uffff"+
+            "\1\2\1\uffff\1\2\6\uffff\2\2\5\uffff\1\2\5\uffff\4\2\2\uffff"+
+            "\1\3\7\uffff\1\2\4\uffff\2\2"
     };
 
     static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
@@ -7954,25 +8234,26 @@
     static final String DFA9_eofS =
         "\6\uffff";
     static final String DFA9_minS =
-        "\2\4\1\uffff\1\77\1\uffff\1\4";
+        "\2\4\1\67\2\uffff\1\4";
     static final String DFA9_maxS =
-        "\2\101\1\uffff\1\77\1\uffff\1\101";
+        "\2\104\1\67\2\uffff\1\104";
     static final String DFA9_acceptS =
-        "\2\uffff\1\1\1\uffff\1\2\1\uffff";
+        "\3\uffff\1\2\1\1\1\uffff";
     static final String DFA9_specialS =
         "\6\uffff}>";
     static final String[] DFA9_transitionS = {
-            "\4\1\1\uffff\1\1\7\uffff\6\1\2\uffff\1\1\1\uffff\1\1\6\uffff"+
-            "\2\1\5\uffff\1\1\5\uffff\4\1\10\uffff\1\1\4\uffff\2\1",
-            "\6\2\1\uffff\2\4\4\uffff\6\2\2\uffff\1\2\1\uffff\1\2\6\uffff"+
-            "\2\2\5\uffff\1\2\5\uffff\4\2\10\uffff\1\2\2\uffff\1\3\1\uffff"+
-            "\2\2",
-            "",
+            "\4\1\1\uffff\1\1\4\uffff\1\1\3\uffff\5\1\3\uffff\1\1\1\uffff"+
+            "\1\1\6\uffff\2\1\5\uffff\1\1\5\uffff\4\1\12\uffff\1\1\4\uffff"+
+            "\2\1",
+            "\6\4\1\uffff\2\3\1\uffff\1\4\3\uffff\5\4\3\uffff\1\4\1\uffff"+
+            "\1\4\6\uffff\2\4\5\uffff\1\4\5\uffff\4\4\2\uffff\1\2\7\uffff"+
+            "\1\4\4\uffff\2\4",
             "\1\5",
             "",
-            "\4\2\1\uffff\1\2\1\uffff\2\4\4\uffff\6\2\2\uffff\1\2\1\uffff"+
-            "\1\2\6\uffff\2\2\5\uffff\1\2\5\uffff\4\2\10\uffff\1\2\2\uffff"+
-            "\1\3\1\uffff\2\2"
+            "",
+            "\4\4\1\uffff\1\4\1\uffff\2\3\1\uffff\1\4\3\uffff\5\4\3\uffff"+
+            "\1\4\1\uffff\1\4\6\uffff\2\4\5\uffff\1\4\5\uffff\4\4\2\uffff"+
+            "\1\2\7\uffff\1\4\4\uffff\2\4"
     };
 
     static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
@@ -8008,169 +8289,170 @@
             return "350:22: (paramType= dotted_name )?";
         }
     }
-    static final String DFA19_eotS =
+    static final String DFA21_eotS =
         "\11\uffff";
-    static final String DFA19_eofS =
+    static final String DFA21_eofS =
         "\11\uffff";
-    static final String DFA19_minS =
-        "\2\7\1\uffff\1\7\1\uffff\1\4\1\77\2\7";
-    static final String DFA19_maxS =
-        "\2\55\1\uffff\1\116\1\uffff\1\101\1\77\2\76";
-    static final String DFA19_acceptS =
+    static final String DFA21_minS =
+        "\2\7\1\uffff\1\7\1\uffff\1\4\1\67\2\7";
+    static final String DFA21_maxS =
+        "\2\56\1\uffff\1\66\1\uffff\1\104\1\67\2\66";
+    static final String DFA21_acceptS =
         "\2\uffff\1\2\1\uffff\1\1\4\uffff";
-    static final String DFA19_specialS =
+    static final String DFA21_specialS =
         "\11\uffff}>";
-    static final String[] DFA19_transitionS = {
-            "\1\2\2\uffff\1\1\7\uffff\1\2\27\uffff\4\2",
-            "\1\3\2\uffff\1\2\1\uffff\1\4\30\uffff\1\2\1\uffff\1\2\2\uffff"+
+    static final String[] DFA21_transitionS = {
+            "\1\2\2\uffff\1\1\3\uffff\1\2\34\uffff\4\2",
+            "\1\3\2\uffff\1\2\1\uffff\1\4\31\uffff\1\2\1\uffff\1\2\2\uffff"+
             "\4\2",
             "",
-            "\1\4\1\5\1\uffff\1\2\2\4\61\uffff\1\6\17\uffff\1\2",
+            "\1\4\1\5\1\uffff\1\2\2\4\3\uffff\1\2\45\uffff\1\6",
             "",
-            "\4\7\1\uffff\1\7\7\uffff\6\7\2\uffff\1\7\1\uffff\1\7\6\uffff"+
-            "\2\7\5\uffff\1\7\5\uffff\4\7\10\uffff\1\7\4\uffff\2\7",
+            "\4\7\1\uffff\1\7\4\uffff\1\7\3\uffff\5\7\3\uffff\1\7\1\uffff"+
+            "\1\7\6\uffff\2\7\5\uffff\1\7\5\uffff\4\7\12\uffff\1\7\4\uffff"+
+            "\2\7",
             "\1\10",
-            "\1\4\1\5\1\uffff\1\2\63\uffff\1\6",
-            "\1\4\2\uffff\1\2\63\uffff\1\6"
+            "\1\4\1\5\1\uffff\1\2\53\uffff\1\6",
+            "\1\4\2\uffff\1\2\53\uffff\1\6"
     };
 
-    static final short[] DFA19_eot = DFA.unpackEncodedString(DFA19_eotS);
-    static final short[] DFA19_eof = DFA.unpackEncodedString(DFA19_eofS);
-    static final char[] DFA19_min = DFA.unpackEncodedStringToUnsignedChars(DFA19_minS);
-    static final char[] DFA19_max = DFA.unpackEncodedStringToUnsignedChars(DFA19_maxS);
-    static final short[] DFA19_accept = DFA.unpackEncodedString(DFA19_acceptS);
-    static final short[] DFA19_special = DFA.unpackEncodedString(DFA19_specialS);
-    static final short[][] DFA19_transition;
+    static final short[] DFA21_eot = DFA.unpackEncodedString(DFA21_eotS);
+    static final short[] DFA21_eof = DFA.unpackEncodedString(DFA21_eofS);
+    static final char[] DFA21_min = DFA.unpackEncodedStringToUnsignedChars(DFA21_minS);
+    static final char[] DFA21_max = DFA.unpackEncodedStringToUnsignedChars(DFA21_maxS);
+    static final short[] DFA21_accept = DFA.unpackEncodedString(DFA21_acceptS);
+    static final short[] DFA21_special = DFA.unpackEncodedString(DFA21_specialS);
+    static final short[][] DFA21_transition;
 
     static {
-        int numStates = DFA19_transitionS.length;
-        DFA19_transition = new short[numStates][];
+        int numStates = DFA21_transitionS.length;
+        DFA21_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA19_transition[i] = DFA.unpackEncodedString(DFA19_transitionS[i]);
+            DFA21_transition[i] = DFA.unpackEncodedString(DFA21_transitionS[i]);
         }
     }
 
-    class DFA19 extends DFA {
+    class DFA21 extends DFA {
 
-        public DFA19(BaseRecognizer recognizer) {
+        public DFA21(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 19;
-            this.eot = DFA19_eot;
-            this.eof = DFA19_eof;
-            this.min = DFA19_min;
-            this.max = DFA19_max;
-            this.accept = DFA19_accept;
-            this.special = DFA19_special;
-            this.transition = DFA19_transition;
+            this.decisionNumber = 21;
+            this.eot = DFA21_eot;
+            this.eof = DFA21_eof;
+            this.min = DFA21_min;
+            this.max = DFA21_max;
+            this.accept = DFA21_accept;
+            this.special = DFA21_special;
+            this.transition = DFA21_transition;
         }
         public String getDescription() {
-            return "418:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?";
+            return "437:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?";
         }
     }
-    static final String DFA54_eotS =
+    static final String DFA56_eotS =
         "\150\uffff";
-    static final String DFA54_eofS =
+    static final String DFA56_eofS =
         "\150\uffff";
-    static final String DFA54_minS =
+    static final String DFA56_minS =
         "\1\7\1\uffff\1\4\1\uffff\2\4\1\0\5\4\2\uffff\4\4\1\0\1\4\1\0\5\4"+
-        "\1\0\1\4\1\0\1\4\2\0\3\4\1\0\1\4\2\0\1\4\2\0\3\4\1\0\1\4\2\0\1\4"+
+        "\1\0\1\4\1\0\1\4\2\0\3\4\2\0\1\4\1\0\1\4\2\0\3\4\2\0\1\4\1\0\1\4"+
         "\2\0\3\4\1\0\3\4\1\0\3\4\1\0\1\4\1\0\1\4\1\uffff\44\0";
-    static final String DFA54_maxS =
-        "\1\114\1\uffff\1\125\1\uffff\2\125\1\0\5\125\2\uffff\4\125\1\0\1"+
-        "\125\1\0\5\125\1\0\1\125\1\0\1\125\2\0\3\125\1\0\1\125\2\0\1\125"+
-        "\2\0\3\125\1\0\1\125\2\0\1\125\2\0\3\125\1\0\3\125\1\0\3\125\1\0"+
-        "\1\125\1\0\1\125\1\uffff\44\0";
-    static final String DFA54_acceptS =
+    static final String DFA56_maxS =
+        "\1\117\1\uffff\1\127\1\uffff\2\127\1\0\5\127\2\uffff\4\127\1\0\1"+
+        "\127\1\0\5\127\1\0\1\127\1\0\1\127\2\0\3\127\2\0\1\127\1\0\1\127"+
+        "\2\0\3\127\2\0\1\127\1\0\1\127\2\0\3\127\1\0\3\127\1\0\3\127\1\0"+
+        "\1\127\1\0\1\127\1\uffff\44\0";
+    static final String DFA56_acceptS =
         "\1\uffff\1\1\1\uffff\1\3\10\uffff\2\2\65\uffff\1\2\44\uffff";
-    static final String DFA54_specialS =
-        "\1\53\1\uffff\1\24\1\uffff\1\43\1\47\1\70\1\6\1\22\1\15\1\76\1\3"+
-        "\2\uffff\1\50\1\66\1\41\1\37\1\10\1\21\1\26\1\54\1\35\1\62\1\33"+
-        "\1\30\1\65\1\2\1\52\1\1\1\36\1\7\1\44\1\72\1\11\1\4\1\20\1\67\1"+
-        "\61\1\17\1\0\1\60\1\63\1\14\1\71\1\75\1\27\1\56\1\51\1\31\1\16\1"+
-        "\40\1\23\1\55\1\57\1\34\1\45\1\73\1\12\1\25\1\46\1\74\1\13\1\5\1"+
-        "\32\1\42\1\64\45\uffff}>";
-    static final String[] DFA54_transitionS = {
-            "\2\3\1\uffff\1\2\2\3\5\uffff\1\3\22\uffff\4\3\1\uffff\4\3\1"+
-            "\uffff\1\3\16\uffff\1\1\1\uffff\1\3\13\uffff\1\3",
+    static final String DFA56_specialS =
+        "\1\40\1\uffff\1\20\1\uffff\1\60\1\13\1\25\1\64\1\3\1\35\1\31\1\51"+
+        "\2\uffff\1\4\1\5\1\2\1\36\1\17\1\76\1\21\1\57\1\54\1\30\1\11\1\42"+
+        "\1\65\1\50\1\24\1\47\1\67\1\34\1\14\1\71\1\53\1\62\1\12\1\75\1\45"+
+        "\1\74\1\46\1\61\1\37\1\26\1\6\1\52\1\44\1\41\1\23\1\43\1\0\1\33"+
+        "\1\66\1\1\1\27\1\22\1\15\1\72\1\55\1\70\1\16\1\73\1\56\1\63\1\7"+
+        "\1\10\1\32\45\uffff}>";
+    static final String[] DFA56_transitionS = {
+            "\2\3\1\uffff\1\2\2\3\1\uffff\1\3\27\uffff\4\3\1\uffff\4\3\1"+
+            "\uffff\1\3\5\uffff\1\1\14\uffff\1\3\13\uffff\1\3",
             "",
-            "\3\14\1\13\2\14\1\6\1\14\1\15\30\14\1\5\1\14\1\4\2\14\1\7\1"+
-            "\10\1\11\1\12\50\14",
+            "\3\14\1\13\2\14\1\6\1\14\1\15\31\14\1\5\1\14\1\4\2\14\1\7\1"+
+            "\10\1\11\1\12\51\14",
             "",
-            "\3\14\1\23\2\14\1\22\1\14\1\15\35\14\1\16\1\17\1\20\1\21\50"+
+            "\3\14\1\23\2\14\1\22\1\14\1\15\36\14\1\16\1\17\1\20\1\21\51"+
             "\14",
-            "\3\14\1\31\2\14\1\24\1\14\1\15\35\14\1\25\1\26\1\27\1\30\50"+
+            "\3\14\1\31\2\14\1\24\1\14\1\15\36\14\1\25\1\26\1\27\1\30\51"+
             "\14",
             "\1\uffff",
-            "\3\14\1\33\2\14\1\32\1\14\1\15\111\14",
-            "\3\14\1\35\2\14\1\34\1\14\1\15\111\14",
-            "\6\14\1\36\1\14\1\15\111\14",
-            "\6\14\1\37\1\14\1\15\111\14",
-            "\4\14\1\41\1\14\1\43\1\14\1\15\61\14\1\42\17\14\1\40\7\14",
+            "\3\14\1\33\2\14\1\32\1\14\1\15\113\14",
+            "\3\14\1\35\2\14\1\34\1\14\1\15\113\14",
+            "\6\14\1\36\1\14\1\15\113\14",
+            "\6\14\1\37\1\14\1\15\113\14",
+            "\4\14\1\41\1\14\1\43\1\14\1\15\3\14\1\40\45\14\1\42\41\14",
             "",
             "",
-            "\3\14\1\44\2\14\1\45\1\14\1\15\111\14",
-            "\3\14\1\47\2\14\1\46\1\14\1\15\111\14",
-            "\6\14\1\50\1\14\1\15\111\14",
-            "\6\14\1\51\1\14\1\15\111\14",
+            "\3\14\1\45\2\14\1\44\1\14\1\15\113\14",
+            "\3\14\1\47\2\14\1\46\1\14\1\15\113\14",
+            "\6\14\1\50\1\14\1\15\113\14",
+            "\6\14\1\51\1\14\1\15\113\14",
             "\1\uffff",
-            "\4\14\1\53\1\14\1\55\1\14\1\15\61\14\1\54\17\14\1\52\7\14",
+            "\4\14\1\53\1\14\1\55\1\14\1\15\3\14\1\52\45\14\1\54\41\14",
             "\1\uffff",
-            "\3\14\1\56\2\14\1\57\1\14\1\15\111\14",
-            "\3\14\1\61\2\14\1\60\1\14\1\15\111\14",
-            "\6\14\1\62\1\14\1\15\111\14",
-            "\6\14\1\63\1\14\1\15\111\14",
-            "\4\14\1\65\1\14\1\67\1\14\1\15\61\14\1\66\17\14\1\64\7\14",
+            "\3\14\1\57\2\14\1\56\1\14\1\15\113\14",
+            "\3\14\1\61\2\14\1\60\1\14\1\15\113\14",
+            "\6\14\1\62\1\14\1\15\113\14",
+            "\6\14\1\63\1\14\1\15\113\14",
+            "\4\14\1\65\1\14\1\67\1\14\1\15\3\14\1\64\45\14\1\66\41\14",
             "\1\uffff",
-            "\4\14\1\71\1\14\1\73\1\14\1\15\61\14\1\72\17\14\1\70\7\14",
+            "\4\14\1\71\1\14\1\73\1\14\1\15\3\14\1\70\45\14\1\72\41\14",
             "\1\uffff",
-            "\4\14\1\75\1\14\1\77\1\14\1\15\61\14\1\76\17\14\1\74\7\14",
+            "\4\14\1\75\1\14\1\77\1\14\1\15\3\14\1\74\45\14\1\76\41\14",
             "\1\uffff",
             "\1\uffff",
-            "\3\14\1\100\2\14\1\101\1\14\1\15\111\14",
-            "\4\102\1\14\1\102\1\103\1\14\1\15\4\14\6\102\2\14\1\102\1\14"+
-            "\1\102\6\14\2\102\5\14\1\102\5\14\4\102\10\14\1\102\4\14\2\102"+
-            "\24\14",
-            "\6\14\1\103\1\14\1\15\62\14\1\104\26\14",
+            "\3\14\1\100\2\14\1\101\1\14\1\15\113\14",
+            "\4\102\1\14\1\102\1\103\1\14\1\15\1\14\1\102\3\14\5\102\3\14"+
+            "\1\102\1\14\1\102\6\14\2\102\5\14\1\102\5\14\4\102\12\14\1\102"+
+            "\4\14\2\102\23\14",
+            "\6\14\1\103\1\14\1\15\52\14\1\104\40\14",
             "\1\uffff",
-            "\4\14\1\106\1\14\1\110\1\14\1\15\61\14\1\107\17\14\1\105\7\14",
             "\1\uffff",
+            "\4\14\1\106\1\14\1\110\1\14\1\15\3\14\1\105\45\14\1\107\41\14",
             "\1\uffff",
-            "\4\14\1\112\1\14\1\114\1\14\1\15\61\14\1\113\17\14\1\111\7\14",
+            "\4\14\1\112\1\14\1\114\1\14\1\15\3\14\1\111\45\14\1\113\41\14",
             "\1\uffff",
             "\1\uffff",
-            "\3\14\1\115\2\14\1\116\1\14\1\15\111\14",
-            "\4\117\1\14\1\117\1\103\1\14\1\15\4\14\6\117\2\14\1\117\1\14"+
-            "\1\117\6\14\2\117\5\14\1\117\5\14\4\117\10\14\1\117\4\14\2\117"+
-            "\24\14",
-            "\6\14\1\103\1\14\1\15\62\14\1\120\26\14",
+            "\3\14\1\115\2\14\1\116\1\14\1\15\113\14",
+            "\4\117\1\14\1\117\1\103\1\14\1\15\1\14\1\117\3\14\5\117\3\14"+
+            "\1\117\1\14\1\117\6\14\2\117\5\14\1\117\5\14\4\117\12\14\1\117"+
+            "\4\14\2\117\23\14",
+            "\6\14\1\103\1\14\1\15\52\14\1\120\40\14",
             "\1\uffff",
-            "\4\14\1\122\1\14\1\124\1\14\1\15\61\14\1\123\17\14\1\121\7\14",
             "\1\uffff",
+            "\4\14\1\122\1\14\1\124\1\14\1\15\3\14\1\121\45\14\1\123\41\14",
             "\1\uffff",
-            "\4\14\1\126\1\14\1\130\1\14\1\15\61\14\1\127\17\14\1\125\7\14",
+            "\4\14\1\126\1\14\1\130\1\14\1\15\3\14\1\125\45\14\1\127\41\14",
             "\1\uffff",
             "\1\uffff",
-            "\3\14\1\131\2\14\1\132\1\14\1\15\111\14",
-            "\4\133\1\14\1\133\1\103\1\14\1\15\4\14\6\133\2\14\1\133\1\14"+
-            "\1\133\6\14\2\133\5\14\1\133\5\14\4\133\10\14\1\133\4\14\2\133"+
-            "\24\14",
-            "\6\14\1\103\1\14\1\15\62\14\1\134\26\14",
+            "\3\14\1\131\2\14\1\132\1\14\1\15\113\14",
+            "\4\133\1\14\1\133\1\103\1\14\1\15\1\14\1\133\3\14\5\133\3\14"+
+            "\1\133\1\14\1\133\6\14\2\133\5\14\1\133\5\14\4\133\12\14\1\133"+
+            "\4\14\2\133\23\14",
+            "\6\14\1\103\1\14\1\15\52\14\1\134\40\14",
             "\1\uffff",
-            "\3\14\1\135\2\14\1\136\1\14\1\15\111\14",
-            "\4\137\1\14\1\137\1\103\1\14\1\15\4\14\6\137\2\14\1\137\1\14"+
-            "\1\137\6\14\2\137\5\14\1\137\5\14\4\137\10\14\1\137\4\14\2\137"+
-            "\24\14",
-            "\6\14\1\103\1\14\1\15\62\14\1\140\26\14",
+            "\3\14\1\135\2\14\1\136\1\14\1\15\113\14",
+            "\4\137\1\14\1\137\1\103\1\14\1\15\1\14\1\137\3\14\5\137\3\14"+
+            "\1\137\1\14\1\137\6\14\2\137\5\14\1\137\5\14\4\137\12\14\1\137"+
+            "\4\14\2\137\23\14",
+            "\6\14\1\103\1\14\1\15\52\14\1\140\40\14",
             "\1\uffff",
-            "\3\14\1\141\2\14\1\142\1\14\1\15\111\14",
-            "\4\143\1\14\1\143\1\103\1\14\1\15\4\14\6\143\2\14\1\143\1\14"+
-            "\1\143\6\14\2\143\5\14\1\143\5\14\4\143\10\14\1\143\4\14\2\143"+
-            "\24\14",
-            "\6\14\1\103\1\14\1\15\62\14\1\144\26\14",
+            "\3\14\1\141\2\14\1\142\1\14\1\15\113\14",
+            "\4\143\1\14\1\143\1\103\1\14\1\15\1\14\1\143\3\14\5\143\3\14"+
+            "\1\143\1\14\1\143\6\14\2\143\5\14\1\143\5\14\4\143\12\14\1\143"+
+            "\4\14\2\143\23\14",
+            "\6\14\1\103\1\14\1\15\52\14\1\144\40\14",
             "\1\uffff",
-            "\4\14\1\145\1\14\1\147\1\14\1\15\61\14\1\146\27\14",
+            "\4\14\1\145\1\14\1\147\1\14\1\15\51\14\1\146\41\14",
             "\1\uffff",
-            "\4\14\1\41\1\14\1\43\1\14\1\15\61\14\1\42\27\14",
+            "\4\14\1\41\1\14\1\43\1\14\1\15\51\14\1\42\41\14",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -8210,46 +8492,46 @@
             "\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[] DFA56_eot = DFA.unpackEncodedString(DFA56_eotS);
+    static final short[] DFA56_eof = DFA.unpackEncodedString(DFA56_eofS);
+    static final char[] DFA56_min = DFA.unpackEncodedStringToUnsignedChars(DFA56_minS);
+    static final char[] DFA56_max = DFA.unpackEncodedStringToUnsignedChars(DFA56_maxS);
+    static final short[] DFA56_accept = DFA.unpackEncodedString(DFA56_acceptS);
+    static final short[] DFA56_special = DFA.unpackEncodedString(DFA56_specialS);
+    static final short[][] DFA56_transition;
 
     static {
-        int numStates = DFA54_transitionS.length;
-        DFA54_transition = new short[numStates][];
+        int numStates = DFA56_transitionS.length;
+        DFA56_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA54_transition[i] = DFA.unpackEncodedString(DFA54_transitionS[i]);
+            DFA56_transition[i] = DFA.unpackEncodedString(DFA56_transitionS[i]);
         }
     }
 
-    class DFA54 extends DFA {
+    class DFA56 extends DFA {
 
-        public DFA54(BaseRecognizer recognizer) {
+        public DFA56(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 = 56;
+            this.eot = DFA56_eot;
+            this.eof = DFA56_eof;
+            this.min = DFA56_min;
+            this.max = DFA56_max;
+            this.accept = DFA56_accept;
+            this.special = DFA56_special;
+            this.transition = DFA56_transition;
         }
         public String getDescription() {
-            return "1121:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?";
+            return "1140:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA54_40 = input.LA(1);
+                        int LA56_50 = input.LA(1);
 
                          
-                        int index54_40 = input.index();
+                        int index56_50 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred10()) ) {s = 67;}
@@ -8257,922 +8539,912 @@
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_40);
+                        input.seek(index56_50);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA54_29 = input.LA(1);
+                        int LA56_53 = input.LA(1);
 
                          
-                        int index54_29 = input.index();
+                        int index56_53 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_29==78) ) {s = 60;}
+                        if ( ((LA56_53>=PACKAGE && LA56_53<=ID)||LA56_53==GLOBAL||LA56_53==END||(LA56_53>=QUERY && LA56_53<=ATTRIBUTES)||LA56_53==ENABLED||LA56_53==SALIENCE||(LA56_53>=DURATION && LA56_53<=DIALECT)||LA56_53==FROM||(LA56_53>=INIT && LA56_53<=RESULT)||LA56_53==IN||(LA56_53>=THEN && LA56_53<=EVENT)) ) {s = 91;}
 
-                        else if ( (LA54_29==DOT) ) {s = 61;}
+                        else if ( (LA56_53==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_29==LEFT_SQUARE) ) {s = 62;}
+                        else if ( (LA56_53==DOT||LA56_53==COMMA||LA56_53==DECLARE||(LA56_53>=AT && LA56_53<=EQUALS)||(LA56_53>=DATE_EFFECTIVE && LA56_53<=DATE_EXPIRES)||LA56_53==BOOL||(LA56_53>=INT && LA56_53<=AGENDA_GROUP)||(LA56_53>=LOCK_ON_ACTIVE && LA56_53<=DOUBLE_AMPER)||(LA56_53>=EXISTS && LA56_53<=ACCUMULATE)||(LA56_53>=COLLECT && LA56_53<=TILDE)||(LA56_53>=FLOAT && LA56_53<=RIGHT_CURLY)||(LA56_53>=EOL && LA56_53<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_29==LEFT_PAREN) ) {s = 63;}
+                        else if ( (LA56_53==LEFT_PAREN) && (synpred10())) {s = 67;}
 
-                        else if ( (LA54_29==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_29>=PACKAGE && LA54_29<=ID)||LA54_29==GLOBAL||LA54_29==COMMA||(LA54_29>=DECLARE && LA54_29<=NULL)||(LA54_29>=RIGHT_SQUARE && LA54_29<=77)||(LA54_29>=79 && LA54_29<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_29);
+                        input.seek(index56_53);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA54_27 = input.LA(1);
+                        int LA56_16 = input.LA(1);
 
                          
-                        int index54_27 = input.index();
+                        int index56_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_27==78) ) {s = 56;}
+                        if ( (LA56_16==LEFT_PAREN) ) {s = 40;}
 
-                        else if ( (LA54_27==DOT) ) {s = 57;}
+                        else if ( (LA56_16==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_27==LEFT_SQUARE) ) {s = 58;}
+                        else if ( ((LA56_16>=PACKAGE && LA56_16<=GLOBAL)||LA56_16==COMMA||(LA56_16>=DECLARE && LA56_16<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_27==LEFT_PAREN) ) {s = 59;}
-
-                        else if ( (LA54_27==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_27>=PACKAGE && LA54_27<=ID)||LA54_27==GLOBAL||LA54_27==COMMA||(LA54_27>=DECLARE && LA54_27<=NULL)||(LA54_27>=RIGHT_SQUARE && LA54_27<=77)||(LA54_27>=79 && LA54_27<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_27);
+                        input.seek(index56_16);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA54_11 = input.LA(1);
+                        int LA56_8 = input.LA(1);
 
                          
-                        int index54_11 = input.index();
+                        int index56_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_11==78) ) {s = 32;}
+                        if ( (LA56_8==LEFT_PAREN) ) {s = 28;}
 
-                        else if ( (LA54_11==DOT) ) {s = 33;}
+                        else if ( (LA56_8==ID) ) {s = 29;}
 
-                        else if ( (LA54_11==LEFT_SQUARE) ) {s = 34;}
+                        else if ( (LA56_8==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_11==LEFT_PAREN) ) {s = 35;}
+                        else if ( ((LA56_8>=PACKAGE && LA56_8<=FUNCTION)||(LA56_8>=DOT && LA56_8<=GLOBAL)||LA56_8==COMMA||(LA56_8>=DECLARE && LA56_8<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_11==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_11>=PACKAGE && LA54_11<=ID)||LA54_11==GLOBAL||LA54_11==COMMA||(LA54_11>=DECLARE && LA54_11<=NULL)||(LA54_11>=RIGHT_SQUARE && LA54_11<=77)||(LA54_11>=79 && LA54_11<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_11);
+                        input.seek(index56_8);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA54_35 = input.LA(1);
+                        int LA56_14 = input.LA(1);
 
                          
-                        int index54_35 = input.index();
+                        int index56_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_14==LEFT_PAREN) ) {s = 36;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_14==ID) ) {s = 37;}
 
+                        else if ( (LA56_14==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_14>=PACKAGE && LA56_14<=FUNCTION)||(LA56_14>=DOT && LA56_14<=GLOBAL)||LA56_14==COMMA||(LA56_14>=DECLARE && LA56_14<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_35);
+                        input.seek(index56_14);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA54_63 = input.LA(1);
+                        int LA56_15 = input.LA(1);
 
                          
-                        int index54_63 = input.index();
+                        int index56_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_15==LEFT_PAREN) ) {s = 38;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_15==ID) ) {s = 39;}
 
+                        else if ( (LA56_15==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_15>=PACKAGE && LA56_15<=FUNCTION)||(LA56_15>=DOT && LA56_15<=GLOBAL)||LA56_15==COMMA||(LA56_15>=DECLARE && LA56_15<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_63);
+                        input.seek(index56_15);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA54_7 = input.LA(1);
+                        int LA56_44 = input.LA(1);
 
                          
-                        int index54_7 = input.index();
+                        int index56_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_7==LEFT_PAREN) ) {s = 26;}
+                        if ( (LA56_44==RIGHT_SQUARE) ) {s = 80;}
 
-                        else if ( (LA54_7==ID) ) {s = 27;}
+                        else if ( (LA56_44==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_7==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( ((LA56_44>=PACKAGE && LA56_44<=GLOBAL)||LA56_44==COMMA||(LA56_44>=DECLARE && LA56_44<=LEFT_SQUARE)||(LA56_44>=CONTAINS && LA56_44<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA54_7>=PACKAGE && LA54_7<=FUNCTION)||(LA54_7>=DOT && LA54_7<=GLOBAL)||LA54_7==COMMA||(LA54_7>=DECLARE && LA54_7<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_44==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index54_7);
+                        input.seek(index56_44);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA54_31 = input.LA(1);
+                        int LA56_64 = input.LA(1);
 
                          
-                        int index54_31 = input.index();
+                        int index56_64 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( (LA56_64==DOT) ) {s = 101;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_64==LEFT_SQUARE) ) {s = 102;}
 
+                        else if ( (LA56_64==LEFT_PAREN) ) {s = 103;}
+
+                        else if ( (LA56_64==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_64>=PACKAGE && LA56_64<=ID)||LA56_64==GLOBAL||LA56_64==COMMA||(LA56_64>=DECLARE && LA56_64<=ENTRY_POINT)||(LA56_64>=RIGHT_SQUARE && LA56_64<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_31);
+                        input.seek(index56_64);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA54_18 = input.LA(1);
+                        int LA56_65 = input.LA(1);
 
                          
-                        int index54_18 = input.index();
+                        int index56_65 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_18);
+                        input.seek(index56_65);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA54_34 = input.LA(1);
+                        int LA56_24 = input.LA(1);
 
                          
-                        int index54_34 = input.index();
+                        int index56_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_34==RIGHT_SQUARE) ) {s = 68;}
+                        if ( (LA56_24==LEFT_PAREN) ) {s = 51;}
 
-                        else if ( (LA54_34==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_24==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_34>=PACKAGE && LA54_34<=GLOBAL)||LA54_34==COMMA||(LA54_34>=DECLARE && LA54_34<=LEFT_SQUARE)||(LA54_34>=THEN && LA54_34<=85)) && (synpred10())) {s = 12;}
+                        else if ( ((LA56_24>=PACKAGE && LA56_24<=GLOBAL)||LA56_24==COMMA||(LA56_24>=DECLARE && LA56_24<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_34==LEFT_PAREN) && (synpred10())) {s = 67;}
-
                          
-                        input.seek(index54_34);
+                        input.seek(index56_24);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA54_58 = input.LA(1);
+                        int LA56_36 = input.LA(1);
 
                          
-                        int index54_58 = input.index();
+                        int index56_36 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_58==RIGHT_SQUARE) ) {s = 96;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_58==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA54_58>=PACKAGE && LA54_58<=GLOBAL)||LA54_58==COMMA||(LA54_58>=DECLARE && LA54_58<=LEFT_SQUARE)||(LA54_58>=THEN && LA54_58<=85)) && (synpred10())) {s = 12;}
-
-                        else if ( (LA54_58==LEFT_PAREN) && (synpred10())) {s = 67;}
-
                          
-                        input.seek(index54_58);
+                        input.seek(index56_36);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA54_62 = input.LA(1);
+                        int LA56_5 = input.LA(1);
 
                          
-                        int index54_62 = input.index();
+                        int index56_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_62==RIGHT_SQUARE) ) {s = 100;}
+                        if ( (LA56_5==LEFT_PAREN) ) {s = 20;}
 
-                        else if ( (LA54_62==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_5==EXISTS) ) {s = 21;}
 
-                        else if ( ((LA54_62>=PACKAGE && LA54_62<=GLOBAL)||LA54_62==COMMA||(LA54_62>=DECLARE && LA54_62<=LEFT_SQUARE)||(LA54_62>=THEN && LA54_62<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_5==NOT) ) {s = 22;}
 
-                        else if ( (LA54_62==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_5==EVAL) ) {s = 23;}
 
+                        else if ( (LA56_5==FORALL) ) {s = 24;}
+
+                        else if ( (LA56_5==ID) ) {s = 25;}
+
+                        else if ( (LA56_5==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_5>=PACKAGE && LA56_5<=FUNCTION)||(LA56_5>=DOT && LA56_5<=GLOBAL)||LA56_5==COMMA||(LA56_5>=DECLARE && LA56_5<=FROM)||(LA56_5>=ACCUMULATE && LA56_5<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_62);
+                        input.seek(index56_5);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA54_43 = input.LA(1);
+                        int LA56_32 = input.LA(1);
 
                          
-                        int index54_43 = input.index();
+                        int index56_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA54_43>=PACKAGE && LA54_43<=ID)||LA54_43==GLOBAL||(LA54_43>=QUERY && LA54_43<=ATTRIBUTES)||LA54_43==ENABLED||LA54_43==SALIENCE||(LA54_43>=DURATION && LA54_43<=DIALECT)||LA54_43==FROM||(LA54_43>=INIT && LA54_43<=RESULT)||LA54_43==IN||(LA54_43>=THEN && LA54_43<=EVENT)) ) {s = 79;}
+                        if ( (LA56_32==ID) ) {s = 64;}
 
-                        else if ( (LA54_43==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_32==LEFT_PAREN) ) {s = 65;}
 
-                        else if ( (LA54_43==DOT||LA54_43==COMMA||(LA54_43>=DECLARE && LA54_43<=STRING)||(LA54_43>=DATE_EFFECTIVE && LA54_43<=DATE_EXPIRES)||LA54_43==BOOL||(LA54_43>=INT && LA54_43<=AGENDA_GROUP)||(LA54_43>=LOCK_ON_ACTIVE && LA54_43<=DOUBLE_AMPER)||(LA54_43>=EXISTS && LA54_43<=ACCUMULATE)||(LA54_43>=COLLECT && LA54_43<=TILDE)||(LA54_43>=FLOAT && LA54_43<=RIGHT_SQUARE)||(LA54_43>=EOL && LA54_43<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_32==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_43==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( ((LA56_32>=PACKAGE && LA56_32<=FUNCTION)||(LA56_32>=DOT && LA56_32<=GLOBAL)||LA56_32==COMMA||(LA56_32>=DECLARE && LA56_32<=87)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index54_43);
+                        input.seek(index56_32);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA54_9 = input.LA(1);
+                        int LA56_56 = input.LA(1);
 
                          
-                        int index54_9 = input.index();
+                        int index56_56 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_9==LEFT_PAREN) ) {s = 30;}
+                        if ( (LA56_56==ID) ) {s = 93;}
 
-                        else if ( (LA54_9==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_56==LEFT_PAREN) ) {s = 94;}
 
-                        else if ( ((LA54_9>=PACKAGE && LA54_9<=GLOBAL)||LA54_9==COMMA||(LA54_9>=DECLARE && LA54_9<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_56==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA56_56>=PACKAGE && LA56_56<=FUNCTION)||(LA56_56>=DOT && LA56_56<=GLOBAL)||LA56_56==COMMA||(LA56_56>=DECLARE && LA56_56<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_9);
+                        input.seek(index56_56);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA54_50 = input.LA(1);
+                        int LA56_60 = input.LA(1);
 
                          
-                        int index54_50 = input.index();
+                        int index56_60 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_60==ID) ) {s = 97;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_60==LEFT_PAREN) ) {s = 98;}
 
+                        else if ( (LA56_60==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_60>=PACKAGE && LA56_60<=FUNCTION)||(LA56_60>=DOT && LA56_60<=GLOBAL)||LA56_60==COMMA||(LA56_60>=DECLARE && LA56_60<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_50);
+                        input.seek(index56_60);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA54_39 = input.LA(1);
+                        int LA56_18 = input.LA(1);
 
                          
-                        int index54_39 = input.index();
+                        int index56_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_39==78) ) {s = 73;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( (LA54_39==DOT) ) {s = 74;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_39==LEFT_SQUARE) ) {s = 75;}
-
-                        else if ( (LA54_39==LEFT_PAREN) ) {s = 76;}
-
-                        else if ( (LA54_39==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_39>=PACKAGE && LA54_39<=ID)||LA54_39==GLOBAL||LA54_39==COMMA||(LA54_39>=DECLARE && LA54_39<=NULL)||(LA54_39>=RIGHT_SQUARE && LA54_39<=77)||(LA54_39>=79 && LA54_39<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_39);
+                        input.seek(index56_18);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA54_36 = input.LA(1);
+                        int LA56_2 = input.LA(1);
 
                          
-                        int index54_36 = input.index();
+                        int index56_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_36==78) ) {s = 69;}
+                        if ( (LA56_2==AND) ) {s = 4;}
 
-                        else if ( (LA54_36==DOT) ) {s = 70;}
+                        else if ( (LA56_2==OR) ) {s = 5;}
 
-                        else if ( (LA54_36==LEFT_SQUARE) ) {s = 71;}
+                        else if ( (LA56_2==LEFT_PAREN) ) {s = 6;}
 
-                        else if ( (LA54_36==LEFT_PAREN) ) {s = 72;}
+                        else if ( (LA56_2==EXISTS) ) {s = 7;}
 
-                        else if ( (LA54_36==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_2==NOT) ) {s = 8;}
 
-                        else if ( ((LA54_36>=PACKAGE && LA54_36<=ID)||LA54_36==GLOBAL||LA54_36==COMMA||(LA54_36>=DECLARE && LA54_36<=NULL)||(LA54_36>=RIGHT_SQUARE && LA54_36<=77)||(LA54_36>=79 && LA54_36<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_2==EVAL) ) {s = 9;}
 
+                        else if ( (LA56_2==FORALL) ) {s = 10;}
+
+                        else if ( (LA56_2==ID) ) {s = 11;}
+
+                        else if ( ((LA56_2>=PACKAGE && LA56_2<=FUNCTION)||(LA56_2>=DOT && LA56_2<=GLOBAL)||LA56_2==COMMA||(LA56_2>=DECLARE && LA56_2<=LOCK_ON_ACTIVE)||LA56_2==DOUBLE_PIPE||(LA56_2>=DOUBLE_AMPER && LA56_2<=FROM)||(LA56_2>=ACCUMULATE && LA56_2<=87)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA56_2==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
                          
-                        input.seek(index54_36);
+                        input.seek(index56_2);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA54_19 = input.LA(1);
+                        int LA56_20 = input.LA(1);
 
                          
-                        int index54_19 = input.index();
+                        int index56_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_19==78) ) {s = 42;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( (LA54_19==DOT) ) {s = 43;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_19==LEFT_SQUARE) ) {s = 44;}
-
-                        else if ( (LA54_19==LEFT_PAREN) ) {s = 45;}
-
-                        else if ( (LA54_19==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_19>=PACKAGE && LA54_19<=ID)||LA54_19==GLOBAL||LA54_19==COMMA||(LA54_19>=DECLARE && LA54_19<=NULL)||(LA54_19>=RIGHT_SQUARE && LA54_19<=77)||(LA54_19>=79 && LA54_19<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_19);
+                        input.seek(index56_20);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA54_8 = input.LA(1);
+                        int LA56_55 = input.LA(1);
 
                          
-                        int index54_8 = input.index();
+                        int index56_55 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_8==LEFT_PAREN) ) {s = 28;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_8==ID) ) {s = 29;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_8==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_8>=PACKAGE && LA54_8<=FUNCTION)||(LA54_8>=DOT && LA54_8<=GLOBAL)||LA54_8==COMMA||(LA54_8>=DECLARE && LA54_8<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_8);
+                        input.seek(index56_55);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA54_52 = input.LA(1);
+                        int LA56_48 = input.LA(1);
 
                          
-                        int index54_52 = input.index();
+                        int index56_48 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_52==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_52==ID) ) {s = 89;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_52==LEFT_PAREN) ) {s = 90;}
-
-                        else if ( ((LA54_52>=PACKAGE && LA54_52<=FUNCTION)||(LA54_52>=DOT && LA54_52<=GLOBAL)||LA54_52==COMMA||(LA54_52>=DECLARE && LA54_52<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_52);
+                        input.seek(index56_48);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA54_2 = input.LA(1);
+                        int LA56_28 = input.LA(1);
 
                          
-                        int index54_2 = input.index();
+                        int index56_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_2==AND) ) {s = 4;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( (LA54_2==OR) ) {s = 5;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_2==LEFT_PAREN) ) {s = 6;}
-
-                        else if ( (LA54_2==EXISTS) ) {s = 7;}
-
-                        else if ( (LA54_2==NOT) ) {s = 8;}
-
-                        else if ( (LA54_2==EVAL) ) {s = 9;}
-
-                        else if ( (LA54_2==FORALL) ) {s = 10;}
-
-                        else if ( (LA54_2==ID) ) {s = 11;}
-
-                        else if ( ((LA54_2>=PACKAGE && LA54_2<=FUNCTION)||(LA54_2>=DOT && LA54_2<=GLOBAL)||LA54_2==COMMA||(LA54_2>=DECLARE && LA54_2<=LOCK_ON_ACTIVE)||LA54_2==DOUBLE_PIPE||(LA54_2>=DOUBLE_AMPER && LA54_2<=FROM)||(LA54_2>=ACCUMULATE && LA54_2<=85)) && (synpred10())) {s = 12;}
-
-                        else if ( (LA54_2==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
                          
-                        input.seek(index54_2);
+                        input.seek(index56_28);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA54_59 = input.LA(1);
+                        int LA56_6 = input.LA(1);
 
                          
-                        int index54_59 = input.index();
+                        int index56_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_59);
+                        input.seek(index56_6);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA54_20 = input.LA(1);
+                        int LA56_43 = input.LA(1);
 
                          
-                        int index54_20 = input.index();
+                        int index56_43 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( ((LA56_43>=PACKAGE && LA56_43<=ID)||LA56_43==GLOBAL||LA56_43==END||(LA56_43>=QUERY && LA56_43<=ATTRIBUTES)||LA56_43==ENABLED||LA56_43==SALIENCE||(LA56_43>=DURATION && LA56_43<=DIALECT)||LA56_43==FROM||(LA56_43>=INIT && LA56_43<=RESULT)||LA56_43==IN||(LA56_43>=THEN && LA56_43<=EVENT)) ) {s = 79;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_43==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( (LA56_43==DOT||LA56_43==COMMA||LA56_43==DECLARE||(LA56_43>=AT && LA56_43<=EQUALS)||(LA56_43>=DATE_EFFECTIVE && LA56_43<=DATE_EXPIRES)||LA56_43==BOOL||(LA56_43>=INT && LA56_43<=AGENDA_GROUP)||(LA56_43>=LOCK_ON_ACTIVE && LA56_43<=DOUBLE_AMPER)||(LA56_43>=EXISTS && LA56_43<=ACCUMULATE)||(LA56_43>=COLLECT && LA56_43<=TILDE)||(LA56_43>=FLOAT && LA56_43<=RIGHT_CURLY)||(LA56_43>=EOL && LA56_43<=87)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA56_43==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index54_20);
+                        input.seek(index56_43);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA54_46 = input.LA(1);
+                        int LA56_54 = input.LA(1);
 
                          
-                        int index54_46 = input.index();
+                        int index56_54 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_46==78) ) {s = 81;}
+                        if ( (LA56_54==RIGHT_SQUARE) ) {s = 92;}
 
-                        else if ( (LA54_46==DOT) ) {s = 82;}
+                        else if ( (LA56_54==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_46==LEFT_SQUARE) ) {s = 83;}
+                        else if ( ((LA56_54>=PACKAGE && LA56_54<=GLOBAL)||LA56_54==COMMA||(LA56_54>=DECLARE && LA56_54<=LEFT_SQUARE)||(LA56_54>=CONTAINS && LA56_54<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_46==LEFT_PAREN) ) {s = 84;}
+                        else if ( (LA56_54==LEFT_PAREN) && (synpred10())) {s = 67;}
 
-                        else if ( (LA54_46==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_46>=PACKAGE && LA54_46<=ID)||LA54_46==GLOBAL||LA54_46==COMMA||(LA54_46>=DECLARE && LA54_46<=NULL)||(LA54_46>=RIGHT_SQUARE && LA54_46<=77)||(LA54_46>=79 && LA54_46<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_46);
+                        input.seek(index56_54);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA54_25 = input.LA(1);
+                        int LA56_23 = input.LA(1);
 
                          
-                        int index54_25 = input.index();
+                        int index56_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_25==78) ) {s = 52;}
+                        if ( (LA56_23==LEFT_PAREN) ) {s = 50;}
 
-                        else if ( (LA54_25==DOT) ) {s = 53;}
+                        else if ( (LA56_23==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_25==LEFT_SQUARE) ) {s = 54;}
+                        else if ( ((LA56_23>=PACKAGE && LA56_23<=GLOBAL)||LA56_23==COMMA||(LA56_23>=DECLARE && LA56_23<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_25==LEFT_PAREN) ) {s = 55;}
-
-                        else if ( (LA54_25==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_25>=PACKAGE && LA54_25<=ID)||LA54_25==GLOBAL||LA54_25==COMMA||(LA54_25>=DECLARE && LA54_25<=NULL)||(LA54_25>=RIGHT_SQUARE && LA54_25<=77)||(LA54_25>=79 && LA54_25<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_25);
+                        input.seek(index56_23);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA54_49 = input.LA(1);
+                        int LA56_10 = input.LA(1);
 
                          
-                        int index54_49 = input.index();
+                        int index56_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_49==78) ) {s = 85;}
+                        if ( (LA56_10==LEFT_PAREN) ) {s = 31;}
 
-                        else if ( (LA54_49==DOT) ) {s = 86;}
+                        else if ( (LA56_10==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_49==LEFT_SQUARE) ) {s = 87;}
+                        else if ( ((LA56_10>=PACKAGE && LA56_10<=GLOBAL)||LA56_10==COMMA||(LA56_10>=DECLARE && LA56_10<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_49==LEFT_PAREN) ) {s = 88;}
-
-                        else if ( (LA54_49==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_49>=PACKAGE && LA54_49<=ID)||LA54_49==GLOBAL||LA54_49==COMMA||(LA54_49>=DECLARE && LA54_49<=NULL)||(LA54_49>=RIGHT_SQUARE && LA54_49<=77)||(LA54_49>=79 && LA54_49<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_49);
+                        input.seek(index56_10);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA54_64 = input.LA(1);
+                        int LA56_66 = input.LA(1);
 
                          
-                        int index54_64 = input.index();
+                        int index56_66 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_64==DOT) ) {s = 101;}
+                        if ( (LA56_66==LEFT_SQUARE) ) {s = 34;}
 
-                        else if ( (LA54_64==LEFT_SQUARE) ) {s = 102;}
+                        else if ( (LA56_66==LEFT_PAREN) ) {s = 35;}
 
-                        else if ( (LA54_64==LEFT_PAREN) ) {s = 103;}
+                        else if ( (LA56_66==DOT) ) {s = 33;}
 
-                        else if ( (LA54_64==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_66==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_64>=PACKAGE && LA54_64<=ID)||LA54_64==GLOBAL||LA54_64==COMMA||(LA54_64>=DECLARE && LA54_64<=NULL)||(LA54_64>=RIGHT_SQUARE && LA54_64<=85)) && (synpred10())) {s = 12;}
+                        else if ( ((LA56_66>=PACKAGE && LA56_66<=ID)||LA56_66==GLOBAL||LA56_66==COMMA||(LA56_66>=DECLARE && LA56_66<=ENTRY_POINT)||(LA56_66>=RIGHT_SQUARE && LA56_66<=87)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index54_64);
+                        input.seek(index56_66);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA54_24 = input.LA(1);
+                        int LA56_51 = input.LA(1);
 
                          
-                        int index54_24 = input.index();
+                        int index56_51 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_24==LEFT_PAREN) ) {s = 51;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_24==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA54_24>=PACKAGE && LA54_24<=GLOBAL)||LA54_24==COMMA||(LA54_24>=DECLARE && LA54_24<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_24);
+                        input.seek(index56_51);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA54_55 = input.LA(1);
+                        int LA56_31 = input.LA(1);
 
                          
-                        int index54_55 = input.index();
+                        int index56_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_55);
+                        input.seek(index56_31);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA54_22 = input.LA(1);
+                        int LA56_9 = input.LA(1);
 
                          
-                        int index54_22 = input.index();
+                        int index56_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_22==LEFT_PAREN) ) {s = 48;}
+                        if ( (LA56_9==LEFT_PAREN) ) {s = 30;}
 
-                        else if ( (LA54_22==ID) ) {s = 49;}
+                        else if ( (LA56_9==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_22==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( ((LA56_9>=PACKAGE && LA56_9<=GLOBAL)||LA56_9==COMMA||(LA56_9>=DECLARE && LA56_9<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA54_22>=PACKAGE && LA54_22<=FUNCTION)||(LA54_22>=DOT && LA54_22<=GLOBAL)||LA54_22==COMMA||(LA54_22>=DECLARE && LA54_22<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_22);
+                        input.seek(index56_9);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA54_30 = input.LA(1);
+                        int LA56_17 = input.LA(1);
 
                          
-                        int index54_30 = input.index();
+                        int index56_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( (LA56_17==LEFT_PAREN) ) {s = 41;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_17==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA56_17>=PACKAGE && LA56_17<=GLOBAL)||LA56_17==COMMA||(LA56_17>=DECLARE && LA56_17<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_30);
+                        input.seek(index56_17);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA54_17 = input.LA(1);
+                        int LA56_42 = input.LA(1);
 
                          
-                        int index54_17 = input.index();
+                        int index56_42 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_17==LEFT_PAREN) ) {s = 41;}
+                        if ( (LA56_42==ID) ) {s = 77;}
 
-                        else if ( (LA54_17==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_42==LEFT_PAREN) ) {s = 78;}
 
-                        else if ( ((LA54_17>=PACKAGE && LA54_17<=GLOBAL)||LA54_17==COMMA||(LA54_17>=DECLARE && LA54_17<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_42==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA56_42>=PACKAGE && LA56_42<=FUNCTION)||(LA56_42>=DOT && LA56_42<=GLOBAL)||LA56_42==COMMA||(LA56_42>=DECLARE && LA56_42<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_17);
+                        input.seek(index56_42);
                         if ( s>=0 ) return s;
                         break;
                     case 32 : 
-                        int LA54_51 = input.LA(1);
+                        int LA56_0 = input.LA(1);
 
                          
-                        int index54_51 = input.index();
+                        int index56_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_0==LEFT_SQUARE) && (synpred9())) {s = 1;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_0==LEFT_PAREN) ) {s = 2;}
 
+                        else if ( ((LA56_0>=ID && LA56_0<=DOT)||(LA56_0>=COMMA && LA56_0<=RIGHT_PAREN)||LA56_0==END||(LA56_0>=OR && LA56_0<=DOUBLE_AMPER)||(LA56_0>=EXISTS && LA56_0<=FORALL)||LA56_0==INIT||LA56_0==THEN||LA56_0==79) ) {s = 3;}
+
                          
-                        input.seek(index54_51);
+                        input.seek(index56_0);
                         if ( s>=0 ) return s;
                         break;
                     case 33 : 
-                        int LA54_16 = input.LA(1);
+                        int LA56_47 = input.LA(1);
 
                          
-                        int index54_16 = input.index();
+                        int index56_47 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_16==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (LA56_47==COLON) ) {s = 81;}
 
-                        else if ( ((LA54_16>=PACKAGE && LA54_16<=GLOBAL)||LA54_16==COMMA||(LA54_16>=DECLARE && LA54_16<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_47==DOT) ) {s = 82;}
 
-                        else if ( (LA54_16==LEFT_PAREN) ) {s = 40;}
+                        else if ( (LA56_47==LEFT_SQUARE) ) {s = 83;}
 
+                        else if ( (LA56_47==LEFT_PAREN) ) {s = 84;}
+
+                        else if ( (LA56_47==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_47>=PACKAGE && LA56_47<=ID)||LA56_47==GLOBAL||LA56_47==COMMA||(LA56_47>=DECLARE && LA56_47<=AT)||(LA56_47>=EQUALS && LA56_47<=ENTRY_POINT)||(LA56_47>=RIGHT_SQUARE && LA56_47<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_16);
+                        input.seek(index56_47);
                         if ( s>=0 ) return s;
                         break;
                     case 34 : 
-                        int LA54_65 = input.LA(1);
+                        int LA56_25 = input.LA(1);
 
                          
-                        int index54_65 = input.index();
+                        int index56_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_25==COLON) ) {s = 52;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_25==DOT) ) {s = 53;}
 
+                        else if ( (LA56_25==LEFT_SQUARE) ) {s = 54;}
+
+                        else if ( (LA56_25==LEFT_PAREN) ) {s = 55;}
+
+                        else if ( (LA56_25==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_25>=PACKAGE && LA56_25<=ID)||LA56_25==GLOBAL||LA56_25==COMMA||(LA56_25>=DECLARE && LA56_25<=AT)||(LA56_25>=EQUALS && LA56_25<=ENTRY_POINT)||(LA56_25>=RIGHT_SQUARE && LA56_25<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_65);
+                        input.seek(index56_25);
                         if ( s>=0 ) return s;
                         break;
                     case 35 : 
-                        int LA54_4 = input.LA(1);
+                        int LA56_49 = input.LA(1);
 
                          
-                        int index54_4 = input.index();
+                        int index56_49 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_4==EXISTS) ) {s = 14;}
+                        if ( (LA56_49==COLON) ) {s = 85;}
 
-                        else if ( (LA54_4==NOT) ) {s = 15;}
+                        else if ( (LA56_49==DOT) ) {s = 86;}
 
-                        else if ( (LA54_4==EVAL) ) {s = 16;}
+                        else if ( (LA56_49==LEFT_SQUARE) ) {s = 87;}
 
-                        else if ( (LA54_4==FORALL) ) {s = 17;}
+                        else if ( (LA56_49==LEFT_PAREN) ) {s = 88;}
 
-                        else if ( (LA54_4==LEFT_PAREN) ) {s = 18;}
+                        else if ( (LA56_49==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_4==ID) ) {s = 19;}
+                        else if ( ((LA56_49>=PACKAGE && LA56_49<=ID)||LA56_49==GLOBAL||LA56_49==COMMA||(LA56_49>=DECLARE && LA56_49<=AT)||(LA56_49>=EQUALS && LA56_49<=ENTRY_POINT)||(LA56_49>=RIGHT_SQUARE && LA56_49<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_4==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_4>=PACKAGE && LA54_4<=FUNCTION)||(LA54_4>=DOT && LA54_4<=GLOBAL)||LA54_4==COMMA||(LA54_4>=DECLARE && LA54_4<=FROM)||(LA54_4>=ACCUMULATE && LA54_4<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_4);
+                        input.seek(index56_49);
                         if ( s>=0 ) return s;
                         break;
                     case 36 : 
-                        int LA54_32 = input.LA(1);
+                        int LA56_46 = input.LA(1);
 
                          
-                        int index54_32 = input.index();
+                        int index56_46 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_32==ID) ) {s = 64;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_32==LEFT_PAREN) ) {s = 65;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_32==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_32>=PACKAGE && LA54_32<=FUNCTION)||(LA54_32>=DOT && LA54_32<=GLOBAL)||LA54_32==COMMA||(LA54_32>=DECLARE && LA54_32<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_32);
+                        input.seek(index56_46);
                         if ( s>=0 ) return s;
                         break;
                     case 37 : 
-                        int LA54_56 = input.LA(1);
+                        int LA56_38 = input.LA(1);
 
                          
-                        int index54_56 = input.index();
+                        int index56_38 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_56==ID) ) {s = 93;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_56==LEFT_PAREN) ) {s = 94;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_56==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_56>=PACKAGE && LA54_56<=FUNCTION)||(LA54_56>=DOT && LA54_56<=GLOBAL)||LA54_56==COMMA||(LA54_56>=DECLARE && LA54_56<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_56);
+                        input.seek(index56_38);
                         if ( s>=0 ) return s;
                         break;
                     case 38 : 
-                        int LA54_60 = input.LA(1);
+                        int LA56_40 = input.LA(1);
 
                          
-                        int index54_60 = input.index();
+                        int index56_40 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_60==ID) ) {s = 97;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_60==LEFT_PAREN) ) {s = 98;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_60==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_60>=PACKAGE && LA54_60<=FUNCTION)||(LA54_60>=DOT && LA54_60<=GLOBAL)||LA54_60==COMMA||(LA54_60>=DECLARE && LA54_60<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_60);
+                        input.seek(index56_40);
                         if ( s>=0 ) return s;
                         break;
                     case 39 : 
-                        int LA54_5 = input.LA(1);
+                        int LA56_29 = input.LA(1);
 
                          
-                        int index54_5 = input.index();
+                        int index56_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_5==LEFT_PAREN) ) {s = 20;}
+                        if ( (LA56_29==COLON) ) {s = 60;}
 
-                        else if ( (LA54_5==EXISTS) ) {s = 21;}
+                        else if ( (LA56_29==DOT) ) {s = 61;}
 
-                        else if ( (LA54_5==NOT) ) {s = 22;}
+                        else if ( (LA56_29==LEFT_SQUARE) ) {s = 62;}
 
-                        else if ( (LA54_5==EVAL) ) {s = 23;}
+                        else if ( (LA56_29==LEFT_PAREN) ) {s = 63;}
 
-                        else if ( (LA54_5==FORALL) ) {s = 24;}
+                        else if ( (LA56_29==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_5==ID) ) {s = 25;}
+                        else if ( ((LA56_29>=PACKAGE && LA56_29<=ID)||LA56_29==GLOBAL||LA56_29==COMMA||(LA56_29>=DECLARE && LA56_29<=AT)||(LA56_29>=EQUALS && LA56_29<=ENTRY_POINT)||(LA56_29>=RIGHT_SQUARE && LA56_29<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_5==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_5>=PACKAGE && LA54_5<=FUNCTION)||(LA54_5>=DOT && LA54_5<=GLOBAL)||LA54_5==COMMA||(LA54_5>=DECLARE && LA54_5<=FROM)||(LA54_5>=ACCUMULATE && LA54_5<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_5);
+                        input.seek(index56_29);
                         if ( s>=0 ) return s;
                         break;
                     case 40 : 
-                        int LA54_14 = input.LA(1);
+                        int LA56_27 = input.LA(1);
 
                          
-                        int index54_14 = input.index();
+                        int index56_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_14==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (LA56_27==COLON) ) {s = 56;}
 
-                        else if ( (LA54_14==ID) ) {s = 36;}
+                        else if ( (LA56_27==DOT) ) {s = 57;}
 
-                        else if ( (LA54_14==LEFT_PAREN) ) {s = 37;}
+                        else if ( (LA56_27==LEFT_SQUARE) ) {s = 58;}
 
-                        else if ( ((LA54_14>=PACKAGE && LA54_14<=FUNCTION)||(LA54_14>=DOT && LA54_14<=GLOBAL)||LA54_14==COMMA||(LA54_14>=DECLARE && LA54_14<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_27==LEFT_PAREN) ) {s = 59;}
 
+                        else if ( (LA56_27==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_27>=PACKAGE && LA56_27<=ID)||LA56_27==GLOBAL||LA56_27==COMMA||(LA56_27>=DECLARE && LA56_27<=AT)||(LA56_27>=EQUALS && LA56_27<=ENTRY_POINT)||(LA56_27>=RIGHT_SQUARE && LA56_27<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_14);
+                        input.seek(index56_27);
                         if ( s>=0 ) return s;
                         break;
                     case 41 : 
-                        int LA54_48 = input.LA(1);
+                        int LA56_11 = input.LA(1);
 
                          
-                        int index54_48 = input.index();
+                        int index56_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_11==COLON) ) {s = 32;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_11==DOT) ) {s = 33;}
 
+                        else if ( (LA56_11==LEFT_SQUARE) ) {s = 34;}
+
+                        else if ( (LA56_11==LEFT_PAREN) ) {s = 35;}
+
+                        else if ( (LA56_11==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_11>=PACKAGE && LA56_11<=ID)||LA56_11==GLOBAL||LA56_11==COMMA||(LA56_11>=DECLARE && LA56_11<=AT)||(LA56_11>=EQUALS && LA56_11<=ENTRY_POINT)||(LA56_11>=RIGHT_SQUARE && LA56_11<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_48);
+                        input.seek(index56_11);
                         if ( s>=0 ) return s;
                         break;
                     case 42 : 
-                        int LA54_28 = input.LA(1);
+                        int LA56_45 = input.LA(1);
 
                          
-                        int index54_28 = input.index();
+                        int index56_45 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_28);
+                        input.seek(index56_45);
                         if ( s>=0 ) return s;
                         break;
                     case 43 : 
-                        int LA54_0 = input.LA(1);
+                        int LA56_34 = input.LA(1);
 
                          
-                        int index54_0 = input.index();
+                        int index56_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_0==LEFT_SQUARE) && (synpred9())) {s = 1;}
+                        if ( (LA56_34==RIGHT_SQUARE) ) {s = 68;}
 
-                        else if ( (LA54_0==LEFT_PAREN) ) {s = 2;}
+                        else if ( (LA56_34==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_0>=ID && LA54_0<=DOT)||(LA54_0>=COMMA && LA54_0<=RIGHT_PAREN)||LA54_0==END||(LA54_0>=OR && LA54_0<=DOUBLE_AMPER)||(LA54_0>=EXISTS && LA54_0<=FORALL)||LA54_0==INIT||LA54_0==THEN||LA54_0==76) ) {s = 3;}
+                        else if ( ((LA56_34>=PACKAGE && LA56_34<=GLOBAL)||LA56_34==COMMA||(LA56_34>=DECLARE && LA56_34<=LEFT_SQUARE)||(LA56_34>=CONTAINS && LA56_34<=87)) && (synpred10())) {s = 12;}
 
+                        else if ( (LA56_34==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index54_0);
+                        input.seek(index56_34);
                         if ( s>=0 ) return s;
                         break;
                     case 44 : 
-                        int LA54_21 = input.LA(1);
+                        int LA56_22 = input.LA(1);
 
                          
-                        int index54_21 = input.index();
+                        int index56_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_21==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (LA56_22==LEFT_PAREN) ) {s = 48;}
 
-                        else if ( (LA54_21==ID) ) {s = 46;}
+                        else if ( (LA56_22==ID) ) {s = 49;}
 
-                        else if ( (LA54_21==LEFT_PAREN) ) {s = 47;}
+                        else if ( (LA56_22==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_21>=PACKAGE && LA54_21<=FUNCTION)||(LA54_21>=DOT && LA54_21<=GLOBAL)||LA54_21==COMMA||(LA54_21>=DECLARE && LA54_21<=85)) && (synpred10())) {s = 12;}
+                        else if ( ((LA56_22>=PACKAGE && LA56_22<=FUNCTION)||(LA56_22>=DOT && LA56_22<=GLOBAL)||LA56_22==COMMA||(LA56_22>=DECLARE && LA56_22<=87)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index54_21);
+                        input.seek(index56_22);
                         if ( s>=0 ) return s;
                         break;
                     case 45 : 
-                        int LA54_53 = input.LA(1);
+                        int LA56_58 = input.LA(1);
 
                          
-                        int index54_53 = input.index();
+                        int index56_58 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA54_53>=PACKAGE && LA54_53<=ID)||LA54_53==GLOBAL||(LA54_53>=QUERY && LA54_53<=ATTRIBUTES)||LA54_53==ENABLED||LA54_53==SALIENCE||(LA54_53>=DURATION && LA54_53<=DIALECT)||LA54_53==FROM||(LA54_53>=INIT && LA54_53<=RESULT)||LA54_53==IN||(LA54_53>=THEN && LA54_53<=EVENT)) ) {s = 91;}
+                        if ( (LA56_58==RIGHT_SQUARE) ) {s = 96;}
 
-                        else if ( (LA54_53==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_58==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_53==DOT||LA54_53==COMMA||(LA54_53>=DECLARE && LA54_53<=STRING)||(LA54_53>=DATE_EFFECTIVE && LA54_53<=DATE_EXPIRES)||LA54_53==BOOL||(LA54_53>=INT && LA54_53<=AGENDA_GROUP)||(LA54_53>=LOCK_ON_ACTIVE && LA54_53<=DOUBLE_AMPER)||(LA54_53>=EXISTS && LA54_53<=ACCUMULATE)||(LA54_53>=COLLECT && LA54_53<=TILDE)||(LA54_53>=FLOAT && LA54_53<=RIGHT_SQUARE)||(LA54_53>=EOL && LA54_53<=85)) && (synpred10())) {s = 12;}
+                        else if ( ((LA56_58>=PACKAGE && LA56_58<=GLOBAL)||LA56_58==COMMA||(LA56_58>=DECLARE && LA56_58<=LEFT_SQUARE)||(LA56_58>=CONTAINS && LA56_58<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_53==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_58==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index54_53);
+                        input.seek(index56_58);
                         if ( s>=0 ) return s;
                         break;
                     case 46 : 
-                        int LA54_47 = input.LA(1);
+                        int LA56_62 = input.LA(1);
 
                          
-                        int index54_47 = input.index();
+                        int index56_62 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_62==RIGHT_SQUARE) ) {s = 100;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_62==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA56_62>=PACKAGE && LA56_62<=GLOBAL)||LA56_62==COMMA||(LA56_62>=DECLARE && LA56_62<=LEFT_SQUARE)||(LA56_62>=CONTAINS && LA56_62<=87)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA56_62==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index54_47);
+                        input.seek(index56_62);
                         if ( s>=0 ) return s;
                         break;
                     case 47 : 
-                        int LA54_54 = input.LA(1);
+                        int LA56_21 = input.LA(1);
 
                          
-                        int index54_54 = input.index();
+                        int index56_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_54==RIGHT_SQUARE) ) {s = 92;}
+                        if ( (LA56_21==LEFT_PAREN) ) {s = 46;}
 
-                        else if ( (LA54_54==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_21==ID) ) {s = 47;}
 
-                        else if ( ((LA54_54>=PACKAGE && LA54_54<=GLOBAL)||LA54_54==COMMA||(LA54_54>=DECLARE && LA54_54<=LEFT_SQUARE)||(LA54_54>=THEN && LA54_54<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_21==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_54==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( ((LA56_21>=PACKAGE && LA56_21<=FUNCTION)||(LA56_21>=DOT && LA56_21<=GLOBAL)||LA56_21==COMMA||(LA56_21>=DECLARE && LA56_21<=87)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index54_54);
+                        input.seek(index56_21);
                         if ( s>=0 ) return s;
                         break;
                     case 48 : 
-                        int LA54_41 = input.LA(1);
+                        int LA56_4 = input.LA(1);
 
                          
-                        int index54_41 = input.index();
+                        int index56_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_4==EXISTS) ) {s = 14;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_4==NOT) ) {s = 15;}
 
+                        else if ( (LA56_4==EVAL) ) {s = 16;}
+
+                        else if ( (LA56_4==FORALL) ) {s = 17;}
+
+                        else if ( (LA56_4==LEFT_PAREN) ) {s = 18;}
+
+                        else if ( (LA56_4==ID) ) {s = 19;}
+
+                        else if ( (LA56_4==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_4>=PACKAGE && LA56_4<=FUNCTION)||(LA56_4>=DOT && LA56_4<=GLOBAL)||LA56_4==COMMA||(LA56_4>=DECLARE && LA56_4<=FROM)||(LA56_4>=ACCUMULATE && LA56_4<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_41);
+                        input.seek(index56_4);
                         if ( s>=0 ) return s;
                         break;
                     case 49 : 
-                        int LA54_38 = input.LA(1);
+                        int LA56_41 = input.LA(1);
 
                          
-                        int index54_38 = input.index();
+                        int index56_41 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred10()) ) {s = 67;}
@@ -9180,71 +9452,63 @@
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_38);
+                        input.seek(index56_41);
                         if ( s>=0 ) return s;
                         break;
                     case 50 : 
-                        int LA54_23 = input.LA(1);
+                        int LA56_35 = input.LA(1);
 
                          
-                        int index54_23 = input.index();
+                        int index56_35 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_23==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( ((LA54_23>=PACKAGE && LA54_23<=GLOBAL)||LA54_23==COMMA||(LA54_23>=DECLARE && LA54_23<=85)) && (synpred10())) {s = 12;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_23==LEFT_PAREN) ) {s = 50;}
-
                          
-                        input.seek(index54_23);
+                        input.seek(index56_35);
                         if ( s>=0 ) return s;
                         break;
                     case 51 : 
-                        int LA54_42 = input.LA(1);
+                        int LA56_63 = input.LA(1);
 
                          
-                        int index54_42 = input.index();
+                        int index56_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_42==ID) ) {s = 77;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA54_42==LEFT_PAREN) ) {s = 78;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA54_42==RIGHT_PAREN) && (synpred10())) {s = 13;}
-
-                        else if ( ((LA54_42>=PACKAGE && LA54_42<=FUNCTION)||(LA54_42>=DOT && LA54_42<=GLOBAL)||LA54_42==COMMA||(LA54_42>=DECLARE && LA54_42<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_42);
+                        input.seek(index56_63);
                         if ( s>=0 ) return s;
                         break;
                     case 52 : 
-                        int LA54_66 = input.LA(1);
+                        int LA56_7 = input.LA(1);
 
                          
-                        int index54_66 = input.index();
+                        int index56_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_66==LEFT_SQUARE) ) {s = 34;}
+                        if ( (LA56_7==LEFT_PAREN) ) {s = 26;}
 
-                        else if ( (LA54_66==LEFT_PAREN) ) {s = 35;}
+                        else if ( (LA56_7==ID) ) {s = 27;}
 
-                        else if ( (LA54_66==DOT) ) {s = 33;}
+                        else if ( (LA56_7==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_66==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( ((LA56_7>=PACKAGE && LA56_7<=FUNCTION)||(LA56_7>=DOT && LA56_7<=GLOBAL)||LA56_7==COMMA||(LA56_7>=DECLARE && LA56_7<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA54_66>=PACKAGE && LA54_66<=ID)||LA54_66==GLOBAL||LA54_66==COMMA||(LA54_66>=DECLARE && LA54_66<=NULL)||(LA54_66>=RIGHT_SQUARE && LA54_66<=85)) && (synpred10())) {s = 12;}
-
                          
-                        input.seek(index54_66);
+                        input.seek(index56_7);
                         if ( s>=0 ) return s;
                         break;
                     case 53 : 
-                        int LA54_26 = input.LA(1);
+                        int LA56_26 = input.LA(1);
 
                          
-                        int index54_26 = input.index();
+                        int index56_26 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred10()) ) {s = 13;}
@@ -9252,179 +9516,197 @@
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_26);
+                        input.seek(index56_26);
                         if ( s>=0 ) return s;
                         break;
                     case 54 : 
-                        int LA54_15 = input.LA(1);
+                        int LA56_52 = input.LA(1);
 
                          
-                        int index54_15 = input.index();
+                        int index56_52 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_15==LEFT_PAREN) ) {s = 38;}
+                        if ( (LA56_52==ID) ) {s = 89;}
 
-                        else if ( (LA54_15==ID) ) {s = 39;}
+                        else if ( (LA56_52==LEFT_PAREN) ) {s = 90;}
 
-                        else if ( (LA54_15==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_52==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_15>=PACKAGE && LA54_15<=FUNCTION)||(LA54_15>=DOT && LA54_15<=GLOBAL)||LA54_15==COMMA||(LA54_15>=DECLARE && LA54_15<=85)) && (synpred10())) {s = 12;}
+                        else if ( ((LA56_52>=PACKAGE && LA56_52<=FUNCTION)||(LA56_52>=DOT && LA56_52<=GLOBAL)||LA56_52==COMMA||(LA56_52>=DECLARE && LA56_52<=87)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index54_15);
+                        input.seek(index56_52);
                         if ( s>=0 ) return s;
                         break;
                     case 55 : 
-                        int LA54_37 = input.LA(1);
+                        int LA56_30 = input.LA(1);
 
                          
-                        int index54_37 = input.index();
+                        int index56_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_37);
+                        input.seek(index56_30);
                         if ( s>=0 ) return s;
                         break;
                     case 56 : 
-                        int LA54_6 = input.LA(1);
+                        int LA56_59 = input.LA(1);
 
                          
-                        int index54_6 = input.index();
+                        int index56_59 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index54_6);
+                        input.seek(index56_59);
                         if ( s>=0 ) return s;
                         break;
                     case 57 : 
-                        int LA54_44 = input.LA(1);
+                        int LA56_33 = input.LA(1);
 
                          
-                        int index54_44 = input.index();
+                        int index56_33 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_44==RIGHT_SQUARE) ) {s = 80;}
+                        if ( ((LA56_33>=PACKAGE && LA56_33<=ID)||LA56_33==GLOBAL||LA56_33==END||(LA56_33>=QUERY && LA56_33<=ATTRIBUTES)||LA56_33==ENABLED||LA56_33==SALIENCE||(LA56_33>=DURATION && LA56_33<=DIALECT)||LA56_33==FROM||(LA56_33>=INIT && LA56_33<=RESULT)||LA56_33==IN||(LA56_33>=THEN && LA56_33<=EVENT)) ) {s = 66;}
 
-                        else if ( (LA54_44==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_33==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA54_44>=PACKAGE && LA54_44<=GLOBAL)||LA54_44==COMMA||(LA54_44>=DECLARE && LA54_44<=LEFT_SQUARE)||(LA54_44>=THEN && LA54_44<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_33==DOT||LA56_33==COMMA||LA56_33==DECLARE||(LA56_33>=AT && LA56_33<=EQUALS)||(LA56_33>=DATE_EFFECTIVE && LA56_33<=DATE_EXPIRES)||LA56_33==BOOL||(LA56_33>=INT && LA56_33<=AGENDA_GROUP)||(LA56_33>=LOCK_ON_ACTIVE && LA56_33<=DOUBLE_AMPER)||(LA56_33>=EXISTS && LA56_33<=ACCUMULATE)||(LA56_33>=COLLECT && LA56_33<=TILDE)||(LA56_33>=FLOAT && LA56_33<=RIGHT_CURLY)||(LA56_33>=EOL && LA56_33<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_44==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_33==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index54_44);
+                        input.seek(index56_33);
                         if ( s>=0 ) return s;
                         break;
                     case 58 : 
-                        int LA54_33 = input.LA(1);
+                        int LA56_57 = input.LA(1);
 
                          
-                        int index54_33 = input.index();
+                        int index56_57 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA54_33>=PACKAGE && LA54_33<=ID)||LA54_33==GLOBAL||(LA54_33>=QUERY && LA54_33<=ATTRIBUTES)||LA54_33==ENABLED||LA54_33==SALIENCE||(LA54_33>=DURATION && LA54_33<=DIALECT)||LA54_33==FROM||(LA54_33>=INIT && LA54_33<=RESULT)||LA54_33==IN||(LA54_33>=THEN && LA54_33<=EVENT)) ) {s = 66;}
+                        if ( ((LA56_57>=PACKAGE && LA56_57<=ID)||LA56_57==GLOBAL||LA56_57==END||(LA56_57>=QUERY && LA56_57<=ATTRIBUTES)||LA56_57==ENABLED||LA56_57==SALIENCE||(LA56_57>=DURATION && LA56_57<=DIALECT)||LA56_57==FROM||(LA56_57>=INIT && LA56_57<=RESULT)||LA56_57==IN||(LA56_57>=THEN && LA56_57<=EVENT)) ) {s = 95;}
 
-                        else if ( (LA54_33==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_57==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_33==DOT||LA54_33==COMMA||(LA54_33>=DECLARE && LA54_33<=STRING)||(LA54_33>=DATE_EFFECTIVE && LA54_33<=DATE_EXPIRES)||LA54_33==BOOL||(LA54_33>=INT && LA54_33<=AGENDA_GROUP)||(LA54_33>=LOCK_ON_ACTIVE && LA54_33<=DOUBLE_AMPER)||(LA54_33>=EXISTS && LA54_33<=ACCUMULATE)||(LA54_33>=COLLECT && LA54_33<=TILDE)||(LA54_33>=FLOAT && LA54_33<=RIGHT_SQUARE)||(LA54_33>=EOL && LA54_33<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_57==DOT||LA56_57==COMMA||LA56_57==DECLARE||(LA56_57>=AT && LA56_57<=EQUALS)||(LA56_57>=DATE_EFFECTIVE && LA56_57<=DATE_EXPIRES)||LA56_57==BOOL||(LA56_57>=INT && LA56_57<=AGENDA_GROUP)||(LA56_57>=LOCK_ON_ACTIVE && LA56_57<=DOUBLE_AMPER)||(LA56_57>=EXISTS && LA56_57<=ACCUMULATE)||(LA56_57>=COLLECT && LA56_57<=TILDE)||(LA56_57>=FLOAT && LA56_57<=RIGHT_CURLY)||(LA56_57>=EOL && LA56_57<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_33==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_57==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index54_33);
+                        input.seek(index56_57);
                         if ( s>=0 ) return s;
                         break;
                     case 59 : 
-                        int LA54_57 = input.LA(1);
+                        int LA56_61 = input.LA(1);
 
                          
-                        int index54_57 = input.index();
+                        int index56_61 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA54_57>=PACKAGE && LA54_57<=ID)||LA54_57==GLOBAL||(LA54_57>=QUERY && LA54_57<=ATTRIBUTES)||LA54_57==ENABLED||LA54_57==SALIENCE||(LA54_57>=DURATION && LA54_57<=DIALECT)||LA54_57==FROM||(LA54_57>=INIT && LA54_57<=RESULT)||LA54_57==IN||(LA54_57>=THEN && LA54_57<=EVENT)) ) {s = 95;}
+                        if ( ((LA56_61>=PACKAGE && LA56_61<=ID)||LA56_61==GLOBAL||LA56_61==END||(LA56_61>=QUERY && LA56_61<=ATTRIBUTES)||LA56_61==ENABLED||LA56_61==SALIENCE||(LA56_61>=DURATION && LA56_61<=DIALECT)||LA56_61==FROM||(LA56_61>=INIT && LA56_61<=RESULT)||LA56_61==IN||(LA56_61>=THEN && LA56_61<=EVENT)) ) {s = 99;}
 
-                        else if ( (LA54_57==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_61==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA54_57==DOT||LA54_57==COMMA||(LA54_57>=DECLARE && LA54_57<=STRING)||(LA54_57>=DATE_EFFECTIVE && LA54_57<=DATE_EXPIRES)||LA54_57==BOOL||(LA54_57>=INT && LA54_57<=AGENDA_GROUP)||(LA54_57>=LOCK_ON_ACTIVE && LA54_57<=DOUBLE_AMPER)||(LA54_57>=EXISTS && LA54_57<=ACCUMULATE)||(LA54_57>=COLLECT && LA54_57<=TILDE)||(LA54_57>=FLOAT && LA54_57<=RIGHT_SQUARE)||(LA54_57>=EOL && LA54_57<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_61==DOT||LA56_61==COMMA||LA56_61==DECLARE||(LA56_61>=AT && LA56_61<=EQUALS)||(LA56_61>=DATE_EFFECTIVE && LA56_61<=DATE_EXPIRES)||LA56_61==BOOL||(LA56_61>=INT && LA56_61<=AGENDA_GROUP)||(LA56_61>=LOCK_ON_ACTIVE && LA56_61<=DOUBLE_AMPER)||(LA56_61>=EXISTS && LA56_61<=ACCUMULATE)||(LA56_61>=COLLECT && LA56_61<=TILDE)||(LA56_61>=FLOAT && LA56_61<=RIGHT_CURLY)||(LA56_61>=EOL && LA56_61<=87)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA54_57==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_61==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index54_57);
+                        input.seek(index56_61);
                         if ( s>=0 ) return s;
                         break;
                     case 60 : 
-                        int LA54_61 = input.LA(1);
+                        int LA56_39 = input.LA(1);
 
                          
-                        int index54_61 = input.index();
+                        int index56_39 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_61==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        if ( (LA56_39==COLON) ) {s = 73;}
 
-                        else if ( ((LA54_61>=PACKAGE && LA54_61<=ID)||LA54_61==GLOBAL||(LA54_61>=QUERY && LA54_61<=ATTRIBUTES)||LA54_61==ENABLED||LA54_61==SALIENCE||(LA54_61>=DURATION && LA54_61<=DIALECT)||LA54_61==FROM||(LA54_61>=INIT && LA54_61<=RESULT)||LA54_61==IN||(LA54_61>=THEN && LA54_61<=EVENT)) ) {s = 99;}
+                        else if ( (LA56_39==DOT) ) {s = 74;}
 
-                        else if ( (LA54_61==LEFT_PAREN) && (synpred10())) {s = 67;}
+                        else if ( (LA56_39==LEFT_SQUARE) ) {s = 75;}
 
-                        else if ( (LA54_61==DOT||LA54_61==COMMA||(LA54_61>=DECLARE && LA54_61<=STRING)||(LA54_61>=DATE_EFFECTIVE && LA54_61<=DATE_EXPIRES)||LA54_61==BOOL||(LA54_61>=INT && LA54_61<=AGENDA_GROUP)||(LA54_61>=LOCK_ON_ACTIVE && LA54_61<=DOUBLE_AMPER)||(LA54_61>=EXISTS && LA54_61<=ACCUMULATE)||(LA54_61>=COLLECT && LA54_61<=TILDE)||(LA54_61>=FLOAT && LA54_61<=RIGHT_SQUARE)||(LA54_61>=EOL && LA54_61<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_39==LEFT_PAREN) ) {s = 76;}
 
+                        else if ( (LA56_39==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_39>=PACKAGE && LA56_39<=ID)||LA56_39==GLOBAL||LA56_39==COMMA||(LA56_39>=DECLARE && LA56_39<=AT)||(LA56_39>=EQUALS && LA56_39<=ENTRY_POINT)||(LA56_39>=RIGHT_SQUARE && LA56_39<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_61);
+                        input.seek(index56_39);
                         if ( s>=0 ) return s;
                         break;
                     case 61 : 
-                        int LA54_45 = input.LA(1);
+                        int LA56_37 = input.LA(1);
 
                          
-                        int index54_45 = input.index();
+                        int index56_37 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred10()) ) {s = 67;}
+                        if ( (LA56_37==COLON) ) {s = 69;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA56_37==DOT) ) {s = 70;}
 
+                        else if ( (LA56_37==LEFT_SQUARE) ) {s = 71;}
+
+                        else if ( (LA56_37==LEFT_PAREN) ) {s = 72;}
+
+                        else if ( (LA56_37==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_37>=PACKAGE && LA56_37<=ID)||LA56_37==GLOBAL||LA56_37==COMMA||(LA56_37>=DECLARE && LA56_37<=AT)||(LA56_37>=EQUALS && LA56_37<=ENTRY_POINT)||(LA56_37>=RIGHT_SQUARE && LA56_37<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_45);
+                        input.seek(index56_37);
                         if ( s>=0 ) return s;
                         break;
                     case 62 : 
-                        int LA54_10 = input.LA(1);
+                        int LA56_19 = input.LA(1);
 
                          
-                        int index54_10 = input.index();
+                        int index56_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA54_10==LEFT_PAREN) ) {s = 31;}
+                        if ( (LA56_19==COLON) ) {s = 42;}
 
-                        else if ( (LA54_10==RIGHT_PAREN) && (synpred10())) {s = 13;}
+                        else if ( (LA56_19==DOT) ) {s = 43;}
 
-                        else if ( ((LA54_10>=PACKAGE && LA54_10<=GLOBAL)||LA54_10==COMMA||(LA54_10>=DECLARE && LA54_10<=85)) && (synpred10())) {s = 12;}
+                        else if ( (LA56_19==LEFT_SQUARE) ) {s = 44;}
 
+                        else if ( (LA56_19==LEFT_PAREN) ) {s = 45;}
+
+                        else if ( (LA56_19==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA56_19>=PACKAGE && LA56_19<=ID)||LA56_19==GLOBAL||LA56_19==COMMA||(LA56_19>=DECLARE && LA56_19<=AT)||(LA56_19>=EQUALS && LA56_19<=ENTRY_POINT)||(LA56_19>=RIGHT_SQUARE && LA56_19<=87)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index54_10);
+                        input.seek(index56_19);
                         if ( s>=0 ) return s;
                         break;
             }
             if (backtracking>0) {failed=true; return -1;}
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 54, _s, input);
+                new NoViableAltException(getDescription(), 56, _s, input);
             error(nvae);
             throw nvae;
         }
     }
  
 
-    public static final BitSet FOLLOW_76_in_opt_semicolon39 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_prolog_in_compilation_unit57 = new BitSet(new long[]{0x0000001FEB9A2260L});
-    public static final BitSet FOLLOW_statement_in_compilation_unit62 = new BitSet(new long[]{0x0000001FEB9A2260L});
+    public static final BitSet FOLLOW_79_in_opt_semicolon39 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_prolog_in_compilation_unit57 = new BitSet(new long[]{0x0000003FD69C2260L});
+    public static final BitSet FOLLOW_statement_in_compilation_unit62 = new BitSet(new long[]{0x0000003FD69C2260L});
     public static final BitSet FOLLOW_EOF_in_compilation_unit67 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_package_statement_in_prolog96 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule_attribute_in_statement121 = new BitSet(new long[]{0x0000000000000002L});
@@ -9436,338 +9718,354 @@
     public static final BitSet FOLLOW_rule_in_statement169 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_query_in_statement181 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_type_declaration_in_statement196 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_package_statement222 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_dotted_name_in_package_statement226 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
+    public static final BitSet FOLLOW_PACKAGE_in_package_statement222 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_dotted_name_in_package_statement226 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
     public static final BitSet FOLLOW_opt_semicolon_in_package_statement228 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_IMPORT_in_import_statement259 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_import_name_in_import_statement282 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
+    public static final BitSet FOLLOW_import_name_in_import_statement282 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
     public static final BitSet FOLLOW_opt_semicolon_in_import_statement285 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_IMPORT_in_function_import_statement309 = new BitSet(new long[]{0x0000000000000040L});
     public static final BitSet FOLLOW_FUNCTION_in_function_import_statement311 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_import_name_in_function_import_statement334 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
+    public static final BitSet FOLLOW_import_name_in_function_import_statement334 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
     public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_name362 = new BitSet(new long[]{0x0000000000000102L,0x0000000000002000L});
-    public static final BitSet FOLLOW_DOT_in_import_name374 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_import_name378 = new BitSet(new long[]{0x0000000000000102L,0x0000000000002000L});
-    public static final BitSet FOLLOW_77_in_import_name402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_global436 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_dotted_name_in_global447 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_global458 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
+    public static final BitSet FOLLOW_ID_in_import_name362 = new BitSet(new long[]{0x0000000000000102L,0x0000000000010000L});
+    public static final BitSet FOLLOW_DOT_in_import_name374 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_import_name378 = new BitSet(new long[]{0x0000000000000102L,0x0000000000010000L});
+    public static final BitSet FOLLOW_80_in_import_name402 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_GLOBAL_in_global436 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_dotted_name_in_global447 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_global458 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
     public static final BitSet FOLLOW_opt_semicolon_in_global460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_function485 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_dotted_name_in_function489 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
+    public static final BitSet FOLLOW_FUNCTION_in_function485 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_dotted_name_in_function489 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
     public static final BitSet FOLLOW_identifier_in_function494 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_function503 = new BitSet(new long[]{0x0807820C0A7E12F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_dotted_name_in_function512 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_function503 = new BitSet(new long[]{0x400F0418147C52F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_dotted_name_in_function512 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
     public static final BitSet FOLLOW_argument_in_function517 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_COMMA_in_function531 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_dotted_name_in_function535 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
+    public static final BitSet FOLLOW_COMMA_in_function531 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_dotted_name_in_function535 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
     public static final BitSet FOLLOW_argument_in_function540 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_function564 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_function564 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000002L});
     public static final BitSet FOLLOW_curly_chunk_in_function570 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_argument597 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument603 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument605 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_DECLARE_in_type_declaration645 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_type_declaration649 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_type_declaration694 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_type_decl_attribute_in_type_declaration720 = new BitSet(new long[]{0x0000000000008800L});
-    public static final BitSet FOLLOW_COMMA_in_type_declaration725 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_type_decl_attribute_in_type_declaration727 = new BitSet(new long[]{0x0000000000008800L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_type_declaration749 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_type_decl_attribute785 = new BitSet(new long[]{0x0807820C0A7F02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_STRING_in_type_decl_attribute808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_type_decl_attribute849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_query922 = new BitSet(new long[]{0x0000000000010080L});
-    public static final BitSet FOLLOW_name_in_query926 = new BitSet(new long[]{0x00003C0000040480L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_query936 = new BitSet(new long[]{0x0000000000001080L});
-    public static final BitSet FOLLOW_qualified_id_in_query971 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ID_in_query976 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_COMMA_in_query997 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_qualified_id_in_query1001 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ID_in_query1006 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_query1056 = new BitSet(new long[]{0x00003C0000040480L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query1085 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_END_in_query1090 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_query1092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_template1120 = new BitSet(new long[]{0x0000000000010080L});
-    public static final BitSet FOLLOW_name_in_template1124 = new BitSet(new long[]{0x0000000000000080L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template1126 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_template_slot_in_template1141 = new BitSet(new long[]{0x0000000000040080L});
-    public static final BitSet FOLLOW_END_in_template1156 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template1158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualified_id_in_template_slot1204 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_template_slot1220 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template_slot1222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_rule1253 = new BitSet(new long[]{0x0000000000010080L});
-    public static final BitSet FOLLOW_name_in_rule1257 = new BitSet(new long[]{0x0000001FEBE00000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule1266 = new BitSet(new long[]{0x0000000000200000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_WHEN_in_rule1278 = new BitSet(new long[]{0x00003C0000000480L,0x0000000000004001L});
-    public static final BitSet FOLLOW_78_in_rule1280 = new BitSet(new long[]{0x00003C0000000480L,0x0000000000000001L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule1291 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule1301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes1321 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_78_in_rule_attributes1323 = new BitSet(new long[]{0x0000001FEB800000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1331 = new BitSet(new long[]{0x0000001FEB800802L});
-    public static final BitSet FOLLOW_COMMA_in_rule_attributes1338 = new BitSet(new long[]{0x0000001FEB800000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1343 = new BitSet(new long[]{0x0000001FEB800802L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute1380 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute1388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1415 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1423 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1431 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1439 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1447 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1455 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_in_rule_attribute1470 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1496 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_date_effective1498 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1527 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_date_expires1529 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_enabled1558 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1560 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_salience1593 = new BitSet(new long[]{0x0000000010000400L});
-    public static final BitSet FOLLOW_INT_in_salience1604 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_salience1619 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1649 = new BitSet(new long[]{0x0000000004000002L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1697 = new BitSet(new long[]{0x0000000004000002L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1710 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1746 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1776 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1806 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1808 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_duration1836 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_INT_in_duration1838 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DIALECT_in_dialect1866 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_STRING_in_dialect1868 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1900 = new BitSet(new long[]{0x0000000004000002L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1952 = new BitSet(new long[]{0x00003C0000000482L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2014 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_OR_in_lhs_or2016 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2029 = new BitSet(new long[]{0x00003C0000001480L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2040 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2058 = new BitSet(new long[]{0x0000006000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_or2066 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or2082 = new BitSet(new long[]{0x0000006000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2113 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_AND_in_lhs_and2115 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2127 = new BitSet(new long[]{0x00003C0000001480L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2137 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2155 = new BitSet(new long[]{0x0000018000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_and2163 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2179 = new BitSet(new long[]{0x0000018000000002L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2224 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2242 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2261 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2280 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2297 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2301 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2303 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2314 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary2326 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2353 = new BitSet(new long[]{0x0000020000000002L});
-    public static final BitSet FOLLOW_FROM_in_pattern_source2404 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2408 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_pattern_source2428 = new BitSet(new long[]{0x080FC20C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2486 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_collect_statement_in_pattern_source2509 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_statement_in_pattern_source2546 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_lhs_exist2589 = new BitSet(new long[]{0x0000000000000480L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2609 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2613 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2643 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_lhs_not2745 = new BitSet(new long[]{0x0000000000000480L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2758 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2762 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2793 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2830 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_lhs_eval2876 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_lhs_forall2913 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2915 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2919 = new BitSet(new long[]{0x0000000000001080L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2934 = new BitSet(new long[]{0x0000000000001080L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2950 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern2983 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_pattern2991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_from_statement3018 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement3055 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement3065 = new BitSet(new long[]{0x00003C0000000480L});
-    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement3069 = new BitSet(new long[]{0x0000800000000880L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3071 = new BitSet(new long[]{0x0000800000000080L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_statement3089 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3102 = new BitSet(new long[]{0x0001000000000800L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3104 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_ACTION_in_accumulate_statement3115 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3119 = new BitSet(new long[]{0x0006000000000800L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3121 = new BitSet(new long[]{0x0006000000000000L});
-    public static final BitSet FOLLOW_REVERSE_in_accumulate_statement3134 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3138 = new BitSet(new long[]{0x0004000000000800L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3140 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_RESULT_in_accumulate_statement3157 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3161 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_ID_in_accumulate_statement3187 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3191 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement3208 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_from_source3239 = new BitSet(new long[]{0x0000000000000502L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source3267 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source3280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOT_in_expression_chain3311 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_expression_chain3315 = new BitSet(new long[]{0x4000000000000502L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain3346 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3379 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain3394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_collect_statement3445 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3455 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_pattern_source_in_collect_statement3459 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENTRY_POINT_in_entrypoint_statement3498 = new BitSet(new long[]{0x0000000000010080L});
-    public static final BitSet FOLLOW_name_in_entrypoint_statement3510 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_fact_binding3542 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_78_in_fact_binding3544 = new BitSet(new long[]{0x0000000000000480L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3558 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3574 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3578 = new BitSet(new long[]{0x0000006000001000L});
-    public static final BitSet FOLLOW_set_in_fact_binding3591 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3603 = new BitSet(new long[]{0x0000006000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualified_id_in_fact3676 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3686 = new BitSet(new long[]{0x0807920C0A7E16F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_constraints_in_fact3698 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EOF_in_fact3714 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints3732 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_COMMA_in_constraints3739 = new BitSet(new long[]{0x0807920C0A7E06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_constraint_in_constraints3748 = new BitSet(new long[]{0x0000000000000802L});
-    public static final BitSet FOLLOW_or_constr_in_constraint3781 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3804 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3812 = new BitSet(new long[]{0x0807920C0A7E06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3821 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3853 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3861 = new BitSet(new long[]{0x0807920C0A7E06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3870 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_unary_constr3898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3906 = new BitSet(new long[]{0x0807920C0A7E06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_or_constr_in_unary_constr3908 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_unary_constr3917 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_predicate_in_unary_constr3919 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_field_constraint3958 = new BitSet(new long[]{0x0000000000000000L,0x0000000000004000L});
-    public static final BitSet FOLLOW_78_in_field_constraint3960 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3979 = new BitSet(new long[]{0x0FE0080000000402L,0x00000000003F8000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3993 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_79_in_field_constraint4008 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_predicate_in_field_constraint4010 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint4036 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint4045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4092 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective4116 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4127 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4159 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective4179 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4190 = new BitSet(new long[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression4227 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression4234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression4242 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4251 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4256 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_80_in_simple_operator4287 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_81_in_simple_operator4295 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_82_in_simple_operator4303 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_83_in_simple_operator4311 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_84_in_simple_operator4319 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_85_in_simple_operator4327 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4355 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4383 = new BitSet(new long[]{0x0020000000000000L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4387 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator4415 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4443 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_SOUNDSLIKE_in_simple_operator4471 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4499 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4503 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4531 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4559 = new BitSet(new long[]{0x0200000000000000L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4563 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_TILDE_in_simple_operator4569 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4573 = new BitSet(new long[]{0x7807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4577 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4586 = new BitSet(new long[]{0x0400000000000000L});
-    public static final BitSet FOLLOW_TILDE_in_simple_operator4588 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4592 = new BitSet(new long[]{0x7807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4596 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator4611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4641 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_NOT_in_compound_operator4653 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4655 = new BitSet(new long[]{0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4670 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4674 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator4681 = new BitSet(new long[]{0x3807820C1E7F06F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4685 = new BitSet(new long[]{0x0000000000001800L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_expression_value4728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value4748 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_value4762 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint4805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint4816 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4829 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint4840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint4852 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate4890 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk4908 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_set_in_curly_chunk4912 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk4921 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk4926 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk4940 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_set_in_paren_chunk4944 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk4953 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk4958 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk4971 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_set_in_square_chunk4975 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_square_chunk_in_square_chunk4984 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk4989 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_qualified_id5018 = new BitSet(new long[]{0x4000000000000102L});
-    public static final BitSet FOLLOW_DOT_in_qualified_id5024 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_qualified_id5026 = new BitSet(new long[]{0x4000000000000102L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_qualified_id5035 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_qualified_id5037 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name5071 = new BitSet(new long[]{0x4000000000000102L});
-    public static final BitSet FOLLOW_DOT_in_dotted_name5077 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name5081 = new BitSet(new long[]{0x4000000000000102L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name5090 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name5092 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path5126 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_DOT_in_accessor_path5132 = new BitSet(new long[]{0x0807820C0A7E02F0L,0x0000000000000003L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path5136 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_identifier_in_accessor_element5174 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_square_chunk_in_accessor_element5181 = new BitSet(new long[]{0x4000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk5202 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_set_in_rhs_chunk5210 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000003FFFFFL});
-    public static final BitSet FOLLOW_END_in_rhs_chunk5234 = new BitSet(new long[]{0x0000000000000002L,0x0000000000001000L});
-    public static final BitSet FOLLOW_opt_semicolon_in_rhs_chunk5236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_name5270 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_name5278 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_argument597 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument603 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument605 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_DECLARE_in_type_declaration645 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_type_declaration649 = new BitSet(new long[]{0x400F0418147CC2F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_decl_metadata_in_type_declaration702 = new BitSet(new long[]{0x400F0418147CC2F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_decl_field_in_type_declaration730 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_END_in_type_declaration750 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AT_in_decl_metadata784 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_decl_metadata788 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_decl_metadata792 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_decl_field853 = new BitSet(new long[]{0x0000000000030000L});
+    public static final BitSet FOLLOW_initialization_in_decl_field857 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_COLON_in_decl_field860 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_fact_in_decl_field864 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_decl_metadata_in_decl_field874 = new BitSet(new long[]{0x0000000000008002L});
+    public static final BitSet FOLLOW_EQUALS_in_initialization901 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_initialization905 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_QUERY_in_query939 = new BitSet(new long[]{0x0000000001000080L});
+    public static final BitSet FOLLOW_name_in_query943 = new BitSet(new long[]{0x0000780000004480L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_query953 = new BitSet(new long[]{0x0000000000001080L});
+    public static final BitSet FOLLOW_qualified_id_in_query988 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_ID_in_query993 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_COMMA_in_query1014 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_qualified_id_in_query1018 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_ID_in_query1023 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_query1073 = new BitSet(new long[]{0x0000780000004480L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query1102 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_END_in_query1107 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_query1109 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TEMPLATE_in_template1137 = new BitSet(new long[]{0x0000000001000080L});
+    public static final BitSet FOLLOW_name_in_template1141 = new BitSet(new long[]{0x0000000000000080L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template1143 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_template_slot_in_template1158 = new BitSet(new long[]{0x0000000000004080L});
+    public static final BitSet FOLLOW_END_in_template1173 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template1175 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualified_id_in_template_slot1221 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_template_slot1237 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template_slot1239 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_in_rule1270 = new BitSet(new long[]{0x0000000001000080L});
+    public static final BitSet FOLLOW_name_in_rule1274 = new BitSet(new long[]{0x0000003FD6E00000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule1283 = new BitSet(new long[]{0x0000000000200000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_WHEN_in_rule1295 = new BitSet(new long[]{0x0000780000010480L,0x0000000000000008L});
+    public static final BitSet FOLLOW_COLON_in_rule1297 = new BitSet(new long[]{0x0000780000000480L,0x0000000000000008L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_rule1308 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_rhs_chunk_in_rule1318 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes1338 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_COLON_in_rule_attributes1340 = new BitSet(new long[]{0x0000003FD6800000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1348 = new BitSet(new long[]{0x0000003FD6800802L});
+    public static final BitSet FOLLOW_COMMA_in_rule_attributes1355 = new BitSet(new long[]{0x0000003FD6800000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1360 = new BitSet(new long[]{0x0000003FD6800802L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1397 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1405 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1414 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1423 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1440 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1448 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1456 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1464 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1480 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_in_rule_attribute1487 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1513 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_date_effective1515 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1544 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_date_expires1546 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENABLED_in_enabled1575 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1577 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SALIENCE_in_salience1610 = new BitSet(new long[]{0x0000000020000400L});
+    public static final BitSet FOLLOW_INT_in_salience1621 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1636 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1666 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1679 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1714 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1727 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1763 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1765 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1793 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1795 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1823 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1825 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DURATION_in_duration1853 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_INT_in_duration1855 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DIALECT_in_dialect1883 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_STRING_in_dialect1885 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1917 = new BitSet(new long[]{0x0000000008000002L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active1930 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1969 = new BitSet(new long[]{0x0000780000000482L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs2006 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or2031 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_OR_in_lhs_or2033 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2046 = new BitSet(new long[]{0x0000780000001480L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or2057 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2075 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_or2083 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or2099 = new BitSet(new long[]{0x000000C000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and2130 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_AND_in_lhs_and2132 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2144 = new BitSet(new long[]{0x0000780000001480L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and2154 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2172 = new BitSet(new long[]{0x0000030000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_and2180 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and2196 = new BitSet(new long[]{0x0000030000000002L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary2241 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary2259 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2278 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2297 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2314 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2318 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2320 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2331 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary2343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2370 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2421 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2445 = new BitSet(new long[]{0x401F8418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_collect_statement_in_pattern_source2526 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_statement_in_pattern_source2563 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_lhs_exist2606 = new BitSet(new long[]{0x0000000000000480L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2626 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2630 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2660 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2710 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_lhs_not2762 = new BitSet(new long[]{0x0000000000000480L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2775 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2779 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2810 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2847 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_lhs_eval2893 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_lhs_forall2930 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2932 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2936 = new BitSet(new long[]{0x0000000000001080L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2951 = new BitSet(new long[]{0x0000000000001080L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2967 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern3000 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern3008 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_from_statement3035 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement3072 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement3082 = new BitSet(new long[]{0x0000780000000480L});
+    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement3086 = new BitSet(new long[]{0x0001000000000880L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3088 = new BitSet(new long[]{0x0001000000000080L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_statement3106 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3119 = new BitSet(new long[]{0x0002000000000800L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3121 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_ACTION_in_accumulate_statement3132 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3136 = new BitSet(new long[]{0x000C000000000800L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3138 = new BitSet(new long[]{0x000C000000000000L});
+    public static final BitSet FOLLOW_REVERSE_in_accumulate_statement3151 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3155 = new BitSet(new long[]{0x0008000000000800L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement3157 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_RESULT_in_accumulate_statement3174 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3178 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_ID_in_accumulate_statement3204 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement3208 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement3225 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_from_source3256 = new BitSet(new long[]{0x0000000000000502L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source3284 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source3297 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOT_in_expression_chain3328 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_expression_chain3332 = new BitSet(new long[]{0x0040000000000502L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain3363 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3396 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain3411 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement3462 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3472 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_pattern_source_in_collect_statement3476 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3478 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENTRY_POINT_in_entrypoint_statement3515 = new BitSet(new long[]{0x0000000001000080L});
+    public static final BitSet FOLLOW_name_in_entrypoint_statement3527 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_fact_binding3559 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_COLON_in_fact_binding3561 = new BitSet(new long[]{0x0000000000000480L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3575 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3591 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3595 = new BitSet(new long[]{0x000000C000001000L});
+    public static final BitSet FOLLOW_set_in_fact_binding3608 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3620 = new BitSet(new long[]{0x000000C000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3638 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualified_id_in_fact3693 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3703 = new BitSet(new long[]{0x404F2418147C56F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_constraints_in_fact3715 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3722 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EOF_in_fact3731 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints3750 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_behaviors_in_constraints3753 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_COMMA_in_constraints3760 = new BitSet(new long[]{0x404F2418147C46F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_constraint_in_constraints3770 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_behaviors_in_constraints3773 = new BitSet(new long[]{0x0000000000000802L});
+    public static final BitSet FOLLOW_or_constr_in_constraint3806 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_behaviors3821 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_behavior_in_behaviors3823 = new BitSet(new long[]{0x0080000000000800L});
+    public static final BitSet FOLLOW_COMMA_in_behaviors3827 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_behavior_in_behaviors3829 = new BitSet(new long[]{0x0080000000000800L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_behaviors3834 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_behavior3848 = new BitSet(new long[]{0x0000000000010402L});
+    public static final BitSet FOLLOW_COLON_in_behavior3851 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_ID_in_behavior3853 = new BitSet(new long[]{0x0000000000000402L});
+    public static final BitSet FOLLOW_paren_chunk_in_behavior3857 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3879 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3887 = new BitSet(new long[]{0x400F2418147C46F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3896 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3928 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3936 = new BitSet(new long[]{0x400F2418147C46F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3945 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr3973 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3981 = new BitSet(new long[]{0x400F2418147C46F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr3983 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3986 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_unary_constr3992 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_predicate_in_unary_constr3994 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_field_constraint4033 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_COLON_in_field_constraint4035 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint4054 = new BitSet(new long[]{0x7F00100000000402L,0x0000000000FE0000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint4068 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_81_in_field_constraint4083 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_predicate_in_field_constraint4085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint4111 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint4120 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4167 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective4191 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective4202 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4234 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective4254 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective4265 = new BitSet(new long[]{0x0000020000000002L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression4302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression4309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression4317 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4326 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4331 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_82_in_simple_operator4362 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_83_in_simple_operator4370 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_84_in_simple_operator4378 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_85_in_simple_operator4386 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_86_in_simple_operator4394 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_87_in_simple_operator4402 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4430 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4458 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4462 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator4490 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator4518 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_SOUNDSLIKE_in_simple_operator4546 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4574 = new BitSet(new long[]{0x0400000000000000L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator4578 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4606 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4634 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4638 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_TILDE_in_simple_operator4644 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4648 = new BitSet(new long[]{0xC04F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4652 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4661 = new BitSet(new long[]{0x2000000000000000L});
+    public static final BitSet FOLLOW_TILDE_in_simple_operator4663 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4667 = new BitSet(new long[]{0xC04F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4671 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator4686 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_in_compound_operator4716 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_NOT_in_compound_operator4728 = new BitSet(new long[]{0x4000000000000000L});
+    public static final BitSet FOLLOW_IN_in_compound_operator4730 = new BitSet(new long[]{0x0000000000000400L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4745 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4749 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator4756 = new BitSet(new long[]{0xC00F04183D7C46F0L,0x0000000000000019L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4760 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_expression_value4803 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value4823 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_value4837 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint4880 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint4891 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4904 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint4915 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint4927 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_predicate4965 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk4983 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_set_in_curly_chunk4987 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk4996 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk5001 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk5015 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_set_in_paren_chunk5019 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk5028 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk5033 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk5046 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_set_in_square_chunk5050 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_square_chunk_in_square_chunk5059 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk5064 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_qualified_id5093 = new BitSet(new long[]{0x0040000000000102L});
+    public static final BitSet FOLLOW_DOT_in_qualified_id5099 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_qualified_id5101 = new BitSet(new long[]{0x0040000000000102L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_qualified_id5110 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_qualified_id5112 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_identifier_in_dotted_name5146 = new BitSet(new long[]{0x0040000000000102L});
+    public static final BitSet FOLLOW_DOT_in_dotted_name5152 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_identifier_in_dotted_name5156 = new BitSet(new long[]{0x0040000000000102L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name5165 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name5167 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path5201 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_DOT_in_accessor_path5207 = new BitSet(new long[]{0x400F0418147C42F0L,0x0000000000000018L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path5211 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_identifier_in_accessor_element5249 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_square_chunk_in_accessor_element5256 = new BitSet(new long[]{0x0040000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk5277 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_set_in_rhs_chunk5285 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000000000FFFFFFL});
+    public static final BitSet FOLLOW_END_in_rhs_chunk5309 = new BitSet(new long[]{0x0000000000000002L,0x0000000000008000L});
+    public static final BitSet FOLLOW_opt_semicolon_in_rhs_chunk5311 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_name5345 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_name5353 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_set_in_identifier0 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_synpred12216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_synpred22234 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_synpred32253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_synpred42272 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred52291 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FROM_in_synpred62397 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_ENTRY_POINT_in_synpred62399 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred93338 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred103371 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred114116 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_synpred114127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred124179 = new BitSet(new long[]{0x0FE0080000000400L,0x00000000003F0000L});
-    public static final BitSet FOLLOW_constraint_expression_in_synpred124190 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_synpred12233 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_synpred22251 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_synpred32270 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_synpred42289 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred52308 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_synpred62414 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_ENTRY_POINT_in_synpred62416 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred93355 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred103388 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred114191 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_synpred114202 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred124254 = new BitSet(new long[]{0x7F00100000000400L,0x0000000000FC0000L});
+    public static final BitSet FOLLOW_constraint_expression_in_synpred124265 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeDeclarationDescr.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -16,40 +16,16 @@
  * limitations under the License.
  */
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 public class TypeDeclarationDescr extends BaseDescr {
     
-    /**
-     * The attribute key used to define what role the type assumes (fact, event)
-     */
-    public static final String ATTR_ROLE = "role";
-    /**
-     * The attribute key used to define what is the clock strategy used for that type
-     */
-    public static final String ATTR_CLOCK_STRATEGY = "clock_strategy";
-    /**
-     * The attribute key used to define what is the attribute to read the timestamp from
-     */
-    public static final String ATTR_TIMESTAMP = "timestamp_attribute";
-    /**
-     * The attribute key used to define what is the attribute to read the duration from
-     */
-    public static final String ATTR_DURATION = "duration_attribute";
-    /**
-     * The attribute key used to define what is the class name that implements the type
-     */
-    public static final String ATTR_CLASS = "class";
-    /**
-     * The attribute key used to define what is the template name that implements the type
-     */
-    public static final String ATTR_TEMPLATE = "template";
-    
-
     private static final long   serialVersionUID = 400L;
     private String              typeName;
-    private Map<String, String> attributes;
+    private Map<String, String> metaAttributes;
+    private Map<String, TypeFieldDescr> fields;
 
     public TypeDeclarationDescr() {
         this(null);
@@ -57,7 +33,7 @@
     
     public TypeDeclarationDescr(final String typeName) {
         this.typeName = typeName;
-        this.attributes = new HashMap<String, String>();
+        this.metaAttributes = new HashMap<String, String>();
     }
 
     /**
@@ -79,8 +55,11 @@
      * @param attr
      * @param value
      */
-    public void addAttribute( String attr, String value ) {
-        this.attributes.put( attr, value );
+    public void addMetaAttribute( String attr, String value ) {
+        if( this.metaAttributes == null ) {
+            this.metaAttributes = new HashMap<String, String>();
+        }
+        this.metaAttributes.put( attr, value );
     }
     
     /**
@@ -88,19 +67,41 @@
      * @param attr
      * @return
      */
-    public String getAttribute( String attr ) {
-        return this.attributes.get( attr );
+    public String getMetaAttribute( String attr ) {
+        return this.metaAttributes != null ? this.metaAttributes.get( attr ) : null;
     }
 
     /**
      * Returns the attribute map
      * @return
      */
-    public Map<String, String> getAttributes() {
-        return this.attributes;
+    public Map<String, String> getMetaAttributes() {
+        return this.metaAttributes != null ? this.metaAttributes : Collections.EMPTY_MAP;
     }
 
+     /**
+     * @return the fields
+     */
+    public Map<String, TypeFieldDescr> getFields() {
+        return this.fields != null ? this.fields : Collections.EMPTY_MAP;
+    }
+
+    /**
+     * @param fields the fields to set
+     */
+    public void setFields(Map<String, TypeFieldDescr> fields) {
+        this.fields = fields;
+    }
+    
+    public void addField( TypeFieldDescr field ) {
+        if( this.fields == null ) {
+            this.fields = new HashMap<String, TypeFieldDescr>();
+        }
+        this.fields.put( field.getFieldName(), field );
+    }
+
     public String toString() {
         return "TypeDeclaration[ "+this.getTypeName()+" ]";
     }
+
 }
\ No newline at end of file

Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeFieldDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeFieldDescr.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/TypeFieldDescr.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -0,0 +1,113 @@
+package org.drools.lang.descr;
+
+/*
+ * Copyright 2008 Red Hat
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TypeFieldDescr extends BaseDescr {
+
+    private static final long   serialVersionUID = 400L;
+    private String              fieldName;
+    private String              initExpr;
+    private PatternDescr        pattern;
+    private Map<String, String> metaAttributes;
+
+    public TypeFieldDescr() {
+        this( null );
+    }
+
+    public TypeFieldDescr(final String fieldName) {
+        this.fieldName = fieldName;
+        this.metaAttributes = new HashMap<String, String>();
+    }
+
+    /**
+     * @return the identifier
+     */
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    /**
+     * @param identifier the identifier to set
+     */
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    /**
+     * Adds a new attribute
+     * @param attr
+     * @param value
+     */
+    public void addMetaAttribute(String attr,
+                                 String value) {
+        this.metaAttributes.put( attr,
+                                 value );
+    }
+
+    /**
+     * Returns an attribute value or null if it is not defined
+     * @param attr
+     * @return
+     */
+    public String getMetaAttribute(String attr) {
+        return this.metaAttributes.get( attr );
+    }
+
+    /**
+     * Returns the attribute map
+     * @return
+     */
+    public Map<String, String> getMetaAttributes() {
+        return this.metaAttributes;
+    }
+
+    /**
+    * @return the initExpr
+    */
+    public String getInitExpr() {
+        return initExpr;
+    }
+
+    /**
+     * @param initExpr the initExpr to set
+     */
+    public void setInitExpr(String initExpr) {
+        this.initExpr = initExpr;
+    }
+
+    /**
+     * @return the pattern
+     */
+    public PatternDescr getPattern() {
+        return pattern;
+    }
+
+    /**
+     * @param pattern the pattern to set
+     */
+    public void setPattern(PatternDescr pattern) {
+        this.pattern = pattern;
+    }
+
+    public String toString() {
+        return "TypeField[ " + this.getFieldName() + " = (" + this.initExpr + ") : " + this.pattern + " ]";
+    }
+
+}
\ No newline at end of file

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-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2008-04-24 14:19:35 UTC (rev 19705)
@@ -379,23 +379,42 @@
                         {
                             $declaration.setTypeName( $id.text );
                         }
-                LEFT_CURLY
-                        type_decl_attribute[$declaration] ( COMMA type_decl_attribute[$declaration] )*
-                RIGHT_CURLY
+                        decl_metadata[$declaration]*
+                        decl_field[$declaration]*
+                END
         ;
         
-type_decl_attribute[TypeDeclarationDescr declaration]
-        :	att=identifier 
-                ( val=STRING 
+decl_metadata[BaseDescr declaration]
+        :	AT att=identifier val=paren_chunk
                 {
-                    $declaration.addAttribute( $att.text, getString( $val.text ) );
+                    if( $declaration instanceof TypeDeclarationDescr )
+                        ((TypeDeclarationDescr)$declaration).addMetaAttribute( $att.text, getString( $val.text ).trim() );
+                    else
+                        ((TypeFieldDescr)$declaration).addMetaAttribute( $att.text, getString( $val.text ).trim() );
                 }
-                | cl=dotted_name
-                {
-                    $declaration.addAttribute( $att.text, $cl.text );
-                }
-                )
-        ;       
+        ;    
+        
+decl_field[TypeDeclarationDescr declaration]
+ at init {
+        TypeFieldDescr field = null;
+}
+	:      id=identifier init=initialization? COLON type=fact[null] 
+		{
+		    field = new TypeFieldDescr( $id.text );
+		    if( init != null )
+		        field.setInitExpr( $init.expr );
+		    field.setPattern( (PatternDescr) $type.d );
+		    $declaration.addField( field );
+		}
+		decl_metadata[field]* 
+	;   
+	
+initialization returns [String expr]
+	:      EQUALS val=paren_chunk
+	       {
+	           $expr = getString( $val.text ).trim();
+	       }
+	;	
 
 query returns [QueryDescr query]
 	@init {
@@ -501,7 +520,7 @@
 		}
 		rule_attributes[$rule]?
 		(	
-			WHEN ':'?
+			WHEN COLON?
 			{ 
 				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
 				lhs.setLocation( offset($WHEN.line), $WHEN.pos );
@@ -516,7 +535,7 @@
 
 rule_attributes[RuleDescr rule]
 	: 
-	( ATTRIBUTES ':' )?
+	( ATTRIBUTES COLON )?
 	attr=rule_attribute { $rule.addAttribute( $attr.attr ); }
 	( ','? attr=rule_attribute { $rule.addAttribute( $attr.attr ); } )*
 	;
@@ -1191,7 +1210,7 @@
 		OrDescr or = null;
 	}
  	:
- 		ID ':' 
+ 		ID COLON 
  		{
  		        // handling incomplete parsing
  		        $d = new PatternDescr( );
@@ -1273,9 +1292,9 @@
 	
 	
 constraints[PatternDescr pattern]
-	:	constraint[$pattern]
+	:	(constraint[$pattern]|behaviors)
 		( COMMA { location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); } 
-		  constraint[$pattern] 
+		  (constraint[$pattern]|behaviors) 
 		)* 
 	;
 	
@@ -1292,6 +1311,14 @@
 		or_constr[top]
 	;	
 	
+behaviors 
+	:	LEFT_SQUARE behavior ( COMMA behavior )* RIGHT_SQUARE
+	;	
+	
+behavior 
+	:	ID (COLON ID)? paren_chunk?
+	;
+	
 or_constr[ConditionalElementDescr base]
 	@init {
 		OrDescr or = new OrDescr();
@@ -1350,7 +1377,7 @@
 	}
 	:
 	        (
-		ID ':' 
+		ID COLON 
 		    { 
 			fbd = new FieldBindingDescr();
 			fbd.setIdentifier( $ID.text );
@@ -1939,6 +1966,12 @@
 	;				
 	
 TILDE	:	'~';	
+
+AT	:       '@';
+
+EQUALS  :	'=';
+
+COLON   :	':';
 	
 SH_STYLE_SINGLE_LINE_COMMENT	
 	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
@@ -1957,7 +1990,7 @@
 	;
 
 MISC 	:
-		'!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+'  | '?' | '=' | '/' | '\'' | '\\' | '|' | '&'
+		'!' | '$' | '%' | '^' | '*' | '_' | '-' | '+'  | '?' | '/' | '\'' | '\\' | '|' | '&'
 	;
 
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/dsl/DSLMap.g	2008-04-24 14:19:35 UTC (rev 19705)
@@ -21,6 +21,8 @@
        VT_VAR_REF;
        VT_LITERAL;
        VT_PATTERN;
+       
+       VT_SPACE;
 }
 
 @parser::header {
@@ -32,6 +34,8 @@
 }
 
 @parser::members {
+//we may not need the check on [], as the LITERAL token being examined 
+//should not have them.
 	private boolean validateLT(int LTNumber, String text){
 		if (null == input) return false;
 		if (null == input.LT(LTNumber)) return false;
@@ -48,6 +52,7 @@
 	private boolean validateIdentifierKey(String text){
 		return validateLT(1, text);
 	}
+	
 }
 
 // PARSER RULES
@@ -60,26 +65,31 @@
 	: entry
 	| comment
 	| EOL!	
-	;
+	;//bang at end of EOL means to not put it into the AST
 
-comment	: LINE_COMMENT
+comment	: LINE_COMMENT 
 	-> ^(VT_COMMENT[$LINE_COMMENT, "COMMENT"] LINE_COMMENT )
 	;	
 
+//we need to make entry so the meta section is optional
 entry 	: scope_section meta_section key_section EQUALS value_section (EOL|EOF)
 	-> ^(VT_ENTRY scope_section meta_section key_section value_section)
 	;
 
+
+
 scope_section 
-	: LEFT_SQUARE
-	    ( value1=condition_key
-	    | value2=consequence_key
-	    | value3=keyword_key
-	    | value4=any_key         
-	    )
-	  RIGHT_SQUARE
-	-> ^(VT_SCOPE[$LEFT_SQUARE, "SCOPE SECTION"] $value1? $value2? $value3? $value4? )
+	: LEFT_SQUARE 
+		(value1=condition_key 
+		| value2=consequence_key
+		| value3=keyword_key
+		| value4=any_key
+		) 
+	RIGHT_SQUARE
+	-> ^(VT_SCOPE[$LEFT_SQUARE, "SCOPE SECTION"] $value1? $value2? $value3? $value4?)
 	;
+
+
 	
 meta_section
 	: LEFT_SQUARE LITERAL? RIGHT_SQUARE
@@ -91,13 +101,15 @@
 	-> ^(VT_ENTRY_KEY key_sentence+ )
 	;
  
-key_sentence
+key_sentence //problem: if you have foo is {foo:\d{3}}, because the WS is hidden, it rebuilds back to 
+//		foo is\d{3}  when the key pattern is created.  Somehow we need to capture the 
+//trailing WS in the key_chunk
 @init {
         String text = "";
 }	
-	: variable_definition
+	: variable_definition 
 	| cb=key_chunk { text = $cb.text; }
-	-> ^(VT_LITERAL[$cb.start, text] )
+	-> VT_LITERAL[$cb.start, text]
 	;		
 
 key_chunk
@@ -115,7 +127,7 @@
 }	
 	: variable_reference
 	| vc=value_chunk { text = $vc.text; }
-	-> ^(VT_LITERAL[$vc.start, text] )
+	-> VT_LITERAL[$vc.start, text]
 	;	
 	
 value_chunk
@@ -123,28 +135,40 @@
 	;	
 	
 literal 
-	: ( LITERAL | LEFT_SQUARE | RIGHT_SQUARE | COLLOM )
+	: ( LITERAL | LEFT_SQUARE | RIGHT_SQUARE | COLON)
 	;	
 	
 variable_definition
 @init {
         String text = "";
+        boolean hasSpace = false;
 }	
-	: LEFT_CURLY name=LITERAL ( COLLOM pat=pattern {text = $pat.text;} )? RIGHT_CURLY
-	-> ^(VT_VAR_DEF $name VT_PATTERN[$pat.start, text] )
+	: lc=LEFT_CURLY { if( ((CommonToken)input.LT(-2)).getStopIndex() < ((CommonToken)lc).getStartIndex() -1 ) hasSpace = true; } 
+	name=LITERAL ( COLON pat=pattern {text = $pat.text;} )? RIGHT_CURLY
+	-> {hasSpace && !"".equals(text)}? VT_SPACE ^(VT_VAR_DEF $name VT_PATTERN[$pat.start, text] ) //pat can be null if there's no pattern here
+	-> {!hasSpace && !"".equals(text)}? ^(VT_VAR_DEF $name VT_PATTERN[$pat.start, text] ) //pat can be null if there's no pattern here
+	-> {hasSpace}?	VT_SPACE ^(VT_VAR_DEF $name ) //do we need to build a VT_LITERAL token for $name?
+	-> ^(VT_VAR_DEF $name ) //do we need to build a VT_LITERAL token for $name?
 	;
-	
+
+
 pattern 
-        : ( LITERAL
-          | LEFT_CURLY LITERAL RIGHT_CURLY
+        : ( literal
+          | LEFT_CURLY literal RIGHT_CURLY
+          | LEFT_SQUARE pattern RIGHT_SQUARE
           )+
 	;	
 	
+
+	
+
+	
 variable_reference 
 	: LEFT_CURLY name=LITERAL RIGHT_CURLY
 	-> ^(VT_VAR_REF $name )
 	;	
 
+
 condition_key
 	:	{validateIdentifierKey("condition")||validateIdentifierKey("when")}?  value=LITERAL
 	-> VT_CONDITION[$value]
@@ -172,7 +196,7 @@
                 |	'\t'
                 |	'\f'
                 )+
-                { $channel=HIDDEN; }
+                { $channel=HIDDEN;}
         ;
 
 EOL 	:	     
@@ -208,19 +232,27 @@
         
 EQUALS	:	'='
 	;
+
+DOT	:	'.'
+	;
 	
 POUND   :	'#'
 	;
 
-COLLOM	:	':'
+COLON	:	':'
 	;
-	
+
+
+//the problem here with LINE COMMENT is that the lexer is not identifying 
+//#comment without a EOL character.  For example, what if it's the last line in a file?
+//should still be a comment.  Changing to (EOL|EOF) causes it to only match the POUND	
 LINE_COMMENT	
 	:	POUND ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
 	;
+	
 
 LITERAL	
-	:	('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'|MISC|EscapeSequence)+
+	:	('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'|MISC|EscapeSequence|DOT)+
 	;
 
 fragment		

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -1017,9 +1017,9 @@
     public void testTypeDeclaration() throws Exception {
         PackageDescr pkgDescr = new PackageDescr( "org.test" );
         TypeDeclarationDescr typeDescr = new TypeDeclarationDescr( "StockTick" );
-        typeDescr.addAttribute( TypeDeclarationDescr.ATTR_ROLE,
+        typeDescr.addMetaAttribute( TypeDeclaration.Role.ID,
                                 "event" );
-        typeDescr.addAttribute( TypeDeclarationDescr.ATTR_CLASS,
+        typeDescr.addMetaAttribute( TypeDeclaration.ATTR_CLASS,
                                 "org.drools.StockTick" );
         pkgDescr.addTypeDeclaration( typeDescr );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -3036,11 +3036,11 @@
         //        /---------------+-------------------\
         //       AND             AND                 AND
         //    /---+---\       /---+---\           /---+---\
-        //   FC       FC     FC       FC         FC       OR
+        //   FC   FC  FC     FC       FC         FC       OR
         //                                             /---+---\
         //                                            FC       FC
         //
-        final String text = "Person( ( age ( > 60 && < 70 ) || ( > 50 && < 55 ) && hair == \"black\" ) || ( age == 40 && hair == \"pink\" ) || ( age == 12 && ( hair == \"yellow\" || hair == \"blue\" ) ))";
+        final String text = "Person( teste == 3 && ( age ( > 60 && < 70 ) || ( > 50 && < 55 ) && hair == \"black\" ) || ( age == 40 && hair == \"pink\" ) || ( age == 12 && ( hair == \"yellow\" || hair == \"blue\" ) ))";
         final CharStream charStream = new ANTLRStringStream( text );
         final DRLLexer lexer = new DRLLexer( charStream );
         final TokenStream tokenStream = new CommonTokenStream( lexer );
@@ -3059,8 +3059,20 @@
                       orConstr.getDescrs().size() );
 
         AndDescr andConstr1 = (AndDescr) orConstr.getDescrs().get( 0 );
+        
+        assertEquals( 3, andConstr1.getDescrs().size() );
+        
+        FieldConstraintDescr fcd = (FieldConstraintDescr) andConstr1.getDescrs().get( 0 );
+        assertEquals( "teste",
+                      fcd.getFieldName() );
 
-        FieldConstraintDescr fcd = (FieldConstraintDescr) andConstr1.getDescrs().get( 0 );
+        assertEquals( "==",
+                      ((LiteralRestrictionDescr) fcd.getRestrictions().get( 0 )).getEvaluator() );
+        assertEquals( "3",
+                      ((LiteralRestrictionDescr) fcd.getRestrictions().get( 0 )).getText() );
+        
+
+        fcd = (FieldConstraintDescr) andConstr1.getDescrs().get( 1 );
         assertEquals( "age",
                       fcd.getFieldName() );
         RestrictionConnectiveDescr or = (RestrictionConnectiveDescr) fcd.getRestriction().getRestrictions().get( 0 );
@@ -3087,7 +3099,7 @@
         assertEquals( "55",
                       ((LiteralRestrictionDescr) and2.getRestrictions().get( 1 )).getText() );
 
-        fcd = (FieldConstraintDescr) andConstr1.getDescrs().get( 1 );
+        fcd = (FieldConstraintDescr) andConstr1.getDescrs().get( 2 );
         assertEquals( "hair",
                       fcd.getFieldName() );
 
@@ -3790,13 +3802,13 @@
 
         final TypeDeclarationDescr descr = declarations.get( 0 );
         assertEquals( "event",
-                      descr.getAttribute( "type" ) );
+                      descr.getMetaAttribute( "role" ) );
         assertEquals( "org.drools.events.Call",
-                      descr.getAttribute( "class" ) );
+                      descr.getMetaAttribute( "class" ) );
         assertEquals( "duration",
-                      descr.getAttribute( "duration_attribute" ) );
-        assertEquals( "pseudo",
-                      descr.getAttribute( "clock_strategy" ) );
+                      descr.getMetaAttribute( "duration" ) );
+        assertEquals( "timestamp",
+                      descr.getMetaAttribute( "timestamp" ) );
     }
 
     public void testEntryPoint() throws Exception {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertion.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertion.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertion.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -2,10 +2,9 @@
 
 import org.drools.StockTick;
 
-declare StockTick {
-    role event,
-    clock_strategy pseudo
-}
+declare StockTick 
+    @role( event )
+end
 
 global java.util.List results;
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertionWithDuration.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertionWithDuration.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleEventAssertionWithDuration.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -2,13 +2,13 @@
 
 import org.drools.StockTick;
 
-declare StockTick {
-    role event,
-    duration_attribute duration
-}
-
 global java.util.List results;
 
+declare StockTick 
+    @role( event )
+    @duration( duration )
+end
+
 rule "Check event"
 when
     $st : StockTick( company == "ACME" )

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -1,13 +1,15 @@
 package org.drools;
 
-import event org.drools.OrderEvent;
-
 global java.util.List results;
 
+declare OrderEvent {
+    role event
+}
+
 rule "average over threshold"
 when
     Number( $avg : intValue >= 50 ) from accumulate(
-              OrderEvent( $amt : total ),
+              OrderEvent( [ win:time(30000) ], $amt : total ),
               average( $amt ) )
 then
     //System.out.println( "Over threshold: "+$avg );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -2,11 +2,6 @@
 
 import org.drools.StockTick;
 
-declare StockTick {
-    role event,
-    duration_attribute duration
-}
-
 global java.util.List results_coincides;
 global java.util.List results_after;
 global java.util.List results_before;
@@ -21,6 +16,11 @@
 global java.util.List results_finishes;
 global java.util.List results_finished_by;
 
+declare StockTick 
+    @role( event )
+    @duration( duration )
+end
+
 rule "coincides operator"
 when
     $a : StockTick( company == "DROO" )

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -4,9 +4,9 @@
 
 global java.util.List results;
 
-declare StockTick {
-    role event
-}
+declare StockTick
+    @role( event )
+end
 
 rule "Test entry point"
 when

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/declare_type.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/declare_type.drl	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/declare_type.drl	2008-04-24 14:19:35 UTC (rev 19705)
@@ -1,8 +1,8 @@
 package org.drools;
 
-declare CallEvent {
-    type event,
-    class org.drools.events.Call,
-    duration_attribute duration,
-    clock_strategy pseudo
-}
\ No newline at end of file
+declare CallEvent 
+    @role( event )
+    @class( org.drools.events.Call )
+    @duration( duration )
+    @timestamp( timestamp )
+end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java	2008-04-24 09:39:11 UTC (rev 19704)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java	2008-04-24 14:19:35 UTC (rev 19705)
@@ -23,7 +23,6 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.drools.base.ClassFieldExtractorCache;
 import org.drools.common.DroolsObjectInputStream;
 import org.drools.facttemplates.FactTemplate;
 import org.drools.spi.FieldExtractor;
@@ -37,10 +36,17 @@
 public class TypeDeclaration
     implements
     Externalizable {
-
+    
+    public static final String ATTR_CLASS = "class";
+    public static final String ATTR_TEMPLATE = "template";
+    public static final String ATTR_DURATION = "duration";
+    public static final String ATTR_TIMESTAMP = "timestamp";
+    
     public static enum Role {
         FACT, EVENT;
 
+        public static final String ID = "role";
+        
         public static Role parseRole(String role) {
             if ( "event".equalsIgnoreCase( role ) ) {
                 return EVENT;
@@ -54,6 +60,8 @@
     public static enum Format {
         POJO, TEMPLATE;
 
+        public static final String ID = "format";
+        
         public static Format parseFormat(String format) {
             if ( "pojo".equalsIgnoreCase( format ) ) {
                 return POJO;
@@ -64,29 +72,9 @@
         }
     }
 
-    public static enum ClockStrategy {
-        NONE, PSEUDO, SYSTEM, HEARTBEAT, ATTRIBUTE;
-
-        public static ClockStrategy parseClockStrategy(String clockStrategy) {
-            if ( "none".equalsIgnoreCase( clockStrategy ) ) {
-                return NONE;
-            } else if ( "pseudo".equalsIgnoreCase( clockStrategy ) ) {
-                return PSEUDO;
-            } else if ( "system".equalsIgnoreCase( clockStrategy ) ) {
-                return SYSTEM;
-            } else if ( "heartbeat".equalsIgnoreCase( clockStrategy ) ) {
-                return HEARTBEAT;
-            } else if ( "attribute".equalsIgnoreCase( clockStrategy ) ) {
-                return ATTRIBUTE;
-            }
-            return null;
-        }
-    }
-
     private String                   typeName;
     private Role                     role;
     private Format                   format;
-    private ClockStrategy            clockStrategy;
     private String                   timestampAttribute;
     private String                   durationAttribute;
     private transient FieldExtractor durationExtractor;
@@ -100,7 +88,6 @@
         this.typeName = typeName;
         this.role = Role.FACT;
         this.format = Format.POJO;
-        this.clockStrategy = ClockStrategy.NONE;
         this.durationAttribute = null;
         this.timestampAttribute = null;
         this.typeClass = null;
@@ -112,13 +99,12 @@
         this.typeName = (String) in.readObject();
         this.role = (Role) in.readObject();
         this.format = (Format) in.readObject();
-        this.clockStrategy = (ClockStrategy) in.readObject();
         this.durationAttribute = (String) in.readObject();
         this.timestampAttribute = (String) in.readObject();
         this.typeClass = (Class< ? >) in.readObject();
         this.typeTemplate = (FactTemplate) in.readObject();
 
-        if( this.durationAttribute != null ) {
+        if ( this.durationAttribute != null ) {
             // generate the extractor
             DroolsObjectInputStream dois = (DroolsObjectInputStream) in;
             this.durationExtractor = dois.getExtractorFactory().getExtractor( this.typeClass,
@@ -131,7 +117,6 @@
         out.writeObject( typeName );
         out.writeObject( role );
         out.writeObject( format );
-        out.writeObject( clockStrategy );
         out.writeObject( durationAttribute );
         out.writeObject( timestampAttribute );
         out.writeObject( typeClass );
@@ -174,20 +159,6 @@
     }
 
     /**
-     * @return the clockStrategy
-     */
-    public ClockStrategy getClockStrategy() {
-        return clockStrategy;
-    }
-
-    /**
-     * @param clockStrategy the clockStrategy to set
-     */
-    public void setClockStrategy(ClockStrategy clockStrategy) {
-        this.clockStrategy = clockStrategy;
-    }
-
-    /**
      * @return the timestampAttribute
      */
     public String getTimestampAttribute() {
@@ -265,11 +236,11 @@
         } else if ( obj instanceof TypeDeclaration ) {
             TypeDeclaration that = (TypeDeclaration) obj;
             return isObjectEqual( typeName,
-                                  that.typeName ) && role == that.role && format == that.format && clockStrategy == that.clockStrategy && isObjectEqual( timestampAttribute,
-                                                                                                                                                         that.timestampAttribute ) && isObjectEqual( durationAttribute,
-                                                                                                                                                                                                     that.durationAttribute )
-                   && typeClass == that.typeClass && isObjectEqual( typeTemplate,
-                                                                    that.typeTemplate );
+                                  that.typeName ) && role == that.role && format == that.format && isObjectEqual( timestampAttribute,
+                                                                                                                  that.timestampAttribute ) && isObjectEqual( durationAttribute,
+                                                                                                                                                              that.durationAttribute ) && typeClass == that.typeClass
+                   && isObjectEqual( typeTemplate,
+                                     that.typeTemplate );
         }
         return false;
     }




More information about the jboss-svn-commits mailing list