[jboss-svn-commits] JBL Code SVN: r17264 - in labs/jbossrules/branches/temporal_rete: drools-compiler/src/main/java/org/drools/lang and 13 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Dec 16 06:41:50 EST 2007


Author: tirelli
Date: 2007-12-16 06:41:49 -0500 (Sun, 16 Dec 2007)
New Revision: 17264

Added:
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EntryPointDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/EntryPointBuilder.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/EntryPointInterface.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/EntryPointBuilder.java
Modified:
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/compiler/Dialect.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/Location.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/org/drools/lang/DRL.g
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
   labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java
Log:
JBRULES-1390: adding support to streams

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/compiler/Dialect.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/compiler/Dialect.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/compiler/Dialect.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -11,6 +11,7 @@
 import org.drools.rule.Package;
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.PatternBuilder;
 import org.drools.rule.builder.PredicateBuilder;
@@ -63,6 +64,8 @@
 
     FromBuilder getFromBuilder();
 
+    EntryPointBuilder getEntryPointBuilder();
+
     RuleConditionBuilder getBuilder(Class clazz);
 
     AnalysisResult analyzeExpression(final RuleBuildContext context,

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-12-01 18:56:35
+// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-12-13 15:21:41
 
 	package org.drools.lang;
 
@@ -15,18 +15,17 @@
     public static final int T79=79;
     public static final int AUTO_FOCUS=28;
     public static final int END=15;
-    public static final int HexDigit=67;
+    public static final int HexDigit=68;
     public static final int FORALL=43;
     public static final int TEMPLATE=16;
-    public static final int MISC=73;
-    public static final int FLOAT=57;
-    public static final int T74=74;
+    public static final int MISC=74;
+    public static final int FLOAT=58;
     public static final int QUERY=14;
-    public static final int THEN=63;
+    public static final int THEN=64;
     public static final int RULE=17;
     public static final int INIT=45;
     public static final int T83=83;
-    public static final int TILDE=55;
+    public static final int TILDE=56;
     public static final int IMPORT=5;
     public static final int PACKAGE=4;
     public static final int DATE_EFFECTIVE=20;
@@ -36,73 +35,75 @@
     public static final int AND=37;
     public static final int FUNCTION=6;
     public static final int GLOBAL=10;
-    public static final int EscapeSequence=66;
+    public static final int EscapeSequence=67;
     public static final int DIALECT=33;
     public static final int INT=26;
     public static final int LOCK_ON_ACTIVE=34;
     public static final int DATE_EXPIRES=22;
     public static final int T81=81;
-    public static final int LEFT_SQUARE=61;
-    public static final int CONTAINS=50;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=70;
+    public static final int LEFT_SQUARE=62;
+    public static final int CONTAINS=51;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=71;
     public static final int T77=77;
     public static final int ATTRIBUTES=19;
     public static final int EVENT=7;
-    public static final int LEFT_CURLY=59;
+    public static final int LEFT_CURLY=60;
     public static final int RESULT=48;
     public static final int ID=8;
     public static final int FROM=39;
     public static final int LEFT_PAREN=11;
     public static final int ACTIVATION_GROUP=29;
     public static final int DOUBLE_AMPER=38;
-    public static final int RIGHT_CURLY=60;
+    public static final int RIGHT_CURLY=61;
     public static final int BOOL=24;
-    public static final int EXCLUDES=51;
-    public static final int SOUNDSLIKE=53;
-    public static final int MEMBEROF=54;
+    public static final int EXCLUDES=52;
+    public static final int SOUNDSLIKE=54;
+    public static final int T84=84;
+    public static final int MEMBEROF=55;
     public static final int WHEN=18;
     public static final int T78=78;
     public static final int RULEFLOW_GROUP=30;
-    public static final int WS=65;
+    public static final int WS=66;
     public static final int STRING=21;
     public static final int ACTION=46;
     public static final int COLLECT=49;
     public static final int T76=76;
     public static final int REVERSE=47;
-    public static final int IN=56;
+    public static final int IN=57;
     public static final int T80=80;
     public static final int NO_LOOP=27;
     public static final int ACCUMULATE=44;
-    public static final int UnicodeEscape=68;
+    public static final int UnicodeEscape=69;
     public static final int T75=75;
     public static final int DURATION=32;
     public static final int EVAL=42;
-    public static final int MATCHES=52;
+    public static final int MATCHES=53;
     public static final int EOF=-1;
     public static final int AGENDA_GROUP=31;
-    public static final int NULL=58;
-    public static final int EOL=64;
-    public static final int Tokens=84;
+    public static final int NULL=59;
+    public static final int EOL=65;
+    public static final int Tokens=85;
     public static final int T82=82;
     public static final int SALIENCE=25;
-    public static final int OctalEscape=69;
-    public static final int MULTI_LINE_COMMENT=72;
+    public static final int OctalEscape=70;
+    public static final int MULTI_LINE_COMMENT=73;
     public static final int NOT=41;
     public static final int RIGHT_PAREN=13;
     public static final int ENABLED=23;
-    public static final int RIGHT_SQUARE=62;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=71;
+    public static final int RIGHT_SQUARE=63;
+    public static final int ENTRY_POINT=50;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=72;
     public DRLLexer() {;} 
     public DRLLexer(CharStream input) {
         super(input);
-        ruleMemo = new HashMap[82+1];
+        ruleMemo = new HashMap[83+1];
      }
     public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
-    // $ANTLR start T74
-    public final void mT74() throws RecognitionException {
+    // $ANTLR start T75
+    public final void mT75() throws RecognitionException {
         try {
-            int _type = T74;
+            int _type = T75;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:5: ( ';' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:7: ';'
             {
@@ -115,12 +116,12 @@
         finally {
         }
     }
-    // $ANTLR end T74
+    // $ANTLR end T75
 
-    // $ANTLR start T75
-    public final void mT75() throws RecognitionException {
+    // $ANTLR start T76
+    public final void mT76() throws RecognitionException {
         try {
-            int _type = T75;
+            int _type = T76;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:5: ( '.*' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:7: '.*'
             {
@@ -134,12 +135,12 @@
         finally {
         }
     }
-    // $ANTLR end T75
+    // $ANTLR end T76
 
-    // $ANTLR start T76
-    public final void mT76() throws RecognitionException {
+    // $ANTLR start T77
+    public final void mT77() throws RecognitionException {
         try {
-            int _type = T76;
+            int _type = T77;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:5: ( ':' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: ':'
             {
@@ -152,12 +153,12 @@
         finally {
         }
     }
-    // $ANTLR end T76
+    // $ANTLR end T77
 
-    // $ANTLR start T77
-    public final void mT77() throws RecognitionException {
+    // $ANTLR start T78
+    public final void mT78() throws RecognitionException {
         try {
-            int _type = T77;
+            int _type = T78;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:5: ( '->' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: '->'
             {
@@ -171,12 +172,12 @@
         finally {
         }
     }
-    // $ANTLR end T77
+    // $ANTLR end T78
 
-    // $ANTLR start T78
-    public final void mT78() throws RecognitionException {
+    // $ANTLR start T79
+    public final void mT79() throws RecognitionException {
         try {
-            int _type = T78;
+            int _type = T79;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:5: ( '==' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: '=='
             {
@@ -190,12 +191,12 @@
         finally {
         }
     }
-    // $ANTLR end T78
+    // $ANTLR end T79
 
-    // $ANTLR start T79
-    public final void mT79() throws RecognitionException {
+    // $ANTLR start T80
+    public final void mT80() throws RecognitionException {
         try {
-            int _type = T79;
+            int _type = T80;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:5: ( '>' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: '>'
             {
@@ -208,12 +209,12 @@
         finally {
         }
     }
-    // $ANTLR end T79
+    // $ANTLR end T80
 
-    // $ANTLR start T80
-    public final void mT80() throws RecognitionException {
+    // $ANTLR start T81
+    public final void mT81() throws RecognitionException {
         try {
-            int _type = T80;
+            int _type = T81;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:5: ( '>=' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: '>='
             {
@@ -227,12 +228,12 @@
         finally {
         }
     }
-    // $ANTLR end T80
+    // $ANTLR end T81
 
-    // $ANTLR start T81
-    public final void mT81() throws RecognitionException {
+    // $ANTLR start T82
+    public final void mT82() throws RecognitionException {
         try {
-            int _type = T81;
+            int _type = T82;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:5: ( '<' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: '<'
             {
@@ -245,12 +246,12 @@
         finally {
         }
     }
-    // $ANTLR end T81
+    // $ANTLR end T82
 
-    // $ANTLR start T82
-    public final void mT82() throws RecognitionException {
+    // $ANTLR start T83
+    public final void mT83() throws RecognitionException {
         try {
-            int _type = T82;
+            int _type = T83;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:5: ( '<=' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: '<='
             {
@@ -264,12 +265,12 @@
         finally {
         }
     }
-    // $ANTLR end T82
+    // $ANTLR end T83
 
-    // $ANTLR start T83
-    public final void mT83() throws RecognitionException {
+    // $ANTLR start T84
+    public final void mT84() throws RecognitionException {
         try {
-            int _type = T83;
+            int _type = T84;
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:5: ( '!=' )
             // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:7: '!='
             {
@@ -283,16 +284,16 @@
         finally {
         }
     }
-    // $ANTLR end T83
+    // $ANTLR end T84
 
     // $ANTLR start WS
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:17: ( ' ' | '\\t' | '\\f' | EOL )+
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -324,28 +325,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:19: ' '
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:19: '\\t'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:19: '\\f'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1734:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:19: EOL
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1735:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -378,10 +379,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1715:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1742:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1742:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -400,13 +401,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1716:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1742:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:14: ( '\\r\\n' )=> '\\r\\n'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1742:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -414,14 +415,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:25: '\\r'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1743:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:25: '\\n'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1744:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -443,10 +444,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:2: ( ( '-' )? ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:4: ( '-' )? ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:2: ( ( '-' )? ( '0' .. '9' )+ )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:4: ( '-' )? ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -455,7 +456,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:5: '-'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -464,7 +465,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -478,7 +479,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1749:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -509,10 +510,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -521,7 +522,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:5: '-'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -530,7 +531,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -544,7 +545,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -562,7 +563,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:26: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -576,7 +577,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:27: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -607,7 +608,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -620,19 +621,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1730:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1756:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -648,14 +649,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:15: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:32: ~ ( '\\\\' | '\"' )
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -685,13 +686,13 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:9: '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -707,14 +708,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:16: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:33: ~ ( '\\\\' | '\\'' )
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -755,8 +756,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1736:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762: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();
@@ -781,7 +782,7 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1740: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1766: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);
 
@@ -853,7 +854,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1738: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("1764: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;
                 }
@@ -862,13 +863,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1738: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("1764: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1740: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1766: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)<='}') ) {
@@ -886,14 +887,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1744:9: UnicodeEscape
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1770:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:9: OctalEscape
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1771:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -910,7 +911,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -944,7 +945,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1748:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1774:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -952,31 +953,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1748:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1774: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:14: ( '0' .. '3' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:15: '0' .. '3'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:14: ( '0' .. '3' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:15: '0' .. '3'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:26: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:25: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:36: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:37: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:36: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:37: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -986,18 +987,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:15: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:14: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:26: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:25: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1007,11 +1008,11 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:9: '\\\\' ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:15: '0' .. '7'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:14: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1031,8 +1032,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1757:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -1053,10 +1054,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:2: ( ( 'true' | 'false' ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:4: ( 'true' | 'false' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:2: ( ( 'true' | 'false' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:4: ( 'true' | 'false' )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:4: ( 'true' | 'false' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1069,13 +1070,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1761:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1787:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:5: 'true'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -1083,7 +1084,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:12: 'false'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -1107,8 +1108,8 @@
     public final void mPACKAGE() throws RecognitionException {
         try {
             int _type = PACKAGE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1764:9: ( 'package' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1764:11: 'package'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:9: ( 'package' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1790:11: 'package'
             {
             match("package"); if (failed) return ;
 
@@ -1126,8 +1127,8 @@
     public final void mIMPORT() throws RecognitionException {
         try {
             int _type = IMPORT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1766:8: ( 'import' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1766:10: 'import'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:8: ( 'import' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:10: 'import'
             {
             match("import"); if (failed) return ;
 
@@ -1145,8 +1146,8 @@
     public final void mFUNCTION() throws RecognitionException {
         try {
             int _type = FUNCTION;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1768:10: ( 'function' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1768:12: 'function'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:10: ( 'function' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:12: 'function'
             {
             match("function"); if (failed) return ;
 
@@ -1164,8 +1165,8 @@
     public final void mEVENT() throws RecognitionException {
         try {
             int _type = EVENT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1770:7: ( 'event' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1770:10: 'event'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796:7: ( 'event' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796:10: 'event'
             {
             match("event"); if (failed) return ;
 
@@ -1183,8 +1184,8 @@
     public final void mGLOBAL() throws RecognitionException {
         try {
             int _type = GLOBAL;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:8: ( 'global' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1772:10: 'global'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1798:8: ( 'global' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1798:10: 'global'
             {
             match("global"); if (failed) return ;
 
@@ -1202,8 +1203,8 @@
     public final void mRULE() throws RecognitionException {
         try {
             int _type = RULE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:9: ( 'rule' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1774:11: 'rule'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1800:9: ( 'rule' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1800:11: 'rule'
             {
             match("rule"); if (failed) return ;
 
@@ -1221,8 +1222,8 @@
     public final void mQUERY() throws RecognitionException {
         try {
             int _type = QUERY;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:7: ( 'query' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1776:9: 'query'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1802:7: ( 'query' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1802:9: 'query'
             {
             match("query"); if (failed) return ;
 
@@ -1240,8 +1241,8 @@
     public final void mTEMPLATE() throws RecognitionException {
         try {
             int _type = TEMPLATE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:10: ( 'template' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1778:12: 'template'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1804:10: ( 'template' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1804:12: 'template'
             {
             match("template"); if (failed) return ;
 
@@ -1259,8 +1260,8 @@
     public final void mATTRIBUTES() throws RecognitionException {
         try {
             int _type = ATTRIBUTES;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:12: ( 'attributes' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1780:14: 'attributes'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:12: ( 'attributes' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:14: 'attributes'
             {
             match("attributes"); if (failed) return ;
 
@@ -1278,8 +1279,8 @@
     public final void mDATE_EFFECTIVE() throws RecognitionException {
         try {
             int _type = DATE_EFFECTIVE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:2: ( 'date-effective' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1783:4: 'date-effective'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:2: ( 'date-effective' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:4: 'date-effective'
             {
             match("date-effective"); if (failed) return ;
 
@@ -1297,8 +1298,8 @@
     public final void mDATE_EXPIRES() throws RecognitionException {
         try {
             int _type = DATE_EXPIRES;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1786:2: ( 'date-expires' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1786:4: 'date-expires'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:2: ( 'date-expires' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:4: 'date-expires'
             {
             match("date-expires"); if (failed) return ;
 
@@ -1316,8 +1317,8 @@
     public final void mENABLED() throws RecognitionException {
         try {
             int _type = ENABLED;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:9: ( 'enabled' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1788:11: 'enabled'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:9: ( 'enabled' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:11: 'enabled'
             {
             match("enabled"); if (failed) return ;
 
@@ -1335,8 +1336,8 @@
     public final void mSALIENCE() throws RecognitionException {
         try {
             int _type = SALIENCE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1791:2: ( 'salience' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1791:4: 'salience'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:2: ( 'salience' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:4: 'salience'
             {
             match("salience"); if (failed) return ;
 
@@ -1354,8 +1355,8 @@
     public final void mNO_LOOP() throws RecognitionException {
         try {
             int _type = NO_LOOP;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:9: ( 'no-loop' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1793:11: 'no-loop'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:9: ( 'no-loop' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:11: 'no-loop'
             {
             match("no-loop"); if (failed) return ;
 
@@ -1373,8 +1374,8 @@
     public final void mAUTO_FOCUS() throws RecognitionException {
         try {
             int _type = AUTO_FOCUS;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796:2: ( 'auto-focus' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1796:4: 'auto-focus'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:2: ( 'auto-focus' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:4: 'auto-focus'
             {
             match("auto-focus"); if (failed) return ;
 
@@ -1392,8 +1393,8 @@
     public final void mACTIVATION_GROUP() throws RecognitionException {
         try {
             int _type = ACTIVATION_GROUP;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:2: ( 'activation-group' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1799:4: 'activation-group'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1825:2: ( 'activation-group' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1825:4: 'activation-group'
             {
             match("activation-group"); if (failed) return ;
 
@@ -1411,8 +1412,8 @@
     public final void mAGENDA_GROUP() throws RecognitionException {
         try {
             int _type = AGENDA_GROUP;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1802:2: ( 'agenda-group' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1802:4: 'agenda-group'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:2: ( 'agenda-group' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:4: 'agenda-group'
             {
             match("agenda-group"); if (failed) return ;
 
@@ -1430,8 +1431,8 @@
     public final void mDIALECT() throws RecognitionException {
         try {
             int _type = DIALECT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1805:2: ( 'dialect' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1805:4: 'dialect'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:2: ( 'dialect' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:4: 'dialect'
             {
             match("dialect"); if (failed) return ;
 
@@ -1449,8 +1450,8 @@
     public final void mRULEFLOW_GROUP() throws RecognitionException {
         try {
             int _type = RULEFLOW_GROUP;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:2: ( 'ruleflow-group' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1808:4: 'ruleflow-group'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:2: ( 'ruleflow-group' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:4: 'ruleflow-group'
             {
             match("ruleflow-group"); if (failed) return ;
 
@@ -1468,8 +1469,8 @@
     public final void mDURATION() throws RecognitionException {
         try {
             int _type = DURATION;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1811:2: ( 'duration' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1811:4: 'duration'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1837:2: ( 'duration' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1837:4: 'duration'
             {
             match("duration"); if (failed) return ;
 
@@ -1487,8 +1488,8 @@
     public final void mLOCK_ON_ACTIVE() throws RecognitionException {
         try {
             int _type = LOCK_ON_ACTIVE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:2: ( 'lock-on-active' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1814:4: 'lock-on-active'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1840:2: ( 'lock-on-active' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1840:4: 'lock-on-active'
             {
             match("lock-on-active"); if (failed) return ;
 
@@ -1506,8 +1507,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1816:6: ( 'from' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1816:8: 'from'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:6: ( 'from' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:8: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -1525,8 +1526,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:2: ( 'accumulate' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1819:4: 'accumulate'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:2: ( 'accumulate' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:4: 'accumulate'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1544,8 +1545,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1821:6: ( 'init' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1821:8: 'init'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:6: ( 'init' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:8: 'init'
             {
             match("init"); if (failed) return ;
 
@@ -1563,8 +1564,8 @@
     public final void mACTION() throws RecognitionException {
         try {
             int _type = ACTION;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1823:8: ( 'action' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1823:10: 'action'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:8: ( 'action' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:10: 'action'
             {
             match("action"); if (failed) return ;
 
@@ -1582,8 +1583,8 @@
     public final void mREVERSE() throws RecognitionException {
         try {
             int _type = REVERSE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1825:9: ( 'reverse' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1825:11: 'reverse'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:9: ( 'reverse' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:11: 'reverse'
             {
             match("reverse"); if (failed) return ;
 
@@ -1601,8 +1602,8 @@
     public final void mRESULT() throws RecognitionException {
         try {
             int _type = RESULT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1827:8: ( 'result' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1827:10: 'result'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1853:8: ( 'result' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1853:10: 'result'
             {
             match("result"); if (failed) return ;
 
@@ -1620,8 +1621,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1829:9: ( 'collect' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1829:11: 'collect'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1855:9: ( 'collect' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1855:11: 'collect'
             {
             match("collect"); if (failed) return ;
 
@@ -1635,12 +1636,31 @@
     }
     // $ANTLR end COLLECT
 
+    // $ANTLR start ENTRY_POINT
+    public final void mENTRY_POINT() throws RecognitionException {
+        try {
+            int _type = ENTRY_POINT;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:13: ( 'entry-point' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:15: 'entry-point'
+            {
+            match("entry-point"); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end ENTRY_POINT
+
     // $ANTLR start OR
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:4: ( 'or' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1831:6: 'or'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:4: ( 'or' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:6: 'or'
             {
             match("or"); if (failed) return ;
 
@@ -1658,8 +1678,8 @@
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:5: ( 'and' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1833:7: 'and'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:5: ( 'and' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:7: 'and'
             {
             match("and"); if (failed) return ;
 
@@ -1677,8 +1697,8 @@
     public final void mCONTAINS() throws RecognitionException {
         try {
             int _type = CONTAINS;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:8: ( 'contains' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1836:16: 'contains'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:8: ( 'contains' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:16: 'contains'
             {
             match("contains"); if (failed) return ;
 
@@ -1696,8 +1716,8 @@
     public final void mEXCLUDES() throws RecognitionException {
         try {
             int _type = EXCLUDES;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:8: ( 'excludes' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1839:16: 'excludes'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:8: ( 'excludes' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:16: 'excludes'
             {
             match("excludes"); if (failed) return ;
 
@@ -1715,8 +1735,8 @@
     public final void mMEMBEROF() throws RecognitionException {
         try {
             int _type = MEMBEROF;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:8: ( 'memberOf' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1842:16: 'memberOf'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1870:8: ( 'memberOf' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1870:16: 'memberOf'
             {
             match("memberOf"); if (failed) return ;
 
@@ -1734,8 +1754,8 @@
     public final void mMATCHES() throws RecognitionException {
         try {
             int _type = MATCHES;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1844:9: ( 'matches' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1844:16: 'matches'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:9: ( 'matches' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:16: 'matches'
             {
             match("matches"); if (failed) return ;
 
@@ -1753,8 +1773,8 @@
     public final void mSOUNDSLIKE() throws RecognitionException {
         try {
             int _type = SOUNDSLIKE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1846:12: ( 'soundslike' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1846:16: 'soundslike'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:12: ( 'soundslike' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1874:16: 'soundslike'
             {
             match("soundslike"); if (failed) return ;
 
@@ -1772,8 +1792,8 @@
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1848:4: ( 'in' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1848:6: 'in'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1876:4: ( 'in' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1876:6: 'in'
             {
             match("in"); if (failed) return ;
 
@@ -1791,8 +1811,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1850:6: ( 'null' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1850:8: 'null'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1878:6: ( 'null' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1878:8: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -1810,8 +1830,8 @@
     public final void mEXISTS() throws RecognitionException {
         try {
             int _type = EXISTS;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1852:8: ( 'exists' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1852:10: 'exists'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:8: ( 'exists' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:10: 'exists'
             {
             match("exists"); if (failed) return ;
 
@@ -1829,8 +1849,8 @@
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:5: ( 'not' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1854:7: 'not'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1882:5: ( 'not' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1882:7: 'not'
             {
             match("not"); if (failed) return ;
 
@@ -1848,8 +1868,8 @@
     public final void mEVAL() throws RecognitionException {
         try {
             int _type = EVAL;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:6: ( 'eval' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1856:8: 'eval'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:6: ( 'eval' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:8: 'eval'
             {
             match("eval"); if (failed) return ;
 
@@ -1867,8 +1887,8 @@
     public final void mFORALL() throws RecognitionException {
         try {
             int _type = FORALL;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1858:8: ( 'forall' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1858:10: 'forall'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1886:8: ( 'forall' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1886:10: 'forall'
             {
             match("forall"); if (failed) return ;
 
@@ -1886,8 +1906,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:9: ( 'when' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1860:11: 'when'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:9: ( 'when' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:11: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -1905,8 +1925,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1862:6: ( 'then' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1862:12: 'then'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1890:6: ( 'then' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1890:12: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -1924,8 +1944,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:9: ( 'end' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1864:11: 'end'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:9: ( 'end' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:11: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -1943,8 +1963,8 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:4: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895: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();
@@ -1957,7 +1977,7 @@
                 recover(mse);    throw mse;
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1867:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
             loop14:
             do {
                 int alt14=2;
@@ -2006,8 +2026,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1871:9: ( '(' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1871:11: '('
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1899:9: ( '(' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1899:11: '('
             {
             match('('); if (failed) return ;
 
@@ -2024,8 +2044,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1875:9: ( ')' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1875:11: ')'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1903:9: ( ')' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1903:11: ')'
             {
             match(')'); if (failed) return ;
 
@@ -2042,8 +2062,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:9: ( '[' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1879:11: '['
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1907:9: ( '[' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1907:11: '['
             {
             match('['); if (failed) return ;
 
@@ -2060,8 +2080,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:9: ( ']' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1883:11: ']'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:9: ( ']' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:11: ']'
             {
             match(']'); if (failed) return ;
 
@@ -2078,8 +2098,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:9: ( '{' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1887:11: '{'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1915:9: ( '{' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1915:11: '{'
             {
             match('{'); if (failed) return ;
 
@@ -2096,8 +2116,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:9: ( '}' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1891:11: '}'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1919:9: ( '}' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1919:11: '}'
             {
             match('}'); if (failed) return ;
 
@@ -2114,8 +2134,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1894:7: ( ',' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1894:9: ','
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:7: ( ',' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:9: ','
             {
             match(','); if (failed) return ;
 
@@ -2132,8 +2152,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1897:5: ( '.' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1897:7: '.'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1925:5: ( '.' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1925:7: '.'
             {
             match('.'); if (failed) return ;
 
@@ -2150,8 +2170,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1901:2: ( '&&' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1901:4: '&&'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1929:2: ( '&&' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1929:4: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -2169,8 +2189,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1905:2: ( '||' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1905:4: '||'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1933:2: ( '||' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1933:4: '||'
             {
             match("||"); if (failed) return ;
 
@@ -2188,8 +2208,8 @@
     public final void mTILDE() throws RecognitionException {
         try {
             int _type = TILDE;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:7: ( '~' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1908:9: '~'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1936:7: ( '~' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1936:9: '~'
             {
             match('~'); if (failed) return ;
 
@@ -2206,11 +2226,11 @@
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:4: '#' ( options {greedy=false; } : . )* EOL
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:2: ( '#' ( options {greedy=false; } : . )* EOL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:4: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:8: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:8: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -2229,7 +2249,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:35: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1939:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2259,12 +2279,12 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:4: '//' ( options {greedy=false; } : . )* EOL
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1945:2: ( '//' ( options {greedy=false; } : . )* EOL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1945:4: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1945:9: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2283,7 +2303,7 @@
 
                 switch (alt16) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:36: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1945:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2313,12 +2333,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:4: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:9: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -2343,7 +2363,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:35: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1950:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2374,7 +2394,7 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1926:7: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1954:7: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
             // /home/etirelli/workspace/jboss/temporal/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)=='|' ) {
@@ -2399,77 +2419,77 @@
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | 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=75;
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | 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=76;
         alt18 = dfa18.predict(input);
         switch (alt18) {
             case 1 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T74
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T75
                 {
-                mT74(); if (failed) return ;
+                mT75(); if (failed) return ;
 
                 }
                 break;
             case 2 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T75
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T76
                 {
-                mT75(); if (failed) return ;
+                mT76(); if (failed) return ;
 
                 }
                 break;
             case 3 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T76
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T77
                 {
-                mT76(); if (failed) return ;
+                mT77(); if (failed) return ;
 
                 }
                 break;
             case 4 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T77
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T78
                 {
-                mT77(); if (failed) return ;
+                mT78(); if (failed) return ;
 
                 }
                 break;
             case 5 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T78
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T79
                 {
-                mT78(); if (failed) return ;
+                mT79(); if (failed) return ;
 
                 }
                 break;
             case 6 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T79
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T80
                 {
-                mT79(); if (failed) return ;
+                mT80(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T80
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T81
                 {
-                mT80(); if (failed) return ;
+                mT81(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T81
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T82
                 {
-                mT81(); if (failed) return ;
+                mT82(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T82
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T83
                 {
-                mT82(); if (failed) return ;
+                mT83(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T83
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T84
                 {
-                mT83(); if (failed) return ;
+                mT84(); if (failed) return ;
 
                 }
                 break;
@@ -2705,225 +2725,232 @@
                 }
                 break;
             case 44 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:335: OR
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:335: ENTRY_POINT
                 {
-                mOR(); if (failed) return ;
+                mENTRY_POINT(); if (failed) return ;
 
                 }
                 break;
             case 45 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:338: AND
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:347: OR
                 {
-                mAND(); if (failed) return ;
+                mOR(); if (failed) return ;
 
                 }
                 break;
             case 46 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:342: CONTAINS
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:350: AND
                 {
-                mCONTAINS(); if (failed) return ;
+                mAND(); if (failed) return ;
 
                 }
                 break;
             case 47 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:351: EXCLUDES
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:354: CONTAINS
                 {
-                mEXCLUDES(); if (failed) return ;
+                mCONTAINS(); if (failed) return ;
 
                 }
                 break;
             case 48 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:360: MEMBEROF
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:363: EXCLUDES
                 {
-                mMEMBEROF(); if (failed) return ;
+                mEXCLUDES(); if (failed) return ;
 
                 }
                 break;
             case 49 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:369: MATCHES
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:372: MEMBEROF
                 {
-                mMATCHES(); if (failed) return ;
+                mMEMBEROF(); if (failed) return ;
 
                 }
                 break;
             case 50 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:377: SOUNDSLIKE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:381: MATCHES
                 {
-                mSOUNDSLIKE(); if (failed) return ;
+                mMATCHES(); if (failed) return ;
 
                 }
                 break;
             case 51 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:388: IN
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:389: SOUNDSLIKE
                 {
-                mIN(); if (failed) return ;
+                mSOUNDSLIKE(); if (failed) return ;
 
                 }
                 break;
             case 52 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:391: NULL
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:400: IN
                 {
-                mNULL(); if (failed) return ;
+                mIN(); if (failed) return ;
 
                 }
                 break;
             case 53 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:396: EXISTS
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:403: NULL
                 {
-                mEXISTS(); if (failed) return ;
+                mNULL(); if (failed) return ;
 
                 }
                 break;
             case 54 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:403: NOT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:408: EXISTS
                 {
-                mNOT(); if (failed) return ;
+                mEXISTS(); if (failed) return ;
 
                 }
                 break;
             case 55 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:407: EVAL
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:415: NOT
                 {
-                mEVAL(); if (failed) return ;
+                mNOT(); if (failed) return ;
 
                 }
                 break;
             case 56 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:412: FORALL
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:419: EVAL
                 {
-                mFORALL(); if (failed) return ;
+                mEVAL(); if (failed) return ;
 
                 }
                 break;
             case 57 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:419: WHEN
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:424: FORALL
                 {
-                mWHEN(); if (failed) return ;
+                mFORALL(); if (failed) return ;
 
                 }
                 break;
             case 58 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:424: THEN
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:431: WHEN
                 {
-                mTHEN(); if (failed) return ;
+                mWHEN(); if (failed) return ;
 
                 }
                 break;
             case 59 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:429: END
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:436: THEN
                 {
-                mEND(); if (failed) return ;
+                mTHEN(); if (failed) return ;
 
                 }
                 break;
             case 60 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:433: ID
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:441: END
                 {
-                mID(); if (failed) return ;
+                mEND(); if (failed) return ;
 
                 }
                 break;
             case 61 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:436: LEFT_PAREN
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:445: ID
                 {
-                mLEFT_PAREN(); if (failed) return ;
+                mID(); if (failed) return ;
 
                 }
                 break;
             case 62 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:447: RIGHT_PAREN
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:448: LEFT_PAREN
                 {
-                mRIGHT_PAREN(); if (failed) return ;
+                mLEFT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 63 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:459: LEFT_SQUARE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:459: RIGHT_PAREN
                 {
-                mLEFT_SQUARE(); if (failed) return ;
+                mRIGHT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 64 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:471: RIGHT_SQUARE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:471: LEFT_SQUARE
                 {
-                mRIGHT_SQUARE(); if (failed) return ;
+                mLEFT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 65 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:484: LEFT_CURLY
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:483: RIGHT_SQUARE
                 {
-                mLEFT_CURLY(); if (failed) return ;
+                mRIGHT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 66 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:495: RIGHT_CURLY
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:496: LEFT_CURLY
                 {
-                mRIGHT_CURLY(); if (failed) return ;
+                mLEFT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 67 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:507: COMMA
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:507: RIGHT_CURLY
                 {
-                mCOMMA(); if (failed) return ;
+                mRIGHT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 68 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:513: DOT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:519: COMMA
                 {
-                mDOT(); if (failed) return ;
+                mCOMMA(); if (failed) return ;
 
                 }
                 break;
             case 69 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:517: DOUBLE_AMPER
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:525: DOT
                 {
-                mDOUBLE_AMPER(); if (failed) return ;
+                mDOT(); if (failed) return ;
 
                 }
                 break;
             case 70 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:530: DOUBLE_PIPE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:529: DOUBLE_AMPER
                 {
-                mDOUBLE_PIPE(); if (failed) return ;
+                mDOUBLE_AMPER(); if (failed) return ;
 
                 }
                 break;
             case 71 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:542: TILDE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:542: DOUBLE_PIPE
                 {
-                mTILDE(); if (failed) return ;
+                mDOUBLE_PIPE(); if (failed) return ;
 
                 }
                 break;
             case 72 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:548: SH_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:554: TILDE
                 {
-                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mTILDE(); if (failed) return ;
 
                 }
                 break;
             case 73 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:577: C_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:560: SH_STYLE_SINGLE_LINE_COMMENT
                 {
-                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 74 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:605: MULTI_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:589: C_STYLE_SINGLE_LINE_COMMENT
                 {
-                mMULTI_LINE_COMMENT(); if (failed) return ;
+                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 75 :
-                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:624: MISC
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:617: MULTI_LINE_COMMENT
                 {
+                mMULTI_LINE_COMMENT(); if (failed) return ;
+
+                }
+                break;
+            case 76 :
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:636: MISC
+                {
                 mMISC(); if (failed) return ;
 
                 }
@@ -2935,8 +2962,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:14: ( '\\r\\n' )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:16: '\\r\\n'
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1742:14: ( '\\r\\n' )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1742:16: '\\r\\n'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2964,90 +2991,91 @@
     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\67\1\uffff\1"+
-        "\54\21\53\10\uffff\2\54\2\uffff\1\54\15\uffff\10\53\1\150\26\53"+
-        "\1\u0086\3\53\4\uffff\11\53\1\uffff\5\53\1\u0098\11\53\1\u00a2\10"+
-        "\53\1\uffff\1\u00ab\3\53\1\uffff\3\53\1\u00b2\1\u00b3\1\53\1\u00b5"+
-        "\4\53\1\u00ba\3\53\1\u00be\1\53\1\uffff\4\53\1\u00c5\4\53\1\uffff"+
-        "\7\53\1\u00d2\1\uffff\5\53\1\u00d8\2\uffff\1\53\1\uffff\1\53\1\u00b2"+
-        "\2\53\1\uffff\3\53\1\uffff\1\u00e0\5\53\1\uffff\1\u00e6\4\53\1\uffff"+
-        "\2\53\1\uffff\3\53\2\uffff\4\53\1\uffff\1\53\1\u00f6\2\53\1\u00f9"+
-        "\1\53\1\u00fb\1\uffff\1\53\1\u00fd\1\53\1\u00ff\1\53\1\uffff\1\u0101"+
-        "\5\53\1\uffff\10\53\1\uffff\1\53\1\u0112\1\uffff\1\53\1\uffff\1"+
-        "\u0114\1\uffff\1\u0115\1\uffff\1\53\1\uffff\3\53\1\uffff\1\53\2"+
-        "\uffff\1\u011b\3\53\1\u011f\1\u0120\1\53\1\u0122\1\u0123\1\uffff"+
-        "\1\u0124\2\uffff\4\53\1\u0129\1\uffff\1\u012a\1\53\1\u012c\2\uffff"+
-        "\1\u012d\4\uffff\3\53\2\uffff\1\53\2\uffff\1\53\1\u0133\1\u0134"+
-        "\1\u0135\4\uffff";
+        "\54\21\53\10\uffff\2\54\2\uffff\1\54\15\uffff\11\53\1\151\25\53"+
+        "\1\u0087\3\53\4\uffff\12\53\1\uffff\2\53\1\u0097\12\53\1\u00a2\11"+
+        "\53\1\uffff\1\u00ac\4\53\1\uffff\3\53\1\u00b4\1\u00b5\2\53\1\u00b8"+
+        "\4\53\1\u00bd\2\53\1\uffff\2\53\1\u00c2\2\53\1\u00c6\4\53\1\uffff"+
+        "\11\53\1\uffff\1\u00d5\5\53\1\u00db\2\uffff\2\53\1\uffff\1\53\1"+
+        "\u00b5\2\53\1\uffff\4\53\1\uffff\1\u00e5\2\53\1\uffff\2\53\1\u00ea"+
+        "\1\uffff\6\53\1\uffff\3\53\2\uffff\4\53\1\uffff\2\53\1\u00fb\1\53"+
+        "\1\u00fd\1\53\1\u00ff\1\53\2\uffff\1\u0101\2\53\1\u0104\1\uffff"+
+        "\3\53\1\u0108\2\53\1\uffff\11\53\1\uffff\1\u0116\1\uffff\1\53\1"+
+        "\uffff\1\u0118\1\uffff\1\53\1\u011a\1\uffff\1\53\1\uffff\1\53\1"+
+        "\uffff\1\53\1\u011e\2\uffff\3\53\1\u0122\1\53\1\u0124\1\53\1\u0126"+
+        "\1\u0127\1\uffff\1\u0128\1\uffff\1\53\1\uffff\3\53\1\uffff\1\u012d"+
+        "\1\53\1\u012f\1\uffff\1\u0130\1\uffff\1\u0131\4\uffff\3\53\1\uffff"+
+        "\1\53\3\uffff\1\u0136\1\u0137\1\53\1\u0139\4\uffff";
     static final String DFA18_eofS =
-        "\u0136\uffff";
+        "\u013a\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\145\1\165\1\143\2\141\3\157\1\162"+
-        "\1\141\1\150\10\uffff\1\46\1\174\2\uffff\1\52\15\uffff\1\165\1\145"+
-        "\1\155\1\157\1\162\1\154\1\156\1\143\1\60\1\160\1\143\2\141\1\157"+
-        "\1\163\1\154\1\145\1\143\1\164\1\144\1\164\1\145\1\162\1\164\1\141"+
-        "\1\154\1\165\1\154\1\55\1\143\1\154\1\60\1\164\1\155\1\145\4\uffff"+
-        "\1\145\1\156\1\160\1\155\1\141\1\163\1\143\1\153\1\164\1\uffff\1"+
-        "\157\1\154\1\163\1\154\1\156\1\60\2\142\1\145\1\165\1\145\1\162"+
-        "\1\151\1\165\1\162\1\60\1\157\1\156\1\141\1\145\1\154\1\151\1\156"+
-        "\1\154\1\uffff\1\60\1\153\1\164\1\154\1\uffff\1\143\1\142\1\156"+
-        "\2\60\1\154\1\60\1\154\1\145\1\164\1\141\1\60\1\162\1\165\1\164"+
-        "\1\60\1\164\1\uffff\1\154\1\141\1\162\1\154\1\60\1\171\1\157\1\155"+
-        "\1\151\1\uffff\1\55\1\144\1\164\1\55\2\145\1\144\1\60\1\uffff\1"+
-        "\55\1\141\1\145\1\150\1\145\1\60\2\uffff\1\141\1\uffff\1\154\1\60"+
-        "\1\151\1\147\1\uffff\1\164\1\144\1\163\1\uffff\1\60\1\145\1\154"+
-        "\1\163\1\164\1\154\1\uffff\1\60\1\156\1\141\1\165\1\142\1\uffff"+
-        "\1\141\1\151\1\145\1\143\1\156\1\163\2\uffff\1\151\1\143\1\145\1"+
-        "\162\1\uffff\1\164\1\60\1\157\1\145\1\60\1\145\1\60\1\uffff\1\144"+
-        "\1\60\1\145\1\60\1\157\1\uffff\1\60\1\164\1\154\1\165\1\55\1\157"+
-        "\1\146\1\164\1\143\1\154\1\156\1\164\1\163\1\117\1\145\1\uffff\1"+
-        "\156\1\60\1\uffff\1\163\1\uffff\1\60\1\uffff\1\60\1\uffff\1\167"+
-        "\1\uffff\1\151\1\141\1\164\1\uffff\1\156\2\uffff\1\60\1\145\1\151"+
-        "\1\163\2\60\1\146\2\60\1\uffff\1\60\2\uffff\1\55\1\157\1\164\1\145"+
-        "\1\60\1\uffff\1\60\1\153\1\60\2\uffff\1\60\4\uffff\1\156\1\145\1"+
-        "\163\2\uffff\1\145\2\uffff\1\55\3\60\4\uffff";
+        "\1\141\1\150\10\uffff\1\46\1\174\2\uffff\1\52\15\uffff\1\145\1\165"+
+        "\1\155\1\156\1\157\1\162\1\154\1\143\1\160\1\60\1\143\2\141\1\157"+
+        "\1\154\1\163\1\145\1\164\1\144\1\164\1\145\1\143\1\141\1\164\1\162"+
+        "\1\165\1\154\1\55\1\154\1\143\1\154\1\60\1\164\1\155\1\145\4\uffff"+
+        "\1\156\1\145\1\160\1\143\1\155\1\141\1\163\1\153\1\157\1\164\1\uffff"+
+        "\1\154\1\163\1\60\1\142\1\162\1\154\1\156\1\142\2\145\1\165\1\162"+
+        "\1\157\1\60\1\162\1\156\1\165\1\151\1\154\1\145\1\141\1\156\1\151"+
+        "\1\uffff\1\60\1\154\1\153\1\154\1\164\1\uffff\1\143\1\142\1\156"+
+        "\2\60\1\154\1\164\1\60\1\154\1\145\1\141\1\162\1\60\1\165\1\164"+
+        "\1\uffff\1\154\1\171\1\60\1\164\1\141\1\60\1\162\1\154\1\171\1\55"+
+        "\1\uffff\1\151\1\144\1\155\1\157\1\145\1\55\1\164\1\144\1\145\1"+
+        "\uffff\1\60\1\55\1\145\1\141\1\150\1\145\1\60\2\uffff\1\141\1\151"+
+        "\1\uffff\1\154\1\60\1\147\1\164\1\uffff\1\144\1\163\1\145\1\55\1"+
+        "\uffff\1\60\2\154\1\uffff\1\163\1\164\1\60\1\uffff\1\142\1\141\1"+
+        "\165\1\156\1\141\1\143\1\145\1\151\1\163\1\156\2\uffff\1\143\1\151"+
+        "\1\145\1\162\1\uffff\1\164\1\157\1\60\1\145\1\60\1\145\1\60\1\144"+
+        "\2\uffff\1\60\1\157\1\145\1\60\1\uffff\1\165\1\55\1\154\1\60\2\164"+
+        "\1\146\1\157\1\154\1\143\1\164\1\156\1\163\1\117\1\145\1\156\1\uffff"+
+        "\1\60\1\uffff\1\163\1\uffff\1\60\1\uffff\1\167\1\60\1\uffff\1\164"+
+        "\1\uffff\1\141\1\uffff\1\151\1\60\2\uffff\1\156\1\151\1\145\1\60"+
+        "\1\163\1\60\1\146\2\60\1\uffff\1\60\1\uffff\1\55\1\uffff\1\145\1"+
+        "\164\1\157\1\uffff\1\60\1\153\1\60\1\uffff\1\60\1\uffff\1\60\4\uffff"+
+        "\1\163\1\145\1\156\1\uffff\1\145\3\uffff\2\60\1\55\1\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\145"+
-        "\1\155\1\157\1\162\1\154\1\156\1\143\1\u00ff\1\160\1\151\1\145\1"+
-        "\144\1\157\1\166\1\154\1\145\2\164\1\144\1\164\1\145\1\162\1\164"+
-        "\1\141\1\154\1\165\1\154\1\164\1\143\1\156\1\u00ff\1\164\1\155\1"+
-        "\145\4\uffff\1\145\1\156\1\160\1\155\1\141\1\163\1\143\1\153\1\164"+
-        "\1\uffff\1\157\1\154\1\163\1\154\1\156\1\u00ff\2\142\1\145\1\165"+
-        "\1\145\1\162\1\151\1\165\1\162\1\u00ff\1\157\1\156\1\141\1\145\1"+
-        "\154\1\151\1\156\1\154\1\uffff\1\u00ff\1\153\1\164\1\154\1\uffff"+
-        "\1\143\1\142\1\156\2\u00ff\1\154\1\u00ff\1\154\1\145\1\164\1\141"+
-        "\1\u00ff\1\162\1\165\1\164\1\u00ff\1\164\1\uffff\1\154\1\141\1\162"+
-        "\1\154\1\u00ff\1\171\1\166\1\155\1\151\1\uffff\1\55\1\144\1\164"+
-        "\1\55\2\145\1\144\1\u00ff\1\uffff\1\55\1\141\1\145\1\150\1\145\1"+
-        "\u00ff\2\uffff\1\141\1\uffff\1\154\1\u00ff\1\151\1\147\1\uffff\1"+
-        "\164\1\144\1\163\1\uffff\1\u00ff\1\145\1\154\1\163\1\164\1\154\1"+
-        "\uffff\1\u00ff\1\156\1\141\1\165\1\142\1\uffff\1\141\1\151\1\145"+
-        "\1\143\1\156\1\163\2\uffff\1\151\1\143\1\145\1\162\1\uffff\1\164"+
-        "\1\u00ff\1\157\1\145\1\u00ff\1\145\1\u00ff\1\uffff\1\144\1\u00ff"+
-        "\1\145\1\u00ff\1\157\1\uffff\1\u00ff\1\164\1\154\1\165\1\55\1\157"+
-        "\1\170\1\164\1\143\1\154\1\156\1\164\1\163\1\117\1\145\1\uffff\1"+
-        "\156\1\u00ff\1\uffff\1\163\1\uffff\1\u00ff\1\uffff\1\u00ff\1\uffff"+
-        "\1\167\1\uffff\1\151\1\141\1\164\1\uffff\1\156\2\uffff\1\u00ff\1"+
-        "\145\1\151\1\163\2\u00ff\1\146\2\u00ff\1\uffff\1\u00ff\2\uffff\1"+
-        "\55\1\157\1\164\1\145\1\u00ff\1\uffff\1\u00ff\1\153\1\u00ff\2\uffff"+
-        "\1\u00ff\4\uffff\1\156\1\145\1\163\2\uffff\1\145\2\uffff\1\55\3"+
-        "\u00ff\4\uffff";
+        "\1\145\1\150\10\uffff\1\46\1\174\2\uffff\1\57\15\uffff\1\145\1\165"+
+        "\1\155\1\156\1\157\1\162\1\154\1\143\1\160\1\u00ff\1\151\1\164\1"+
+        "\145\1\157\1\154\1\166\1\145\1\164\1\144\1\164\1\145\1\164\1\141"+
+        "\1\164\1\162\1\165\1\154\1\164\1\154\1\143\1\156\1\u00ff\1\164\1"+
+        "\155\1\145\4\uffff\1\156\1\145\1\160\1\143\1\155\1\141\1\163\1\153"+
+        "\1\157\1\164\1\uffff\1\154\1\163\1\u00ff\1\142\1\162\1\154\1\156"+
+        "\1\142\2\145\1\165\1\162\1\157\1\u00ff\1\162\1\156\1\165\1\151\1"+
+        "\154\1\145\1\141\1\156\1\151\1\uffff\1\u00ff\1\154\1\153\1\154\1"+
+        "\164\1\uffff\1\143\1\142\1\156\2\u00ff\1\154\1\164\1\u00ff\1\154"+
+        "\1\145\1\141\1\162\1\u00ff\1\165\1\164\1\uffff\1\154\1\171\1\u00ff"+
+        "\1\164\1\141\1\u00ff\1\162\1\154\1\171\1\55\1\uffff\1\151\1\144"+
+        "\1\155\1\166\1\145\1\55\1\164\1\144\1\145\1\uffff\1\u00ff\1\55\1"+
+        "\145\1\141\1\150\1\145\1\u00ff\2\uffff\1\141\1\151\1\uffff\1\154"+
+        "\1\u00ff\1\147\1\164\1\uffff\1\144\1\163\1\145\1\55\1\uffff\1\u00ff"+
+        "\2\154\1\uffff\1\163\1\164\1\u00ff\1\uffff\1\142\1\141\1\165\1\156"+
+        "\1\141\1\143\1\145\1\151\1\163\1\156\2\uffff\1\143\1\151\1\145\1"+
+        "\162\1\uffff\1\164\1\157\1\u00ff\1\145\1\u00ff\1\145\1\u00ff\1\144"+
+        "\2\uffff\1\u00ff\1\157\1\145\1\u00ff\1\uffff\1\165\1\55\1\154\1"+
+        "\u00ff\2\164\1\170\1\157\1\154\1\143\1\164\1\156\1\163\1\117\1\145"+
+        "\1\156\1\uffff\1\u00ff\1\uffff\1\163\1\uffff\1\u00ff\1\uffff\1\167"+
+        "\1\u00ff\1\uffff\1\164\1\uffff\1\141\1\uffff\1\151\1\u00ff\2\uffff"+
+        "\1\156\1\151\1\145\1\u00ff\1\163\1\u00ff\1\146\2\u00ff\1\uffff\1"+
+        "\u00ff\1\uffff\1\55\1\uffff\1\145\1\164\1\157\1\uffff\1\u00ff\1"+
+        "\153\1\u00ff\1\uffff\1\u00ff\1\uffff\1\u00ff\4\uffff\1\163\1\145"+
+        "\1\156\1\uffff\1\145\3\uffff\2\u00ff\1\55\1\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\74"+
-        "\1\75\1\76\1\77\1\100\1\101\1\102\1\103\2\uffff\1\107\1\110\1\uffff"+
-        "\1\74\1\113\1\2\1\104\1\4\1\5\1\7\1\6\1\11\1\10\1\12\1\15\1\14\43"+
-        "\uffff\1\105\1\106\1\111\1\112\11\uffff\1\63\30\uffff\1\35\4\uffff"+
-        "\1\54\21\uffff\1\73\11\uffff\1\55\10\uffff\1\66\6\uffff\1\17\1\72"+
-        "\1\uffff\1\45\4\uffff\1\47\3\uffff\1\67\6\uffff\1\25\5\uffff\1\36"+
-        "\6\uffff\1\64\1\44\4\uffff\1\71\7\uffff\1\23\5\uffff\1\26\17\uffff"+
-        "\1\70\2\uffff\1\21\1\uffff\1\65\1\uffff\1\24\1\uffff\1\52\1\uffff"+
-        "\1\50\3\uffff\1\40\1\uffff\1\31\1\32\11\uffff\1\20\1\uffff\1\33"+
-        "\1\51\5\uffff\1\41\3\uffff\1\53\1\61\1\uffff\1\27\1\22\1\57\1\42"+
-        "\3\uffff\1\43\1\34\1\uffff\1\56\1\60\4\uffff\1\37\1\46\1\30\1\62";
+        "\1\uffff\1\1\1\uffff\1\3\5\uffff\1\13\1\uffff\1\16\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\uffff"+
+        "\1\75\1\114\1\2\1\105\1\4\1\5\1\7\1\6\1\11\1\10\1\12\1\15\1\14\43"+
+        "\uffff\1\106\1\107\1\113\1\112\12\uffff\1\64\27\uffff\1\35\5\uffff"+
+        "\1\55\17\uffff\1\74\12\uffff\1\56\11\uffff\1\67\7\uffff\1\73\1\17"+
+        "\2\uffff\1\45\4\uffff\1\47\4\uffff\1\70\3\uffff\1\25\3\uffff\1\36"+
+        "\12\uffff\1\65\1\44\4\uffff\1\72\10\uffff\1\54\1\23\4\uffff\1\26"+
+        "\20\uffff\1\71\1\uffff\1\21\1\uffff\1\66\1\uffff\1\24\2\uffff\1"+
+        "\52\1\uffff\1\40\1\uffff\1\50\2\uffff\1\32\1\31\11\uffff\1\20\1"+
+        "\uffff\1\33\1\uffff\1\51\3\uffff\1\41\3\uffff\1\53\1\uffff\1\62"+
+        "\1\uffff\1\27\1\22\1\60\1\42\3\uffff\1\43\1\uffff\1\34\1\57\1\61"+
+        "\4\uffff\1\30\1\46\1\37\1\63";
     static final String DFA18_specialS =
-        "\u0136\uffff}>";
+        "\u013a\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"+
@@ -3067,18 +3095,18 @@
             "\1\66\1\uffff\12\12",
             "",
             "\uffff\13",
-            "\1\72\2\uffff\1\71\11\uffff\1\70",
-            "\1\75\15\uffff\1\74\2\uffff\1\73\2\uffff\1\76",
+            "\1\72\2\uffff\1\70\11\uffff\1\71",
+            "\1\76\15\uffff\1\75\2\uffff\1\74\2\uffff\1\73",
             "\1\77",
-            "\1\101\1\100",
-            "\1\104\7\uffff\1\103\1\uffff\1\102",
+            "\1\100\1\101",
+            "\1\103\7\uffff\1\104\1\uffff\1\102",
             "\1\105",
-            "\1\106\17\uffff\1\107",
+            "\1\107\17\uffff\1\106",
             "\1\110",
-            "\1\111\3\uffff\1\115\6\uffff\1\113\5\uffff\1\112\1\114",
-            "\1\117\7\uffff\1\120\13\uffff\1\116",
-            "\1\121\15\uffff\1\122",
-            "\1\124\5\uffff\1\123",
+            "\1\115\3\uffff\1\114\6\uffff\1\112\5\uffff\1\113\1\111",
+            "\1\117\7\uffff\1\116\13\uffff\1\120",
+            "\1\122\15\uffff\1\121",
+            "\1\123\5\uffff\1\124",
             "\1\125",
             "\1\126",
             "\1\127",
@@ -3096,7 +3124,7 @@
             "\1\134",
             "",
             "",
-            "\1\136\4\uffff\1\135",
+            "\1\135\4\uffff\1\136",
             "",
             "",
             "",
@@ -3118,22 +3146,21 @@
             "\1\144",
             "\1\145",
             "\1\146",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\10\53\1\147\21\53"+
+            "\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\151",
             "\1\152\5\uffff\1\153",
-            "\1\154\3\uffff\1\155",
-            "\1\157\2\uffff\1\156",
-            "\1\160",
-            "\1\162\2\uffff\1\161",
-            "\1\163",
-            "\1\164",
-            "\1\166\20\uffff\1\165",
+            "\1\155\2\uffff\1\154\17\uffff\1\156",
+            "\1\157\3\uffff\1\160",
+            "\1\161",
+            "\1\162",
+            "\1\164\2\uffff\1\163",
+            "\1\165",
+            "\1\166",
             "\1\167",
             "\1\170",
             "\1\171",
-            "\1\172",
-            "\1\173",
+            "\1\172\20\uffff\1\173",
             "\1\174",
             "\1\175",
             "\1\176",
@@ -3141,17 +3168,17 @@
             "\1\u0080",
             "\1\u0081\106\uffff\1\u0082",
             "\1\u0083",
-            "\1\u0085\1\uffff\1\u0084",
+            "\1\u0084",
+            "\1\u0085\1\uffff\1\u0086",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\1\u0087",
             "\1\u0088",
             "\1\u0089",
+            "\1\u008a",
             "",
             "",
             "",
             "",
-            "\1\u008a",
             "\1\u008b",
             "\1\u008c",
             "\1\u008d",
@@ -3160,14 +3187,14 @@
             "\1\u0090",
             "\1\u0091",
             "\1\u0092",
-            "",
             "\1\u0093",
             "\1\u0094",
+            "",
             "\1\u0095",
             "\1\u0096",
-            "\1\u0097",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
+            "\1\u0098",
             "\1\u0099",
             "\1\u009a",
             "\1\u009b",
@@ -3187,92 +3214,92 @@
             "\1\u00a8",
             "\1\u00a9",
             "\1\u00aa",
+            "\1\u00ab",
             "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\1\u00ac",
             "\1\u00ad",
             "\1\u00ae",
-            "",
             "\1\u00af",
             "\1\u00b0",
+            "",
             "\1\u00b1",
+            "\1\u00b2",
+            "\1\u00b3",
             "\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\u00b4",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "\1\u00b6",
             "\1\u00b7",
-            "\1\u00b8",
-            "\1\u00b9",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
+            "\1\u00b9",
+            "\1\u00ba",
             "\1\u00bb",
             "\1\u00bc",
-            "\1\u00bd",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
+            "\1\u00be",
             "\1\u00bf",
             "",
             "\1\u00c0",
             "\1\u00c1",
-            "\1\u00c2",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00c3",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\5\53\1\u00c4\24\53"+
+            "\1\u00c4",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\5\53\1\u00c5\24\53"+
             "\105\uffff\100\53",
-            "\1\u00c6",
-            "\1\u00c7\6\uffff\1\u00c8",
+            "\1\u00c7",
+            "\1\u00c8",
             "\1\u00c9",
             "\1\u00ca",
             "",
             "\1\u00cb",
             "\1\u00cc",
             "\1\u00cd",
-            "\1\u00ce",
-            "\1\u00cf",
+            "\1\u00ce\6\uffff\1\u00cf",
             "\1\u00d0",
             "\1\u00d1",
+            "\1\u00d2",
+            "\1\u00d3",
+            "\1\u00d4",
+            "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "",
-            "\1\u00d3",
-            "\1\u00d4",
-            "\1\u00d5",
             "\1\u00d6",
             "\1\u00d7",
+            "\1\u00d8",
+            "\1\u00d9",
+            "\1\u00da",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "",
             "",
-            "\1\u00d9",
+            "\1\u00dc",
+            "\1\u00dd",
             "",
-            "\1\u00da",
+            "\1\u00de",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\1\u00db",
-            "\1\u00dc",
-            "",
-            "\1\u00dd",
-            "\1\u00de",
             "\1\u00df",
+            "\1\u00e0",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
             "\1\u00e1",
             "\1\u00e2",
             "\1\u00e3",
             "\1\u00e4",
-            "\1\u00e5",
             "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
+            "\1\u00e6",
             "\1\u00e7",
+            "",
             "\1\u00e8",
             "\1\u00e9",
-            "\1\u00ea",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
             "\1\u00eb",
             "\1\u00ec",
@@ -3280,24 +3307,21 @@
             "\1\u00ee",
             "\1\u00ef",
             "\1\u00f0",
-            "",
-            "",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
             "\1\u00f4",
             "",
+            "",
             "\1\u00f5",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "\1\u00f6",
             "\1\u00f7",
             "\1\u00f8",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
-            "\53",
+            "",
+            "\1\u00f9",
             "\1\u00fa",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "",
             "\1\u00fc",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
@@ -3306,96 +3330,104 @@
             "\53",
             "\1\u0100",
             "",
+            "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "\1\u0102",
             "\1\u0103",
-            "\1\u0104",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
+            "",
             "\1\u0105",
             "\1\u0106",
-            "\1\u0107\21\uffff\1\u0108",
+            "\1\u0107",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u0109",
             "\1\u010a",
-            "\1\u010b",
-            "\1\u010c",
+            "\1\u010c\21\uffff\1\u010b",
             "\1\u010d",
             "\1\u010e",
             "\1\u010f",
             "\1\u0110",
+            "\1\u0111",
+            "\1\u0112",
+            "\1\u0113",
+            "\1\u0114",
+            "\1\u0115",
             "",
-            "\1\u0111",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "",
-            "\1\u0113",
+            "\1\u0117",
             "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "",
+            "\1\u0119",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "",
-            "\1\u0116",
+            "\1\u011b",
             "",
-            "\1\u0117",
-            "\1\u0118",
-            "\1\u0119",
+            "\1\u011c",
             "",
-            "\1\u011a",
+            "\1\u011d",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
             "",
+            "\1\u011f",
+            "\1\u0120",
+            "\1\u0121",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\1\u011c",
-            "\1\u011d",
-            "\1\u011e",
+            "\1\u0123",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
+            "\1\u0125",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\1\u0121",
             "\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",
             "",
+            "\1\u0129",
             "",
-            "\1\u0125",
-            "\1\u0126",
-            "\1\u0127",
-            "\1\u0128",
+            "\1\u012a",
+            "\1\u012b",
+            "\1\u012c",
+            "",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "",
+            "\1\u012e",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
-            "\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",
             "",
             "",
             "",
             "",
-            "\1\u012e",
-            "\1\u012f",
-            "\1\u0130",
+            "\1\u0132",
+            "\1\u0133",
+            "\1\u0134",
             "",
+            "\1\u0135",
             "",
-            "\1\u0131",
             "",
             "",
-            "\1\u0132",
             "\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\u0138",
             "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
             "\53",
             "",
@@ -3434,7 +3466,7 @@
             this.transition = DFA18_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | REVERSE | RESULT | COLLECT | 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 : ( T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | WS | INT | FLOAT | STRING | BOOL | PACKAGE | IMPORT | FUNCTION | EVENT | GLOBAL | RULE | QUERY | TEMPLATE | ATTRIBUTES | DATE_EFFECTIVE | DATE_EXPIRES | ENABLED | SALIENCE | NO_LOOP | AUTO_FOCUS | ACTIVATION_GROUP | AGENDA_GROUP | DIALECT | RULEFLOW_GROUP | DURATION | LOCK_ON_ACTIVE | FROM | ACCUMULATE | INIT | ACTION | 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 );";
         }
     }
  

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-12-01 18:56:35
+// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-12-13 15:21:40
 
 	package org.drools.lang;
 	import java.util.List;
@@ -17,22 +17,22 @@
 import java.util.HashMap;
 public class DRLParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "EVENT", "ID", "DOT", "GLOBAL", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "QUERY", "END", "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", "CONTAINS", "EXCLUDES", "MATCHES", "SOUNDSLIKE", "MEMBEROF", "TILDE", "IN", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.*'", "':'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "PACKAGE", "IMPORT", "FUNCTION", "EVENT", "ID", "DOT", "GLOBAL", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "QUERY", "END", "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", "CONTAINS", "EXCLUDES", "MATCHES", "SOUNDSLIKE", "MEMBEROF", "TILDE", "IN", "FLOAT", "NULL", "LEFT_CURLY", "RIGHT_CURLY", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "MISC", "';'", "'.*'", "':'", "'->'", "'=='", "'>'", "'>='", "'<'", "'<='", "'!='"
     };
     public static final int COMMA=12;
     public static final int EXISTS=40;
     public static final int AUTO_FOCUS=28;
     public static final int END=15;
-    public static final int HexDigit=67;
+    public static final int HexDigit=68;
     public static final int FORALL=43;
     public static final int TEMPLATE=16;
-    public static final int MISC=73;
-    public static final int FLOAT=57;
+    public static final int MISC=74;
+    public static final int FLOAT=58;
     public static final int QUERY=14;
-    public static final int THEN=63;
+    public static final int THEN=64;
     public static final int RULE=17;
     public static final int INIT=45;
-    public static final int TILDE=55;
+    public static final int TILDE=56;
     public static final int IMPORT=5;
     public static final int PACKAGE=4;
     public static final int DATE_EFFECTIVE=20;
@@ -42,58 +42,59 @@
     public static final int AND=37;
     public static final int FUNCTION=6;
     public static final int GLOBAL=10;
-    public static final int EscapeSequence=66;
+    public static final int EscapeSequence=67;
     public static final int DIALECT=33;
     public static final int INT=26;
     public static final int LOCK_ON_ACTIVE=34;
     public static final int DATE_EXPIRES=22;
-    public static final int LEFT_SQUARE=61;
-    public static final int CONTAINS=50;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=70;
+    public static final int LEFT_SQUARE=62;
+    public static final int CONTAINS=51;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=71;
     public static final int ATTRIBUTES=19;
     public static final int EVENT=7;
-    public static final int LEFT_CURLY=59;
+    public static final int LEFT_CURLY=60;
     public static final int RESULT=48;
     public static final int ID=8;
     public static final int FROM=39;
     public static final int LEFT_PAREN=11;
     public static final int ACTIVATION_GROUP=29;
     public static final int DOUBLE_AMPER=38;
-    public static final int RIGHT_CURLY=60;
-    public static final int SOUNDSLIKE=53;
-    public static final int EXCLUDES=51;
+    public static final int RIGHT_CURLY=61;
+    public static final int SOUNDSLIKE=54;
+    public static final int EXCLUDES=52;
     public static final int BOOL=24;
-    public static final int MEMBEROF=54;
+    public static final int MEMBEROF=55;
     public static final int WHEN=18;
     public static final int RULEFLOW_GROUP=30;
-    public static final int WS=65;
+    public static final int WS=66;
     public static final int STRING=21;
     public static final int ACTION=46;
     public static final int COLLECT=49;
-    public static final int IN=56;
+    public static final int IN=57;
     public static final int REVERSE=47;
     public static final int ACCUMULATE=44;
     public static final int NO_LOOP=27;
-    public static final int UnicodeEscape=68;
+    public static final int UnicodeEscape=69;
     public static final int DURATION=32;
     public static final int EVAL=42;
-    public static final int MATCHES=52;
+    public static final int MATCHES=53;
     public static final int EOF=-1;
-    public static final int EOL=64;
-    public static final int NULL=58;
+    public static final int EOL=65;
+    public static final int NULL=59;
     public static final int AGENDA_GROUP=31;
-    public static final int OctalEscape=69;
+    public static final int OctalEscape=70;
     public static final int SALIENCE=25;
-    public static final int MULTI_LINE_COMMENT=72;
+    public static final int MULTI_LINE_COMMENT=73;
     public static final int RIGHT_PAREN=13;
     public static final int NOT=41;
     public static final int ENABLED=23;
-    public static final int RIGHT_SQUARE=62;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=71;
+    public static final int RIGHT_SQUARE=63;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=72;
+    public static final int ENTRY_POINT=50;
 
         public DRLParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[81+1];
+            ruleMemo = new HashMap[85+1];
          }
         
 
@@ -273,7 +274,7 @@
             }
             
             private String safeSubstring( String text, int start, int end ) {
-            	return text.substring( start, Math.max( start, end ) );
+                	return text.substring( Math.min( start, text.length() ), Math.min( Math.max( start, end ), text.length() ) );
             }
           
 
@@ -290,14 +291,14 @@
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==74) ) {
+            if ( (LA1_0==75) ) {
                 alt1=1;
             }
             switch (alt1) {
                 case 1 :
                     // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ';'
                     {
-                    match(input,74,FOLLOW_74_in_opt_semicolon39); if (failed) return ;
+                    match(input,75,FOLLOW_75_in_opt_semicolon39); if (failed) return ;
 
                     }
                     break;
@@ -647,7 +648,7 @@
 
 
     // $ANTLR start package_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:234:1: package_statement returns [String packageName] : PACKAGE n= dotted_name opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:235:1: package_statement returns [String packageName] : PACKAGE n= dotted_name opt_semicolon ;
     public final String package_statement() throws RecognitionException {
         String packageName = null;
 
@@ -658,15 +659,15 @@
         		packageName = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:238:2: ( PACKAGE n= dotted_name opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:239:3: PACKAGE n= dotted_name opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:239:2: ( PACKAGE n= dotted_name opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:240:3: PACKAGE n= dotted_name opt_semicolon
             {
-            match(input,PACKAGE,FOLLOW_PACKAGE_in_package_statement210); if (failed) return packageName;
-            pushFollow(FOLLOW_dotted_name_in_package_statement214);
+            match(input,PACKAGE,FOLLOW_PACKAGE_in_package_statement212); if (failed) return packageName;
+            pushFollow(FOLLOW_dotted_name_in_package_statement216);
             n=dotted_name();
             _fsp--;
             if (failed) return packageName;
-            pushFollow(FOLLOW_opt_semicolon_in_package_statement216);
+            pushFollow(FOLLOW_opt_semicolon_in_package_statement218);
             opt_semicolon();
             _fsp--;
             if (failed) return packageName;
@@ -691,7 +692,7 @@
 
 
     // $ANTLR start import_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:247:1: import_statement : IMPORT import_name[importDecl] opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:248:1: import_statement : IMPORT import_name[importDecl] opt_semicolon ;
     public final void import_statement() throws RecognitionException {
         Token IMPORT1=null;
 
@@ -699,11 +700,11 @@
                 	ImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:251:2: ( IMPORT import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:251:4: IMPORT import_name[importDecl] opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:252:2: ( IMPORT import_name[importDecl] opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:252:4: IMPORT import_name[importDecl] opt_semicolon
             {
             IMPORT1=(Token)input.LT(1);
-            match(input,IMPORT,FOLLOW_IMPORT_in_import_statement247); if (failed) return ;
+            match(input,IMPORT,FOLLOW_IMPORT_in_import_statement249); if (failed) return ;
             if ( backtracking==0 ) {
 
               	            importDecl = factory.createImport( );
@@ -713,11 +714,11 @@
               		    }
               	        
             }
-            pushFollow(FOLLOW_import_name_in_import_statement270);
+            pushFollow(FOLLOW_import_name_in_import_statement272);
             import_name(importDecl);
             _fsp--;
             if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_import_statement273);
+            pushFollow(FOLLOW_opt_semicolon_in_import_statement275);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -737,7 +738,7 @@
 
 
     // $ANTLR start function_import_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:262:1: function_import_statement : IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:263:1: function_import_statement : IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
     public final void function_import_statement() throws RecognitionException {
         Token IMPORT2=null;
 
@@ -745,12 +746,12 @@
                 	FunctionImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:266:2: ( IMPORT FUNCTION import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:266:4: IMPORT FUNCTION import_name[importDecl] opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:267:2: ( IMPORT FUNCTION import_name[importDecl] opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:267:4: IMPORT FUNCTION import_name[importDecl] opt_semicolon
             {
             IMPORT2=(Token)input.LT(1);
-            match(input,IMPORT,FOLLOW_IMPORT_in_function_import_statement297); if (failed) return ;
-            match(input,FUNCTION,FOLLOW_FUNCTION_in_function_import_statement299); if (failed) return ;
+            match(input,IMPORT,FOLLOW_IMPORT_in_function_import_statement299); if (failed) return ;
+            match(input,FUNCTION,FOLLOW_FUNCTION_in_function_import_statement301); if (failed) return ;
             if ( backtracking==0 ) {
 
               	            importDecl = factory.createFunctionImport();
@@ -760,11 +761,11 @@
               		    }
               	        
             }
-            pushFollow(FOLLOW_import_name_in_function_import_statement322);
+            pushFollow(FOLLOW_import_name_in_function_import_statement324);
             import_name(importDecl);
             _fsp--;
             if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_function_import_statement325);
+            pushFollow(FOLLOW_opt_semicolon_in_function_import_statement327);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -784,7 +785,7 @@
 
 
     // $ANTLR start event_import_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:277:1: event_import_statement : IMPORT EVENT import_name[importDecl] opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:278:1: event_import_statement : IMPORT EVENT import_name[importDecl] opt_semicolon ;
     public final void event_import_statement() throws RecognitionException {
         Token IMPORT3=null;
 
@@ -792,12 +793,12 @@
                 	ImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:281:2: ( IMPORT EVENT import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:281:4: IMPORT EVENT import_name[importDecl] opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:282:2: ( IMPORT EVENT import_name[importDecl] opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:282:4: IMPORT EVENT import_name[importDecl] opt_semicolon
             {
             IMPORT3=(Token)input.LT(1);
-            match(input,IMPORT,FOLLOW_IMPORT_in_event_import_statement349); if (failed) return ;
-            match(input,EVENT,FOLLOW_EVENT_in_event_import_statement351); if (failed) return ;
+            match(input,IMPORT,FOLLOW_IMPORT_in_event_import_statement351); if (failed) return ;
+            match(input,EVENT,FOLLOW_EVENT_in_event_import_statement353); if (failed) return ;
             if ( backtracking==0 ) {
 
               	            importDecl = factory.createEventImport( );
@@ -807,11 +808,11 @@
               		    }
               	        
             }
-            pushFollow(FOLLOW_import_name_in_event_import_statement374);
+            pushFollow(FOLLOW_import_name_in_event_import_statement376);
             import_name(importDecl);
             _fsp--;
             if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_event_import_statement377);
+            pushFollow(FOLLOW_opt_semicolon_in_event_import_statement379);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -831,7 +832,7 @@
 
 
     // $ANTLR start import_name
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:293:1: import_name[ImportDescr importDecl] returns [String name] : ID ( DOT id= identifier )* (star= '.*' )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:294:1: import_name[ImportDescr importDecl] returns [String name] : ID ( DOT id= identifier )* (star= '.*' )? ;
     public final String import_name(ImportDescr importDecl) throws RecognitionException {
         String name = null;
 
@@ -845,11 +846,11 @@
         		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:297:2: ( ID ( DOT id= identifier )* (star= '.*' )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:298:3: ID ( DOT id= identifier )* (star= '.*' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:298:2: ( ID ( DOT id= identifier )* (star= '.*' )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:299:3: ID ( DOT id= identifier )* (star= '.*' )?
             {
             ID4=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_import_name403); if (failed) return name;
+            match(input,ID,FOLLOW_ID_in_import_name405); if (failed) return name;
             if ( backtracking==0 ) {
                
               		    name =ID4.getText(); 
@@ -857,7 +858,7 @@
               		    importDecl.setEndCharacter( ((CommonToken)ID4).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:304:3: ( DOT id= identifier )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:305:3: ( DOT id= identifier )*
             loop5:
             do {
                 int alt5=2;
@@ -870,11 +871,11 @@
 
                 switch (alt5) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:304:5: DOT id= identifier
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:305:5: DOT id= identifier
             	    {
             	    DOT5=(Token)input.LT(1);
-            	    match(input,DOT,FOLLOW_DOT_in_import_name415); if (failed) return name;
-            	    pushFollow(FOLLOW_identifier_in_import_name419);
+            	    match(input,DOT,FOLLOW_DOT_in_import_name417); if (failed) return name;
+            	    pushFollow(FOLLOW_identifier_in_import_name421);
             	    id=identifier();
             	    _fsp--;
             	    if (failed) return name;
@@ -894,19 +895,19 @@
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:311:3: (star= '.*' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:312:3: (star= '.*' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
-            if ( (LA6_0==75) ) {
+            if ( (LA6_0==76) ) {
                 alt6=1;
             }
             switch (alt6) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:311:5: star= '.*'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:312:5: star= '.*'
                     {
                     star=(Token)input.LT(1);
-                    match(input,75,FOLLOW_75_in_import_name443); if (failed) return name;
+                    match(input,76,FOLLOW_76_in_import_name445); if (failed) return name;
                     if ( backtracking==0 ) {
                        
                       		        name = name + star.getText(); 
@@ -936,7 +937,7 @@
 
 
     // $ANTLR start global
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:321:1: global : GLOBAL type= dotted_name id= identifier opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:322:1: global : GLOBAL type= dotted_name id= identifier opt_semicolon ;
     public final void global() throws RecognitionException {
         Token GLOBAL6=null;
         String type = null;
@@ -948,11 +949,11 @@
         	    GlobalDescr global = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:325:2: ( GLOBAL type= dotted_name id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:3: GLOBAL type= dotted_name id= identifier opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:326:2: ( GLOBAL type= dotted_name id= identifier opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:327:3: GLOBAL type= dotted_name id= identifier opt_semicolon
             {
             GLOBAL6=(Token)input.LT(1);
-            match(input,GLOBAL,FOLLOW_GLOBAL_in_global477); if (failed) return ;
+            match(input,GLOBAL,FOLLOW_GLOBAL_in_global479); if (failed) return ;
             if ( backtracking==0 ) {
 
               		    global = factory.createGlobal();
@@ -960,7 +961,7 @@
               		    packageDescr.addGlobal( global );
               		
             }
-            pushFollow(FOLLOW_dotted_name_in_global488);
+            pushFollow(FOLLOW_dotted_name_in_global490);
             type=dotted_name();
             _fsp--;
             if (failed) return ;
@@ -969,11 +970,11 @@
               		    global.setType( type );
               		
             }
-            pushFollow(FOLLOW_identifier_in_global499);
+            pushFollow(FOLLOW_identifier_in_global501);
             id=identifier();
             _fsp--;
             if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_global501);
+            pushFollow(FOLLOW_opt_semicolon_in_global503);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -999,7 +1000,7 @@
 
 
     // $ANTLR start function
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:344:1: function : FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:345:1: function : FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk ;
     public final void function() throws RecognitionException {
         Token FUNCTION7=null;
         String retType = null;
@@ -1018,12 +1019,12 @@
         		String type = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:349:2: ( FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:350:3: FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:350:2: ( FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:351:3: FUNCTION (retType= dotted_name )? id= identifier LEFT_PAREN ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )? RIGHT_PAREN body= curly_chunk
             {
             FUNCTION7=(Token)input.LT(1);
-            match(input,FUNCTION,FOLLOW_FUNCTION_in_function526); if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:350:19: (retType= dotted_name )?
+            match(input,FUNCTION,FOLLOW_FUNCTION_in_function528); if (failed) return ;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:351:19: (retType= dotted_name )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1036,9 +1037,9 @@
             }
             switch (alt7) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:350:19: retType= dotted_name
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:351:19: retType= dotted_name
                     {
-                    pushFollow(FOLLOW_dotted_name_in_function530);
+                    pushFollow(FOLLOW_dotted_name_in_function532);
                     retType=dotted_name();
                     _fsp--;
                     if (failed) return ;
@@ -1048,7 +1049,7 @@
 
             }
 
-            pushFollow(FOLLOW_identifier_in_function535);
+            pushFollow(FOLLOW_identifier_in_function537);
             id=identifier();
             _fsp--;
             if (failed) return ;
@@ -1062,8 +1063,8 @@
               			packageDescr.addFunction( f );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_function544); if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:4: ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )?
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_function546); if (failed) return ;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:4: ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -1072,16 +1073,16 @@
             }
             switch (alt11) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:6: (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:6: (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )*
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:15: (paramType= dotted_name )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:15: (paramType= dotted_name )?
                     int alt8=2;
                     alt8 = dfa8.predict(input);
                     switch (alt8) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:15: paramType= dotted_name
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:361:15: paramType= dotted_name
                             {
-                            pushFollow(FOLLOW_dotted_name_in_function553);
+                            pushFollow(FOLLOW_dotted_name_in_function555);
                             paramType=dotted_name();
                             _fsp--;
                             if (failed) return ;
@@ -1091,7 +1092,7 @@
 
                     }
 
-                    pushFollow(FOLLOW_argument_in_function558);
+                    pushFollow(FOLLOW_argument_in_function560);
                     paramName=argument();
                     _fsp--;
                     if (failed) return ;
@@ -1101,7 +1102,7 @@
                       					f.addParameter( type, paramName );
                       				
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:365:5: ( COMMA (paramType= dotted_name )? paramName= argument )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:366:5: ( COMMA (paramType= dotted_name )? paramName= argument )*
                     loop10:
                     do {
                         int alt10=2;
@@ -1114,17 +1115,17 @@
 
                         switch (alt10) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:365:7: COMMA (paramType= dotted_name )? paramName= argument
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:366:7: COMMA (paramType= dotted_name )? paramName= argument
                     	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_function572); if (failed) return ;
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:365:22: (paramType= dotted_name )?
+                    	    match(input,COMMA,FOLLOW_COMMA_in_function574); if (failed) return ;
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:366:22: (paramType= dotted_name )?
                     	    int alt9=2;
                     	    alt9 = dfa9.predict(input);
                     	    switch (alt9) {
                     	        case 1 :
-                    	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:365:22: paramType= dotted_name
+                    	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:366:22: paramType= dotted_name
                     	            {
-                    	            pushFollow(FOLLOW_dotted_name_in_function576);
+                    	            pushFollow(FOLLOW_dotted_name_in_function578);
                     	            paramType=dotted_name();
                     	            _fsp--;
                     	            if (failed) return ;
@@ -1134,7 +1135,7 @@
 
                     	    }
 
-                    	    pushFollow(FOLLOW_argument_in_function581);
+                    	    pushFollow(FOLLOW_argument_in_function583);
                     	    paramName=argument();
                     	    _fsp--;
                     	    if (failed) return ;
@@ -1159,8 +1160,8 @@
 
             }
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_function605); if (failed) return ;
-            pushFollow(FOLLOW_curly_chunk_in_function611);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_function607); if (failed) return ;
+            pushFollow(FOLLOW_curly_chunk_in_function613);
             body=curly_chunk();
             _fsp--;
             if (failed) return ;
@@ -1188,7 +1189,7 @@
 
 
     // $ANTLR start argument
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:382:1: argument returns [String name] : id= identifier ( '[' ']' )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:383:1: argument returns [String name] : id= identifier ( '[' ']' )* ;
     public final String argument() throws RecognitionException {
         String name = null;
 
@@ -1199,17 +1200,17 @@
         		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:2: (id= identifier ( '[' ']' )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:4: id= identifier ( '[' ']' )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:2: (id= identifier ( '[' ']' )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:4: id= identifier ( '[' ']' )*
             {
-            pushFollow(FOLLOW_identifier_in_argument638);
+            pushFollow(FOLLOW_identifier_in_argument640);
             id=identifier();
             _fsp--;
             if (failed) return name;
             if ( backtracking==0 ) {
                name =input.toString(id.start,id.stop); 
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:38: ( '[' ']' )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:38: ( '[' ']' )*
             loop12:
             do {
                 int alt12=2;
@@ -1222,10 +1223,10 @@
 
                 switch (alt12) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:40: '[' ']'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:387:40: '[' ']'
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument644); if (failed) return name;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument646); if (failed) return name;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_argument646); if (failed) return name;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_argument648); if (failed) return name;
             	    if ( backtracking==0 ) {
             	       name += "[]";
             	    }
@@ -1254,14 +1255,14 @@
 
 
     // $ANTLR start query
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:391: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:392: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;
 
         Token paramName=null;
         Token QUERY8=null;
         Token END9=null;
-        String queryName = null;
+        name_return queryName = null;
 
         qualified_id_return paramType = null;
 
@@ -1274,18 +1275,18 @@
          
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:399: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:400: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:400: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:401: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
             {
             QUERY8=(Token)input.LT(1);
-            match(input,QUERY,FOLLOW_QUERY_in_query676); if (failed) return query;
-            pushFollow(FOLLOW_name_in_query680);
+            match(input,QUERY,FOLLOW_QUERY_in_query678); if (failed) return query;
+            pushFollow(FOLLOW_name_in_query682);
             queryName=name();
             _fsp--;
             if (failed) return query;
             if ( backtracking==0 ) {
                
-              			query = factory.createQuery( queryName ); 
+              			query = factory.createQuery( queryName.name ); 
               			query.setLocation( offset(QUERY8.getLine()), QUERY8.getCharPositionInLine() );
               			query.setStartCharacter( ((CommonToken)QUERY8).getStartIndex() );
               			lhs = new AndDescr(); query.setLhs( lhs ); 
@@ -1293,15 +1294,15 @@
                                       location.setType( Location.LOCATION_RULE_HEADER );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?
             int alt17=2;
             alt17 = dfa17.predict(input);
             switch (alt17) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:409:5: LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:5: LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_query690); if (failed) return query;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:11: ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )?
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_query692); if (failed) return query;
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:411:11: ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )?
                     int alt16=2;
                     int LA16_0 = input.LA(1);
 
@@ -1310,15 +1311,15 @@
                     }
                     switch (alt16) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:13: ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )*
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:411: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:15: ( (paramType= qualified_id )? paramName= ID )
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:16: (paramType= qualified_id )? paramName= ID
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:15: ( (paramType= qualified_id )? paramName= ID )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:16: (paramType= qualified_id )? paramName= ID
                             {
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:25: (paramType= qualified_id )?
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:25: (paramType= qualified_id )?
                             int alt13=2;
                             int LA13_0 = input.LA(1);
 
@@ -1331,9 +1332,9 @@
                             }
                             switch (alt13) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:25: paramType= qualified_id
+                                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:25: paramType= qualified_id
                                     {
-                                    pushFollow(FOLLOW_qualified_id_in_query725);
+                                    pushFollow(FOLLOW_qualified_id_in_query727);
                                     paramType=qualified_id();
                                     _fsp--;
                                     if (failed) return query;
@@ -1344,14 +1345,14 @@
                             }
 
                             paramName=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_query730); if (failed) return query;
+                            match(input,ID,FOLLOW_ID_in_query732); 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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:15: ( COMMA (paramType= qualified_id )? paramName= ID )*
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:15: ( COMMA (paramType= qualified_id )? paramName= ID )*
                             loop15:
                             do {
                                 int alt15=2;
@@ -1364,10 +1365,10 @@
 
                                 switch (alt15) {
                             	case 1 :
-                            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:16: COMMA (paramType= qualified_id )? paramName= ID
+                            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:16: COMMA (paramType= qualified_id )? paramName= ID
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_query751); if (failed) return query;
-                            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:31: (paramType= qualified_id )?
+                            	    match(input,COMMA,FOLLOW_COMMA_in_query753); if (failed) return query;
+                            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:31: (paramType= qualified_id )?
                             	    int alt14=2;
                             	    int LA14_0 = input.LA(1);
 
@@ -1380,9 +1381,9 @@
                             	    }
                             	    switch (alt14) {
                             	        case 1 :
-                            	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:413:31: paramType= qualified_id
+                            	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:414:31: paramType= qualified_id
                             	            {
-                            	            pushFollow(FOLLOW_qualified_id_in_query755);
+                            	            pushFollow(FOLLOW_qualified_id_in_query757);
                             	            paramType=qualified_id();
                             	            _fsp--;
                             	            if (failed) return query;
@@ -1393,7 +1394,7 @@
                             	    }
 
                             	    paramName=(Token)input.LT(1);
-                            	    match(input,ID,FOLLOW_ID_in_query760); if (failed) return query;
+                            	    match(input,ID,FOLLOW_ID_in_query762); if (failed) return query;
                             	    if ( backtracking==0 ) {
                             	       params.add( paramName.getText() );  String type = (paramType != null) ? paramType.text : "Object"; types.add( type );  
                             	    }
@@ -1417,7 +1418,7 @@
 
                     }
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_query810); if (failed) return query;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_query812); if (failed) return query;
 
                     }
                     break;
@@ -1429,13 +1430,13 @@
                                       location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
               	        
             }
-            pushFollow(FOLLOW_normal_lhs_block_in_query839);
+            pushFollow(FOLLOW_normal_lhs_block_in_query841);
             normal_lhs_block(lhs);
             _fsp--;
             if (failed) return query;
             END9=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_query844); if (failed) return query;
-            pushFollow(FOLLOW_opt_semicolon_in_query846);
+            match(input,END,FOLLOW_END_in_query846); if (failed) return query;
+            pushFollow(FOLLOW_opt_semicolon_in_query848);
             opt_semicolon();
             _fsp--;
             if (failed) return query;
@@ -1460,13 +1461,13 @@
 
 
     // $ANTLR start template
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:431:1: template returns [FactTemplateDescr template] : TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:432: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;
 
         Token TEMPLATE10=null;
         Token END11=null;
-        String templateName = null;
+        name_return templateName = null;
 
         FieldTemplateDescr slot = null;
 
@@ -1475,27 +1476,27 @@
         		template = null;		
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:435:2: ( TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:436:3: TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:436:2: ( TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:437:3: TEMPLATE templateName= name opt_semicolon (slot= template_slot )+ END opt_semicolon
             {
             TEMPLATE10=(Token)input.LT(1);
-            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template874); if (failed) return template;
-            pushFollow(FOLLOW_name_in_template878);
+            match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template876); if (failed) return template;
+            pushFollow(FOLLOW_name_in_template880);
             templateName=name();
             _fsp--;
             if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template880);
+            pushFollow(FOLLOW_opt_semicolon_in_template882);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
             if ( backtracking==0 ) {
 
-              			template = new FactTemplateDescr(templateName);
+              			template = new FactTemplateDescr(templateName.name);
               			template.setLocation( offset(TEMPLATE10.getLine()), TEMPLATE10.getCharPositionInLine() );			
               			template.setStartCharacter( ((CommonToken)TEMPLATE10).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:442:3: (slot= template_slot )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:3: (slot= template_slot )+
             int cnt18=0;
             loop18:
             do {
@@ -1509,9 +1510,9 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:443:4: slot= template_slot
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:444:4: slot= template_slot
             	    {
-            	    pushFollow(FOLLOW_template_slot_in_template895);
+            	    pushFollow(FOLLOW_template_slot_in_template897);
             	    slot=template_slot();
             	    _fsp--;
             	    if (failed) return template;
@@ -1535,8 +1536,8 @@
             } while (true);
 
             END11=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_template910); if (failed) return template;
-            pushFollow(FOLLOW_opt_semicolon_in_template912);
+            match(input,END,FOLLOW_END_in_template912); if (failed) return template;
+            pushFollow(FOLLOW_opt_semicolon_in_template914);
             opt_semicolon();
             _fsp--;
             if (failed) return template;
@@ -1561,7 +1562,7 @@
 
 
     // $ANTLR start template_slot
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:454:1: template_slot returns [FieldTemplateDescr field] : fieldType= qualified_id id= identifier opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:455:1: template_slot returns [FieldTemplateDescr field] : fieldType= qualified_id id= identifier opt_semicolon ;
     public final FieldTemplateDescr template_slot() throws RecognitionException {
         FieldTemplateDescr field = null;
 
@@ -1574,15 +1575,15 @@
         		field = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:458:2: (fieldType= qualified_id id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:459:11: fieldType= qualified_id id= identifier opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:459:2: (fieldType= qualified_id id= identifier opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:460:11: fieldType= qualified_id id= identifier opt_semicolon
             {
             if ( backtracking==0 ) {
 
               			field = factory.createFieldTemplate();
               	         
             }
-            pushFollow(FOLLOW_qualified_id_in_template_slot958);
+            pushFollow(FOLLOW_qualified_id_in_template_slot960);
             fieldType=qualified_id();
             _fsp--;
             if (failed) return field;
@@ -1593,11 +1594,11 @@
               			field.setEndCharacter( ((CommonToken)((Token)fieldType.stop)).getStopIndex() );
               		 
             }
-            pushFollow(FOLLOW_identifier_in_template_slot974);
+            pushFollow(FOLLOW_identifier_in_template_slot976);
             id=identifier();
             _fsp--;
             if (failed) return field;
-            pushFollow(FOLLOW_opt_semicolon_in_template_slot976);
+            pushFollow(FOLLOW_opt_semicolon_in_template_slot978);
             opt_semicolon();
             _fsp--;
             if (failed) return field;
@@ -1624,13 +1625,13 @@
 
 
     // $ANTLR start rule
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:477:1: rule returns [RuleDescr rule] : RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:478:1: rule returns [RuleDescr rule] : RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] ;
     public final RuleDescr rule() throws RecognitionException {
         RuleDescr rule = null;
 
         Token RULE12=null;
         Token WHEN13=null;
-        String ruleName = null;
+        name_return ruleName = null;
 
 
 
@@ -1638,25 +1639,27 @@
         		AndDescr lhs = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:482:2: ( RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:483:3: RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule]
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:483:2: ( RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:484:3: RULE ruleName= name ( rule_attributes[$rule] )? ( WHEN ( ':' )? normal_lhs_block[lhs] )? rhs_chunk[$rule]
             {
             RULE12=(Token)input.LT(1);
-            match(input,RULE,FOLLOW_RULE_in_rule1007); if (failed) return rule;
-            pushFollow(FOLLOW_name_in_rule1011);
+            match(input,RULE,FOLLOW_RULE_in_rule1009); if (failed) return rule;
+            pushFollow(FOLLOW_name_in_rule1013);
             ruleName=name();
             _fsp--;
             if (failed) return rule;
             if ( backtracking==0 ) {
                
               			location.setType( Location.LOCATION_RULE_HEADER );
-              			debug( "start rule: " + ruleName );
-              			rule = new RuleDescr( ruleName, null ); 
+              			debug( "start rule: " + ruleName.name );
+              			rule = new RuleDescr( ruleName.name, null ); 
               			rule.setLocation( offset(RULE12.getLine()), RULE12.getCharPositionInLine() );
               			rule.setStartCharacter( ((CommonToken)RULE12).getStartIndex() );
+              			lhs = new AndDescr(); 
+              			rule.setLhs( lhs ); 
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:3: ( rule_attributes[$rule] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:494:3: ( rule_attributes[$rule] )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -1665,9 +1668,9 @@
             }
             switch (alt19) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:491:3: rule_attributes[$rule]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:494:3: rule_attributes[$rule]
                     {
-                    pushFollow(FOLLOW_rule_attributes_in_rule1020);
+                    pushFollow(FOLLOW_rule_attributes_in_rule1022);
                     rule_attributes(rule);
                     _fsp--;
                     if (failed) return rule;
@@ -1677,7 +1680,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:492:3: ( WHEN ( ':' )? normal_lhs_block[lhs] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:495:3: ( WHEN ( ':' )? normal_lhs_block[lhs] )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -1686,22 +1689,22 @@
             }
             switch (alt21) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:493:4: WHEN ( ':' )? normal_lhs_block[lhs]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:496:4: WHEN ( ':' )? normal_lhs_block[lhs]
                     {
                     WHEN13=(Token)input.LT(1);
-                    match(input,WHEN,FOLLOW_WHEN_in_rule1032); if (failed) return rule;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:493:9: ( ':' )?
+                    match(input,WHEN,FOLLOW_WHEN_in_rule1034); if (failed) return rule;
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:496:9: ( ':' )?
                     int alt20=2;
                     int LA20_0 = input.LA(1);
 
-                    if ( (LA20_0==76) ) {
+                    if ( (LA20_0==77) ) {
                         alt20=1;
                     }
                     switch (alt20) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:493:9: ':'
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:496:9: ':'
                             {
-                            match(input,76,FOLLOW_76_in_rule1034); if (failed) return rule;
+                            match(input,77,FOLLOW_77_in_rule1036); if (failed) return rule;
 
                             }
                             break;
@@ -1711,12 +1714,11 @@
                     if ( backtracking==0 ) {
                        
                       				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-                      				lhs = new AndDescr(); rule.setLhs( lhs ); 
                       				lhs.setLocation( offset(WHEN13.getLine()), WHEN13.getCharPositionInLine() );
                       				lhs.setStartCharacter( ((CommonToken)WHEN13).getStartIndex() );
                       			
                     }
-                    pushFollow(FOLLOW_normal_lhs_block_in_rule1045);
+                    pushFollow(FOLLOW_normal_lhs_block_in_rule1047);
                     normal_lhs_block(lhs);
                     _fsp--;
                     if (failed) return rule;
@@ -1726,7 +1728,7 @@
 
             }
 
-            pushFollow(FOLLOW_rhs_chunk_in_rule1055);
+            pushFollow(FOLLOW_rhs_chunk_in_rule1057);
             rhs_chunk(rule);
             _fsp--;
             if (failed) return rule;
@@ -1746,16 +1748,16 @@
 
 
     // $ANTLR start rule_attributes
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:507:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:1: rule_attributes[RuleDescr rule] : ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* ;
     public final void rule_attributes(RuleDescr rule) throws RecognitionException {
         AttributeDescr attr = null;
 
 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:508:2: ( ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:2: ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:510:2: ( ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:2: ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )*
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:2: ( ATTRIBUTES ':' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:2: ( ATTRIBUTES ':' )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -1764,24 +1766,24 @@
             }
             switch (alt22) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:509:4: ATTRIBUTES ':'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:4: ATTRIBUTES ':'
                     {
-                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1075); if (failed) return ;
-                    match(input,76,FOLLOW_76_in_rule_attributes1077); if (failed) return ;
+                    match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1077); if (failed) return ;
+                    match(input,77,FOLLOW_77_in_rule_attributes1079); if (failed) return ;
 
                     }
                     break;
 
             }
 
-            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1085);
+            pushFollow(FOLLOW_rule_attribute_in_rule_attributes1087);
             attr=rule_attribute();
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
                rule.addAttribute( attr ); 
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:2: ( ( ',' )? attr= rule_attribute )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:2: ( ( ',' )? attr= rule_attribute )*
             loop24:
             do {
                 int alt24=2;
@@ -1794,9 +1796,9 @@
 
                 switch (alt24) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:4: ( ',' )? attr= rule_attribute
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:4: ( ',' )? attr= rule_attribute
             	    {
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:4: ( ',' )?
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:4: ( ',' )?
             	    int alt23=2;
             	    int LA23_0 = input.LA(1);
 
@@ -1805,16 +1807,16 @@
             	    }
             	    switch (alt23) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:511:4: ','
+            	            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:513:4: ','
             	            {
-            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1092); if (failed) return ;
+            	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1094); if (failed) return ;
 
             	            }
             	            break;
 
             	    }
 
-            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1097);
+            	    pushFollow(FOLLOW_rule_attribute_in_rule_attributes1099);
             	    attr=rule_attribute();
             	    _fsp--;
             	    if (failed) return ;
@@ -1846,7 +1848,7 @@
 
 
     // $ANTLR start rule_attribute
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:516: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:518: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;
 
@@ -1857,7 +1859,7 @@
         		attr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523: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 )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525: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 alt25=12;
             switch ( input.LA(1) ) {
             case SALIENCE:
@@ -1923,16 +1925,16 @@
             default:
                 if (backtracking>0) {failed=true; return attr;}
                 NoViableAltException nvae =
-                    new NoViableAltException("516: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 );", 25, 0, input);
+                    new NoViableAltException("518: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 );", 25, 0, input);
 
                 throw nvae;
             }
 
             switch (alt25) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:523:4: a= salience
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525:4: a= salience
                     {
-                    pushFollow(FOLLOW_salience_in_rule_attribute1134);
+                    pushFollow(FOLLOW_salience_in_rule_attribute1136);
                     a=salience();
                     _fsp--;
                     if (failed) return attr;
@@ -1940,9 +1942,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:524:4: a= no_loop
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:526:4: a= no_loop
                     {
-                    pushFollow(FOLLOW_no_loop_in_rule_attribute1142);
+                    pushFollow(FOLLOW_no_loop_in_rule_attribute1144);
                     a=no_loop();
                     _fsp--;
                     if (failed) return attr;
@@ -1950,9 +1952,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:525:4: a= agenda_group
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:527:4: a= agenda_group
                     {
-                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1151);
+                    pushFollow(FOLLOW_agenda_group_in_rule_attribute1153);
                     a=agenda_group();
                     _fsp--;
                     if (failed) return attr;
@@ -1960,9 +1962,9 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:526:4: a= duration
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:4: a= duration
                     {
-                    pushFollow(FOLLOW_duration_in_rule_attribute1160);
+                    pushFollow(FOLLOW_duration_in_rule_attribute1162);
                     a=duration();
                     _fsp--;
                     if (failed) return attr;
@@ -1970,9 +1972,9 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:527:4: a= activation_group
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:529:4: a= activation_group
                     {
-                    pushFollow(FOLLOW_activation_group_in_rule_attribute1169);
+                    pushFollow(FOLLOW_activation_group_in_rule_attribute1171);
                     a=activation_group();
                     _fsp--;
                     if (failed) return attr;
@@ -1980,9 +1982,9 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:528:4: a= auto_focus
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:530:4: a= auto_focus
                     {
-                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1177);
+                    pushFollow(FOLLOW_auto_focus_in_rule_attribute1179);
                     a=auto_focus();
                     _fsp--;
                     if (failed) return attr;
@@ -1990,9 +1992,9 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:529:4: a= date_effective
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:531:4: a= date_effective
                     {
-                    pushFollow(FOLLOW_date_effective_in_rule_attribute1185);
+                    pushFollow(FOLLOW_date_effective_in_rule_attribute1187);
                     a=date_effective();
                     _fsp--;
                     if (failed) return attr;
@@ -2000,9 +2002,9 @@
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:530:4: a= date_expires
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:4: a= date_expires
                     {
-                    pushFollow(FOLLOW_date_expires_in_rule_attribute1193);
+                    pushFollow(FOLLOW_date_expires_in_rule_attribute1195);
                     a=date_expires();
                     _fsp--;
                     if (failed) return attr;
@@ -2010,9 +2012,9 @@
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:531:4: a= enabled
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:533:4: a= enabled
                     {
-                    pushFollow(FOLLOW_enabled_in_rule_attribute1201);
+                    pushFollow(FOLLOW_enabled_in_rule_attribute1203);
                     a=enabled();
                     _fsp--;
                     if (failed) return attr;
@@ -2020,9 +2022,9 @@
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:532:4: a= ruleflow_group
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:534:4: a= ruleflow_group
                     {
-                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1209);
+                    pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1211);
                     a=ruleflow_group();
                     _fsp--;
                     if (failed) return attr;
@@ -2030,9 +2032,9 @@
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:533:4: a= lock_on_active
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:535:4: a= lock_on_active
                     {
-                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1217);
+                    pushFollow(FOLLOW_lock_on_active_in_rule_attribute1219);
                     a=lock_on_active();
                     _fsp--;
                     if (failed) return attr;
@@ -2040,9 +2042,9 @@
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:534:4: a= dialect
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:536:4: a= dialect
                     {
-                    pushFollow(FOLLOW_dialect_in_rule_attribute1224);
+                    pushFollow(FOLLOW_dialect_in_rule_attribute1226);
                     a=dialect();
                     _fsp--;
                     if (failed) return attr;
@@ -2069,7 +2071,7 @@
 
 
     // $ANTLR start date_effective
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:537:1: date_effective returns [AttributeDescr descr] : DATE_EFFECTIVE STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:539:1: date_effective returns [AttributeDescr descr] : DATE_EFFECTIVE STRING ;
     public final AttributeDescr date_effective() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2080,13 +2082,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:541:2: ( DATE_EFFECTIVE STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:542:3: DATE_EFFECTIVE STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:543:2: ( DATE_EFFECTIVE STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:544:3: DATE_EFFECTIVE STRING
             {
             DATE_EFFECTIVE15=(Token)input.LT(1);
-            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1250); if (failed) return descr;
+            match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1252); if (failed) return descr;
             STRING14=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_effective1252); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_date_effective1254); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "date-effective", getString( STRING14.getText() ) );
@@ -2111,7 +2113,7 @@
 
 
     // $ANTLR start date_expires
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:552:1: date_expires returns [AttributeDescr descr] : DATE_EXPIRES STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:554:1: date_expires returns [AttributeDescr descr] : DATE_EXPIRES STRING ;
     public final AttributeDescr date_expires() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2122,13 +2124,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:2: ( DATE_EXPIRES STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:4: DATE_EXPIRES STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:2: ( DATE_EXPIRES STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:558:4: DATE_EXPIRES STRING
             {
             DATE_EXPIRES17=(Token)input.LT(1);
-            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1281); if (failed) return descr;
+            match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1283); if (failed) return descr;
             STRING16=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_date_expires1283); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_date_expires1285); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "date-expires", getString( STRING16.getText() ) );
@@ -2153,7 +2155,7 @@
 
 
     // $ANTLR start enabled
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:565:1: enabled returns [AttributeDescr descr] : ENABLED BOOL ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:567:1: enabled returns [AttributeDescr descr] : ENABLED BOOL ;
     public final AttributeDescr enabled() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2164,13 +2166,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:569:2: ( ENABLED BOOL )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:569:5: ENABLED BOOL
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:571:2: ( ENABLED BOOL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:571:5: ENABLED BOOL
             {
             ENABLED19=(Token)input.LT(1);
-            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1312); if (failed) return descr;
+            match(input,ENABLED,FOLLOW_ENABLED_in_enabled1314); if (failed) return descr;
             BOOL18=(Token)input.LT(1);
-            match(input,BOOL,FOLLOW_BOOL_in_enabled1314); if (failed) return descr;
+            match(input,BOOL,FOLLOW_BOOL_in_enabled1316); if (failed) return descr;
             if ( backtracking==0 ) {
 
               				descr = new AttributeDescr( "enabled", BOOL18.getText() );
@@ -2195,7 +2197,7 @@
 
 
     // $ANTLR start salience
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:578:1: salience returns [AttributeDescr descr] : SALIENCE ( INT | txt= paren_chunk ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:580:1: salience returns [AttributeDescr descr] : SALIENCE ( INT | txt= paren_chunk ) ;
     public final AttributeDescr salience() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2208,11 +2210,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582:2: ( SALIENCE ( INT | txt= paren_chunk ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:583:3: SALIENCE ( INT | txt= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:584:2: ( SALIENCE ( INT | txt= paren_chunk ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:585:3: SALIENCE ( INT | txt= paren_chunk )
             {
             SALIENCE20=(Token)input.LT(1);
-            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1347); if (failed) return descr;
+            match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1349); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "salience" );
@@ -2220,7 +2222,7 @@
               			descr.setStartCharacter( ((CommonToken)SALIENCE20).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:3: ( INT | txt= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:591:3: ( INT | txt= paren_chunk )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -2233,16 +2235,16 @@
             else {
                 if (backtracking>0) {failed=true; return descr;}
                 NoViableAltException nvae =
-                    new NoViableAltException("589:3: ( INT | txt= paren_chunk )", 26, 0, input);
+                    new NoViableAltException("591:3: ( INT | txt= paren_chunk )", 26, 0, input);
 
                 throw nvae;
             }
             switch (alt26) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:589:5: INT
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:591:5: INT
                     {
                     INT21=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_salience1358); if (failed) return descr;
+                    match(input,INT,FOLLOW_INT_in_salience1360); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       			descr.setValue( INT21.getText() );
@@ -2253,9 +2255,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:594:5: txt= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:596:5: txt= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_salience1373);
+                    pushFollow(FOLLOW_paren_chunk_in_salience1375);
                     txt=paren_chunk();
                     _fsp--;
                     if (failed) return descr;
@@ -2287,7 +2289,7 @@
 
 
     // $ANTLR start no_loop
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:602:1: no_loop returns [AttributeDescr descr] : NO_LOOP ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:604:1: no_loop returns [AttributeDescr descr] : NO_LOOP ( BOOL )? ;
     public final AttributeDescr no_loop() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2298,11 +2300,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:2: ( NO_LOOP ( BOOL )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:4: NO_LOOP ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:608:2: ( NO_LOOP ( BOOL )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:608:4: NO_LOOP ( BOOL )?
             {
             NO_LOOP22=(Token)input.LT(1);
-            match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1403); if (failed) return descr;
+            match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1405); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "no-loop", "true" );
@@ -2311,7 +2313,7 @@
               			descr.setEndCharacter( ((CommonToken)NO_LOOP22).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:613:3: ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:3: ( BOOL )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -2320,10 +2322,10 @@
             }
             switch (alt27) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:613:5: BOOL
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:615:5: BOOL
                     {
                     BOOL23=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1416); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1418); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL23.getText() );
@@ -2352,7 +2354,7 @@
 
 
     // $ANTLR start auto_focus
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:621:1: auto_focus returns [AttributeDescr descr] : AUTO_FOCUS ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:623:1: auto_focus returns [AttributeDescr descr] : AUTO_FOCUS ( BOOL )? ;
     public final AttributeDescr auto_focus() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2363,11 +2365,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625:2: ( AUTO_FOCUS ( BOOL )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625:4: AUTO_FOCUS ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:627:2: ( AUTO_FOCUS ( BOOL )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:627:4: AUTO_FOCUS ( BOOL )?
             {
             AUTO_FOCUS24=(Token)input.LT(1);
-            match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1451); if (failed) return descr;
+            match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1453); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "auto-focus", "true" );
@@ -2376,7 +2378,7 @@
               			descr.setEndCharacter( ((CommonToken)AUTO_FOCUS24).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:632:3: ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:634:3: ( BOOL )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -2385,10 +2387,10 @@
             }
             switch (alt28) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:632:5: BOOL
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:634:5: BOOL
                     {
                     BOOL25=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1464); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1466); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL25.getText() );
@@ -2417,7 +2419,7 @@
 
 
     // $ANTLR start activation_group
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:640:1: activation_group returns [AttributeDescr descr] : ACTIVATION_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:642:1: activation_group returns [AttributeDescr descr] : ACTIVATION_GROUP STRING ;
     public final AttributeDescr activation_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2428,13 +2430,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:644:2: ( ACTIVATION_GROUP STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:644:4: ACTIVATION_GROUP STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:646:2: ( ACTIVATION_GROUP STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:646:4: ACTIVATION_GROUP STRING
             {
             ACTIVATION_GROUP27=(Token)input.LT(1);
-            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1500); if (failed) return descr;
+            match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1502); if (failed) return descr;
             STRING26=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1502); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_activation_group1504); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "activation-group", getString( STRING26.getText() ) );
@@ -2459,7 +2461,7 @@
 
 
     // $ANTLR start ruleflow_group
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:653:1: ruleflow_group returns [AttributeDescr descr] : RULEFLOW_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:655:1: ruleflow_group returns [AttributeDescr descr] : RULEFLOW_GROUP STRING ;
     public final AttributeDescr ruleflow_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2470,13 +2472,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:2: ( RULEFLOW_GROUP STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:4: RULEFLOW_GROUP STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:659:2: ( RULEFLOW_GROUP STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:659:4: RULEFLOW_GROUP STRING
             {
             RULEFLOW_GROUP29=(Token)input.LT(1);
-            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1530); if (failed) return descr;
+            match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1532); if (failed) return descr;
             STRING28=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1532); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_ruleflow_group1534); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "ruleflow-group", getString( STRING28.getText() ) );
@@ -2501,7 +2503,7 @@
 
 
     // $ANTLR start agenda_group
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:666:1: agenda_group returns [AttributeDescr descr] : AGENDA_GROUP STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:668:1: agenda_group returns [AttributeDescr descr] : AGENDA_GROUP STRING ;
     public final AttributeDescr agenda_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2512,13 +2514,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:2: ( AGENDA_GROUP STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:4: AGENDA_GROUP STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:2: ( AGENDA_GROUP STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:672:4: AGENDA_GROUP STRING
             {
             AGENDA_GROUP31=(Token)input.LT(1);
-            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1560); if (failed) return descr;
+            match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1562); if (failed) return descr;
             STRING30=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1562); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1564); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "agenda-group", getString( STRING30.getText() ) );
@@ -2543,7 +2545,7 @@
 
 
     // $ANTLR start duration
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:679:1: duration returns [AttributeDescr descr] : DURATION INT ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:681:1: duration returns [AttributeDescr descr] : DURATION INT ;
     public final AttributeDescr duration() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2554,13 +2556,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:2: ( DURATION INT )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:4: DURATION INT
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:685:2: ( DURATION INT )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:685:4: DURATION INT
             {
             DURATION33=(Token)input.LT(1);
-            match(input,DURATION,FOLLOW_DURATION_in_duration1590); if (failed) return descr;
+            match(input,DURATION,FOLLOW_DURATION_in_duration1592); if (failed) return descr;
             INT32=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1592); if (failed) return descr;
+            match(input,INT,FOLLOW_INT_in_duration1594); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "duration", INT32.getText() );
@@ -2585,7 +2587,7 @@
 
 
     // $ANTLR start dialect
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:692:1: dialect returns [AttributeDescr descr] : DIALECT STRING ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:694:1: dialect returns [AttributeDescr descr] : DIALECT STRING ;
     public final AttributeDescr dialect() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2596,13 +2598,13 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:696:2: ( DIALECT STRING )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:696:4: DIALECT STRING
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:2: ( DIALECT STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:698:4: DIALECT STRING
             {
             DIALECT35=(Token)input.LT(1);
-            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1620); if (failed) return descr;
+            match(input,DIALECT,FOLLOW_DIALECT_in_dialect1622); if (failed) return descr;
             STRING34=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_dialect1622); if (failed) return descr;
+            match(input,STRING,FOLLOW_STRING_in_dialect1624); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "dialect", getString( STRING34.getText() ) );
@@ -2627,7 +2629,7 @@
 
 
     // $ANTLR start lock_on_active
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:705:1: lock_on_active returns [AttributeDescr descr] : LOCK_ON_ACTIVE ( BOOL )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:707:1: lock_on_active returns [AttributeDescr descr] : LOCK_ON_ACTIVE ( BOOL )? ;
     public final AttributeDescr lock_on_active() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2638,11 +2640,11 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:2: ( LOCK_ON_ACTIVE ( BOOL )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:4: LOCK_ON_ACTIVE ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:711:2: ( LOCK_ON_ACTIVE ( BOOL )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:711:4: LOCK_ON_ACTIVE ( BOOL )?
             {
             LOCK_ON_ACTIVE36=(Token)input.LT(1);
-            match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1654); if (failed) return descr;
+            match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1656); if (failed) return descr;
             if ( backtracking==0 ) {
 
               			descr = new AttributeDescr( "lock-on-active", "true" );
@@ -2651,7 +2653,7 @@
               			descr.setEndCharacter( ((CommonToken)LOCK_ON_ACTIVE36).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:716:3: ( BOOL )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718:3: ( BOOL )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -2660,10 +2662,10 @@
             }
             switch (alt29) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:716:5: BOOL
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:718:5: BOOL
                     {
                     BOOL37=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1667); if (failed) return descr;
+                    match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1669); if (failed) return descr;
                     if ( backtracking==0 ) {
 
                       				descr.setValue( BOOL37.getText() );
@@ -2692,7 +2694,7 @@
 
 
     // $ANTLR start normal_lhs_block
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:724:1: normal_lhs_block[AndDescr descr] : (d= lhs[$descr] )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:726:1: normal_lhs_block[AndDescr descr] : (d= lhs[$descr] )* ;
     public final void normal_lhs_block(AndDescr descr) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2701,10 +2703,10 @@
         		location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:728:2: ( (d= lhs[$descr] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:729:3: (d= lhs[$descr] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:730:2: ( (d= lhs[$descr] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:3: (d= lhs[$descr] )*
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:729:3: (d= lhs[$descr] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:3: (d= lhs[$descr] )*
             loop30:
             do {
                 int alt30=2;
@@ -2717,9 +2719,9 @@
 
                 switch (alt30) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:729:5: d= lhs[$descr]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:731:5: d= lhs[$descr]
             	    {
-            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1706);
+            	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1708);
             	    d=lhs(descr);
             	    _fsp--;
             	    if (failed) return ;
@@ -2751,7 +2753,7 @@
 
 
     // $ANTLR start lhs
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:735:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:737:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
     public final BaseDescr lhs(ConditionalElementDescr ce) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2762,10 +2764,10 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:2: (l= lhs_or )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:4: l= lhs_or
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:741:2: (l= lhs_or )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:741:4: l= lhs_or
             {
-            pushFollow(FOLLOW_lhs_or_in_lhs1743);
+            pushFollow(FOLLOW_lhs_or_in_lhs1745);
             l=lhs_or();
             _fsp--;
             if (failed) return d;
@@ -2788,7 +2790,7 @@
 
 
     // $ANTLR start lhs_or
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:743: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:745: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;
 
@@ -2804,23 +2806,23 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:748:2: ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:2: ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* )
             int alt33=2;
             int LA33_0 = input.LA(1);
 
             if ( (LA33_0==LEFT_PAREN) ) {
                 int LA33_1 = input.LA(2);
 
-                if ( (LA33_1==OR) ) {
+                if ( (LA33_1==ID||LA33_1==LEFT_PAREN||LA33_1==AND||(LA33_1>=EXISTS && LA33_1<=FORALL)) ) {
+                    alt33=2;
+                }
+                else if ( (LA33_1==OR) ) {
                     alt33=1;
                 }
-                else if ( (LA33_1==ID||LA33_1==LEFT_PAREN||LA33_1==AND||(LA33_1>=EXISTS && LA33_1<=FORALL)) ) {
-                    alt33=2;
-                }
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("743:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 33, 1, input);
+                        new NoViableAltException("745:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 33, 1, input);
 
                     throw nvae;
                 }
@@ -2831,16 +2833,16 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("743:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 33, 0, input);
+                    new NoViableAltException("745:1: lhs_or returns [BaseDescr d] : ( LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN | left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )* );", 33, 0, input);
 
                 throw nvae;
             }
             switch (alt33) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:748:4: LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:750:4: LEFT_PAREN OR (lhsand= lhs_and )+ RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or1768); if (failed) return d;
-                    match(input,OR,FOLLOW_OR_in_lhs_or1770); if (failed) return d;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_or1770); if (failed) return d;
+                    match(input,OR,FOLLOW_OR_in_lhs_or1772); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       			or = new OrDescr();
@@ -2848,7 +2850,7 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:3: (lhsand= lhs_and )+
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:756:3: (lhsand= lhs_and )+
                     int cnt31=0;
                     loop31:
                     do {
@@ -2862,9 +2864,9 @@
 
                         switch (alt31) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:5: lhsand= lhs_and
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:756:5: lhsand= lhs_and
                     	    {
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1783);
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1785);
                     	    lhsand=lhs_and();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -2887,21 +2889,21 @@
                         cnt31++;
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or1794); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_or1796); if (failed) return d;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:760:10: left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:762:10: left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
                     {
-                    pushFollow(FOLLOW_lhs_and_in_lhs_or1812);
+                    pushFollow(FOLLOW_lhs_and_in_lhs_or1814);
                     left=lhs_and();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:761:3: ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:763:3: ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
                     loop32:
                     do {
                         int alt32=2;
@@ -2914,7 +2916,7 @@
 
                         switch (alt32) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:761:5: ( OR | DOUBLE_PIPE ) right= lhs_and
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:763:5: ( OR | DOUBLE_PIPE ) right= lhs_and
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -2924,7 +2926,7 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or1820);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or1822);    throw mse;
                     	    }
 
                     	    if ( backtracking==0 ) {
@@ -2932,7 +2934,7 @@
                     	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                     	      			
                     	    }
-                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1836);
+                    	    pushFollow(FOLLOW_lhs_and_in_lhs_or1838);
                     	    right=lhs_and();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -2974,7 +2976,7 @@
 
 
     // $ANTLR start lhs_and
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:778: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:780: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;
 
@@ -2990,7 +2992,7 @@
         		AndDescr and = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:2: ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:785:2: ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* )
             int alt36=2;
             int LA36_0 = input.LA(1);
 
@@ -3006,7 +3008,7 @@
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("778:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 36, 1, input);
+                        new NoViableAltException("780:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 36, 1, input);
 
                     throw nvae;
                 }
@@ -3017,16 +3019,16 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("778:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 36, 0, input);
+                    new NoViableAltException("780:1: lhs_and returns [BaseDescr d] : ( LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN | left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )* );", 36, 0, input);
 
                 throw nvae;
             }
             switch (alt36) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:783:4: LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:785:4: LEFT_PAREN AND (lhsunary= lhs_unary )+ RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and1867); if (failed) return d;
-                    match(input,AND,FOLLOW_AND_in_lhs_and1869); if (failed) return d;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_and1869); if (failed) return d;
+                    match(input,AND,FOLLOW_AND_in_lhs_and1871); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       			and = new AndDescr();
@@ -3034,7 +3036,7 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:3: (lhsunary= lhs_unary )+
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:791:3: (lhsunary= lhs_unary )+
                     int cnt34=0;
                     loop34:
                     do {
@@ -3048,9 +3050,9 @@
 
                         switch (alt34) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:4: lhsunary= lhs_unary
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:791:4: lhsunary= lhs_unary
                     	    {
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1881);
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1883);
                     	    lhsunary=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3073,21 +3075,21 @@
                         cnt34++;
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and1891); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_and1893); if (failed) return d;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:795:10: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:797:10: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
                     {
-                    pushFollow(FOLLOW_lhs_unary_in_lhs_and1909);
+                    pushFollow(FOLLOW_lhs_unary_in_lhs_and1911);
                     left=lhs_unary();
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:796:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:798:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
                     loop35:
                     do {
                         int alt35=2;
@@ -3100,7 +3102,7 @@
 
                         switch (alt35) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:796:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:798:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
                     	    {
                     	    if ( (input.LA(1)>=AND && input.LA(1)<=DOUBLE_AMPER) ) {
                     	        input.consume();
@@ -3110,7 +3112,7 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and1917);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and1919);    throw mse;
                     	    }
 
                     	    if ( backtracking==0 ) {
@@ -3118,7 +3120,7 @@
                     	      				location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                     	      			
                     	    }
-                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1933);
+                    	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1935);
                     	    right=lhs_unary();
                     	    _fsp--;
                     	    if (failed) return d;
@@ -3160,7 +3162,7 @@
 
 
     // $ANTLR start lhs_unary
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:813: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:815: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;
 
@@ -3173,10 +3175,10 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817: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 )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819: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 alt37=6;
             int LA37_0 = input.LA(1);
 
@@ -3201,15 +3203,15 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("817: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 )", 37, 0, input);
+                    new NoViableAltException("819: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 )", 37, 0, input);
 
                 throw nvae;
             }
             switch (alt37) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:6: ( EXISTS )=>u= lhs_exist
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:6: ( EXISTS )=>u= lhs_exist
                     {
-                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary1978);
+                    pushFollow(FOLLOW_lhs_exist_in_lhs_unary1980);
                     u=lhs_exist();
                     _fsp--;
                     if (failed) return d;
@@ -3220,9 +3222,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:5: ( NOT )=>u= lhs_not
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:5: ( NOT )=>u= lhs_not
                     {
-                    pushFollow(FOLLOW_lhs_not_in_lhs_unary1996);
+                    pushFollow(FOLLOW_lhs_not_in_lhs_unary1998);
                     u=lhs_not();
                     _fsp--;
                     if (failed) return d;
@@ -3233,9 +3235,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:5: ( EVAL )=>u= lhs_eval
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:5: ( EVAL )=>u= lhs_eval
                     {
-                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2015);
+                    pushFollow(FOLLOW_lhs_eval_in_lhs_unary2017);
                     u=lhs_eval();
                     _fsp--;
                     if (failed) return d;
@@ -3246,9 +3248,9 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:5: ( FORALL )=>u= lhs_forall
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:5: ( FORALL )=>u= lhs_forall
                     {
-                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2034);
+                    pushFollow(FOLLOW_lhs_forall_in_lhs_unary2036);
                     u=lhs_forall();
                     _fsp--;
                     if (failed) return d;
@@ -3259,14 +3261,14 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:5: ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:823:5: ( LEFT_PAREN )=> LEFT_PAREN u= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2051); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2055);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_unary2053); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_unary2057);
                     u=lhs_or();
                     _fsp--;
                     if (failed) return d;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2057); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_unary2059); if (failed) return d;
                     if ( backtracking==0 ) {
                        d = u; 
                     }
@@ -3274,9 +3276,9 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:5: ps= pattern_source
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:824:5: ps= pattern_source
                     {
-                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2068);
+                    pushFollow(FOLLOW_pattern_source_in_lhs_unary2070);
                     ps=pattern_source();
                     _fsp--;
                     if (failed) return d;
@@ -3289,7 +3291,7 @@
 
             }
 
-            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary2080);
+            pushFollow(FOLLOW_opt_semicolon_in_lhs_unary2082);
             opt_semicolon();
             _fsp--;
             if (failed) return d;
@@ -3309,12 +3311,14 @@
 
 
     // $ANTLR start pattern_source
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:827:1: pattern_source returns [BaseDescr d] : u= lhs_pattern ( FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:829: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;
 
         BaseDescr u = null;
 
+        EntryPointDescr ep = null;
+
         AccumulateDescr ac = null;
 
         CollectDescr cs = null;
@@ -3326,35 +3330,62 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:831:2: (u= lhs_pattern ( FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:832:3: u= lhs_pattern ( FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:833: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:834: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_source2107);
+            pushFollow(FOLLOW_lhs_pattern_in_pattern_source2109);
             u=lhs_pattern();
             _fsp--;
             if (failed) return d;
             if ( backtracking==0 ) {
                d = u; 
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:833:3: ( FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
-            int alt39=2;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:835:3: ( ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement ) | FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )?
+            int alt39=3;
             int LA39_0 = input.LA(1);
 
             if ( (LA39_0==FROM) ) {
-                alt39=1;
+                int LA39_1 = input.LA(2);
+
+                if ( ((LA39_1>=PACKAGE && LA39_1<=ID)||LA39_1==GLOBAL||(LA39_1>=QUERY && LA39_1<=ATTRIBUTES)||LA39_1==ENABLED||LA39_1==SALIENCE||(LA39_1>=DURATION && LA39_1<=DIALECT)||LA39_1==FROM||(LA39_1>=ACCUMULATE && LA39_1<=COLLECT)||(LA39_1>=CONTAINS && LA39_1<=MEMBEROF)||LA39_1==IN||LA39_1==THEN) ) {
+                    alt39=2;
+                }
+                else if ( (LA39_1==ENTRY_POINT) && (synpred6())) {
+                    alt39=1;
+                }
             }
             switch (alt39) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:834:4: FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
                     {
-                    match(input,FROM,FOLLOW_FROM_in_pattern_source2119); if (failed) return d;
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838:11: ( ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838:13: ( FROM ENTRY_POINT )=> FROM ep= entrypoint_statement
+                    {
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2160); if (failed) return d;
+                    pushFollow(FOLLOW_entrypoint_statement_in_pattern_source2164);
+                    ep=entrypoint_statement();
+                    _fsp--;
+                    if (failed) return d;
                     if ( backtracking==0 ) {
+                       if( d != null ) ((PatternDescr)d).setSource((PatternSourceDescr) ep); 
+                    }
 
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:4: FROM ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
+                    {
+                    match(input,FROM,FOLLOW_FROM_in_pattern_source2184); if (failed) return d;
+                    if ( backtracking==0 ) {
+
                       				location.setType(Location.LOCATION_LHS_FROM);
                       				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
                       		        
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:839:11: ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:845:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
                     int alt38=3;
                     switch ( input.LA(1) ) {
                     case ACCUMULATE:
@@ -3402,24 +3433,24 @@
                     default:
                         if (backtracking>0) {failed=true; return d;}
                         NoViableAltException nvae =
-                            new NoViableAltException("839:11: ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )", 38, 0, input);
+                            new NoViableAltException("845:11: ( options {k=1; backtrack=true; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )", 38, 0, input);
 
                         throw nvae;
                     }
 
                     switch (alt38) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:15: (ac= accumulate_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:13: (ac= accumulate_statement )
                             {
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:15: (ac= accumulate_statement )
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:17: ac= accumulate_statement
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:13: (ac= accumulate_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:846:15: ac= accumulate_statement
                             {
-                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2175);
+                            pushFollow(FOLLOW_accumulate_statement_in_pattern_source2242);
                             ac=accumulate_statement();
                             _fsp--;
                             if (failed) return d;
                             if ( backtracking==0 ) {
-                               ((PatternDescr)d).setSource((PatternSourceDescr) ac); 
+                               if( d != null ) ((PatternDescr)d).setSource((PatternSourceDescr) ac); 
                             }
 
                             }
@@ -3428,17 +3459,17 @@
                             }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:841:15: (cs= collect_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:15: (cs= collect_statement )
                             {
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:841:15: (cs= collect_statement )
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:841:17: cs= collect_statement
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:15: (cs= collect_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:17: cs= collect_statement
                             {
-                            pushFollow(FOLLOW_collect_statement_in_pattern_source2198);
+                            pushFollow(FOLLOW_collect_statement_in_pattern_source2265);
                             cs=collect_statement();
                             _fsp--;
                             if (failed) return d;
                             if ( backtracking==0 ) {
-                               ((PatternDescr)d).setSource((PatternSourceDescr) cs); 
+                               if( d != null ) ((PatternDescr)d).setSource((PatternSourceDescr) cs); 
                             }
 
                             }
@@ -3447,17 +3478,17 @@
                             }
                             break;
                         case 3 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:15: (fm= from_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:15: (fm= from_statement )
                             {
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:15: (fm= from_statement )
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:17: fm= from_statement
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:15: (fm= from_statement )
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:849:17: fm= from_statement
                             {
-                            pushFollow(FOLLOW_from_statement_in_pattern_source2222);
+                            pushFollow(FOLLOW_from_statement_in_pattern_source2302);
                             fm=from_statement();
                             _fsp--;
                             if (failed) return d;
                             if ( backtracking==0 ) {
-                               ((PatternDescr)d).setSource((PatternSourceDescr) fm); 
+                               if( d != null ) ((PatternDescr)d).setSource((PatternSourceDescr) fm); 
                             }
 
                             }
@@ -3490,7 +3521,7 @@
 
 
     // $ANTLR start lhs_exist
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:847:1: lhs_exist returns [BaseDescr d] : EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:854: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;
 
@@ -3505,11 +3536,11 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:851:2: ( EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:851:4: EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:2: ( EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:4: EXISTS ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             {
             EXISTS38=(Token)input.LT(1);
-            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist2265); if (failed) return d;
+            match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist2345); if (failed) return d;
             if ( backtracking==0 ) {
 
               			d = new ExistsDescr( ); 
@@ -3518,7 +3549,7 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -3531,19 +3562,19 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("858:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 40, 0, input);
+                    new NoViableAltException("865:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 40, 0, input);
 
                 throw nvae;
             }
             switch (alt40) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:14: LEFT_PAREN or= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:865:14: LEFT_PAREN or= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2285); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2289);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2365); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_exist2369);
                     or=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -3551,7 +3582,7 @@
                        if ( or != null ) ((ExistsDescr)d).addDescr( or ); 
                     }
                     RIGHT_PAREN39=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2319); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_exist2399); if (failed) return d;
                     if ( backtracking==0 ) {
                        d.setEndCharacter( ((CommonToken)RIGHT_PAREN39).getStopIndex() ); 
                     }
@@ -3562,9 +3593,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:863:12: pattern= lhs_pattern
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:870:12: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2369);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2449);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
@@ -3598,7 +3629,7 @@
 
 
     // $ANTLR start lhs_not
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:873:1: lhs_not returns [NotDescr d] : NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:880: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;
 
@@ -3613,11 +3644,11 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:877:2: ( NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:877:4: NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:2: ( NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:4: NOT ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             {
             NOT40=(Token)input.LT(1);
-            match(input,NOT,FOLLOW_NOT_in_lhs_not2421); if (failed) return d;
+            match(input,NOT,FOLLOW_NOT_in_lhs_not2501); if (failed) return d;
             if ( backtracking==0 ) {
 
               			d = new NotDescr( ); 
@@ -3626,7 +3657,7 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:891:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -3639,19 +3670,19 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("884:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 41, 0, input);
+                    new NoViableAltException("891:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )", 41, 0, input);
 
                 throw nvae;
             }
             switch (alt41) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:891:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:7: LEFT_PAREN or= lhs_or RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:891:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:891:7: LEFT_PAREN or= lhs_or RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2434); if (failed) return d;
-                    pushFollow(FOLLOW_lhs_or_in_lhs_not2438);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2514); if (failed) return d;
+                    pushFollow(FOLLOW_lhs_or_in_lhs_not2518);
                     or=lhs_or();
                     _fsp--;
                     if (failed) return d;
@@ -3659,7 +3690,7 @@
                        if ( or != null ) d.addDescr( or ); 
                     }
                     RIGHT_PAREN41=(Token)input.LT(1);
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2469); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_not2549); if (failed) return d;
                     if ( backtracking==0 ) {
                        d.setEndCharacter( ((CommonToken)RIGHT_PAREN41).getStopIndex() ); 
                     }
@@ -3670,9 +3701,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:890:3: pattern= lhs_pattern
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:897:3: pattern= lhs_pattern
                     {
-                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2506);
+                    pushFollow(FOLLOW_lhs_pattern_in_lhs_not2586);
                     pattern=lhs_pattern();
                     _fsp--;
                     if (failed) return d;
@@ -3706,7 +3737,7 @@
 
 
     // $ANTLR start lhs_eval
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:900:1: lhs_eval returns [BaseDescr d] : EVAL c= paren_chunk ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:907:1: lhs_eval returns [BaseDescr d] : EVAL c= paren_chunk ;
     public final BaseDescr lhs_eval() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3718,17 +3749,17 @@
         		d = new EvalDescr( );
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:904:2: ( EVAL c= paren_chunk )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:905:3: EVAL c= paren_chunk
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:911:2: ( EVAL c= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:912:3: EVAL c= paren_chunk
             {
             EVAL42=(Token)input.LT(1);
-            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval2552); if (failed) return d;
+            match(input,EVAL,FOLLOW_EVAL_in_lhs_eval2632); if (failed) return d;
             if ( backtracking==0 ) {
 
               			location.setType( Location.LOCATION_LHS_INSIDE_EVAL );
               		
             }
-            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2563);
+            pushFollow(FOLLOW_paren_chunk_in_lhs_eval2643);
             c=paren_chunk();
             _fsp--;
             if (failed) return d;
@@ -3763,7 +3794,7 @@
 
 
     // $ANTLR start lhs_forall
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:925:1: lhs_forall returns [ForallDescr d] : FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:932: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;
 
@@ -3778,13 +3809,13 @@
         		d = factory.createForall();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:929:2: ( FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:929:4: FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:936:2: ( FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:936:4: FORALL LEFT_PAREN base= lhs_pattern (pattern= lhs_pattern )* RIGHT_PAREN
             {
             FORALL43=(Token)input.LT(1);
-            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall2589); if (failed) return d;
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2591); if (failed) return d;
-            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2595);
+            match(input,FORALL,FOLLOW_FORALL_in_lhs_forall2669); if (failed) return d;
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_forall2671); if (failed) return d;
+            pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2675);
             base=lhs_pattern();
             _fsp--;
             if (failed) return d;
@@ -3796,7 +3827,7 @@
               			d.setLocation( offset(FORALL43.getLine()), FORALL43.getCharPositionInLine() );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:936:3: (pattern= lhs_pattern )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:3: (pattern= lhs_pattern )*
             loop42:
             do {
                 int alt42=2;
@@ -3809,9 +3840,9 @@
 
                 switch (alt42) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:936:5: pattern= lhs_pattern
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:943:5: pattern= lhs_pattern
             	    {
-            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2610);
+            	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2690);
             	    pattern=lhs_pattern();
             	    _fsp--;
             	    if (failed) return d;
@@ -3831,7 +3862,7 @@
             } while (true);
 
             RIGHT_PAREN44=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2626); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_lhs_forall2706); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        d.setEndCharacter( ((CommonToken)RIGHT_PAREN44).getStopIndex() );
@@ -3853,7 +3884,7 @@
 
 
     // $ANTLR start lhs_pattern
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:948:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:955:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );
     public final BaseDescr lhs_pattern() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3864,14 +3895,14 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:955:2: (f= fact_binding | f= fact[null] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:962:2: (f= fact_binding | f= fact[null] )
             int alt43=2;
             int LA43_0 = input.LA(1);
 
             if ( (LA43_0==ID) ) {
                 int LA43_1 = input.LA(2);
 
-                if ( (LA43_1==76) ) {
+                if ( (LA43_1==77) ) {
                     alt43=1;
                 }
                 else if ( (LA43_1==DOT||LA43_1==LEFT_PAREN||LA43_1==LEFT_SQUARE) ) {
@@ -3880,7 +3911,7 @@
                 else {
                     if (backtracking>0) {failed=true; return d;}
                     NoViableAltException nvae =
-                        new NoViableAltException("948:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 43, 1, input);
+                        new NoViableAltException("955:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 43, 1, input);
 
                     throw nvae;
                 }
@@ -3888,15 +3919,15 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("948:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 43, 0, input);
+                    new NoViableAltException("955:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );", 43, 0, input);
 
                 throw nvae;
             }
             switch (alt43) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:955:4: f= fact_binding
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:962:4: f= fact_binding
                     {
-                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern2659);
+                    pushFollow(FOLLOW_fact_binding_in_lhs_pattern2739);
                     f=fact_binding();
                     _fsp--;
                     if (failed) return d;
@@ -3904,9 +3935,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:956:4: f= fact[null]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:4: f= fact[null]
                     {
-                    pushFollow(FOLLOW_fact_in_lhs_pattern2667);
+                    pushFollow(FOLLOW_fact_in_lhs_pattern2747);
                     f=fact(null);
                     _fsp--;
                     if (failed) return d;
@@ -3933,7 +3964,7 @@
 
 
     // $ANTLR start from_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:959:1: from_statement returns [FromDescr d] : ds= from_source[$d] ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:966:1: from_statement returns [FromDescr d] : ds= from_source[$d] ;
     public final FromDescr from_statement() throws RecognitionException {
         FromDescr d = null;
 
@@ -3944,10 +3975,10 @@
         		d =factory.createFrom();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:2: (ds= from_source[$d] )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:964:2: ds= from_source[$d]
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:970:2: (ds= from_source[$d] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:971:2: ds= from_source[$d]
             {
-            pushFollow(FOLLOW_from_source_in_from_statement2694);
+            pushFollow(FOLLOW_from_source_in_from_statement2774);
             ds=from_source(d);
             _fsp--;
             if (failed) return d;
@@ -3972,7 +4003,7 @@
 
 
     // $ANTLR start accumulate_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:971: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:978: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;
 
@@ -3988,11 +4019,11 @@
         		d = factory.createAccumulate();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:975: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:976: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:982: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:983: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
             {
             ACCUMULATE45=(Token)input.LT(1);
-            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2731); if (failed) return d;
+            match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2811); if (failed) return d;
             if ( backtracking==0 ) {
                
               			d.setLocation( offset(ACCUMULATE45.getLine()), ACCUMULATE45.getCharPositionInLine() );
@@ -4000,12 +4031,12 @@
               			location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2741); if (failed) return d;
-            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2745);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_accumulate_statement2821); if (failed) return d;
+            pushFollow(FOLLOW_lhs_or_in_accumulate_statement2825);
             inputCE=lhs_or();
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:982:29: ( COMMA )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:29: ( COMMA )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -4014,9 +4045,9 @@
             }
             switch (alt44) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:982:29: COMMA
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:989:29: COMMA
                     {
-                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2747); if (failed) return d;
+                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2827); if (failed) return d;
 
                     }
                     break;
@@ -4028,7 +4059,7 @@
               		        d.setInput( inputCE );
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:986: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 ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:993: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 alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -4041,28 +4072,28 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("986: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 ) )", 49, 0, input);
+                    new NoViableAltException("993: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 ) )", 49, 0, input);
 
                 throw nvae;
             }
             switch (alt49) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:986:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:993:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:986:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:987:4: INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:993:5: ( INIT text= paren_chunk ( COMMA )? ACTION text= paren_chunk ( COMMA )? ( REVERSE text= paren_chunk ( COMMA )? )? RESULT text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:994: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_statement2765); if (failed) return d;
+                    match(input,INIT,FOLLOW_INIT_in_accumulate_statement2845); if (failed) return d;
                     if ( backtracking==0 ) {
 
                       				location.setType( Location.LOCATION_LHS_FROM_ACCUMULATE_INIT );
                       			
                     }
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2778);
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2858);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:991:21: ( COMMA )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:998:21: ( COMMA )?
                     int alt45=2;
                     int LA45_0 = input.LA(1);
 
@@ -4071,9 +4102,9 @@
                     }
                     switch (alt45) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:991:21: COMMA
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:998:21: COMMA
                             {
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2780); if (failed) return d;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2860); if (failed) return d;
 
                             }
                             break;
@@ -4089,12 +4120,12 @@
                       				}
                       			
                     }
-                    match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement2791); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2795);
+                    match(input,ACTION,FOLLOW_ACTION_in_accumulate_statement2871); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2875);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:28: ( COMMA )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1006:28: ( COMMA )?
                     int alt46=2;
                     int LA46_0 = input.LA(1);
 
@@ -4103,9 +4134,9 @@
                     }
                     switch (alt46) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:999:28: COMMA
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1006:28: COMMA
                             {
-                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2797); if (failed) return d;
+                            match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2877); if (failed) return d;
 
                             }
                             break;
@@ -4121,7 +4152,7 @@
                       				}
                       			
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:4: ( REVERSE text= paren_chunk ( COMMA )? )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:4: ( REVERSE text= paren_chunk ( COMMA )? )?
                     int alt48=2;
                     int LA48_0 = input.LA(1);
 
@@ -4130,14 +4161,14 @@
                     }
                     switch (alt48) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:6: REVERSE text= paren_chunk ( COMMA )?
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:6: REVERSE text= paren_chunk ( COMMA )?
                             {
-                            match(input,REVERSE,FOLLOW_REVERSE_in_accumulate_statement2810); if (failed) return d;
-                            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2814);
+                            match(input,REVERSE,FOLLOW_REVERSE_in_accumulate_statement2890); if (failed) return d;
+                            pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2894);
                             text=paren_chunk();
                             _fsp--;
                             if (failed) return d;
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:31: ( COMMA )?
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:31: ( COMMA )?
                             int alt47=2;
                             int LA47_0 = input.LA(1);
 
@@ -4146,9 +4177,9 @@
                             }
                             switch (alt47) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1007:31: COMMA
+                                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1014:31: COMMA
                                     {
-                                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2816); if (failed) return d;
+                                    match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2896); if (failed) return d;
 
                                     }
                                     break;
@@ -4170,8 +4201,8 @@
 
                     }
 
-                    match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement2833); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2837);
+                    match(input,RESULT,FOLLOW_RESULT_in_accumulate_statement2913); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2917);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
@@ -4190,14 +4221,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1025:3: (id= ID text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1032:3: (id= ID text= paren_chunk )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1025:3: (id= ID text= paren_chunk )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1026:4: id= ID text= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1032:3: (id= ID text= paren_chunk )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1033:4: id= ID text= paren_chunk
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_accumulate_statement2863); if (failed) return d;
-                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2867);
+                    match(input,ID,FOLLOW_ID_in_accumulate_statement2943); if (failed) return d;
+                    pushFollow(FOLLOW_paren_chunk_in_accumulate_statement2947);
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
@@ -4223,7 +4254,7 @@
             }
 
             RIGHT_PAREN46=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2884); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_accumulate_statement2964); if (failed) return d;
             if ( backtracking==0 ) {
 
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
@@ -4246,7 +4277,7 @@
 
 
     // $ANTLR start from_source
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1044:4: from_source[FromDescr from] returns [DeclarativeInvokerDescr ds] : ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1053: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;
 
@@ -4261,10 +4292,10 @@
         		FunctionCallDescr fc = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1050:2: (ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1050:4: ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:2: (ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:4: ident= identifier ( options {k=1; } : args= paren_chunk )? ( expression_chain[$from, ad] )?
             {
-            pushFollow(FOLLOW_identifier_in_from_source2912);
+            pushFollow(FOLLOW_identifier_in_from_source2995);
             ident=identifier();
             _fsp--;
             if (failed) return ds;
@@ -4278,7 +4309,7 @@
               			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.start.getText());
               		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1059:3: ( options {k=1; } : args= paren_chunk )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1068:3: ( options {k=1; } : args= paren_chunk )?
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -4287,9 +4318,9 @@
             }
             switch (alt50) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1066:5: args= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1075:5: args= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_from_source2940);
+                    pushFollow(FOLLOW_paren_chunk_in_from_source3023);
                     args=paren_chunk();
                     _fsp--;
                     if (failed) return ds;
@@ -4313,7 +4344,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1080:3: ( expression_chain[$from, ad] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1089:3: ( expression_chain[$from, ad] )?
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -4322,9 +4353,9 @@
             }
             switch (alt51) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1080:3: expression_chain[$from, ad]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1089:3: expression_chain[$from, ad]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_from_source2953);
+                    pushFollow(FOLLOW_expression_chain_in_from_source3036);
                     expression_chain(from,  ad);
                     _fsp--;
                     if (failed) return ds;
@@ -4358,7 +4389,7 @@
 
 
     // $ANTLR start expression_chain
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1094: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1100: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;
 
@@ -4372,14 +4403,14 @@
         	    	MethodAccessDescr ma = null;	
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1099:2: ( ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1100:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1105:2: ( ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1106:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1100:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1100:4: DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1106:2: ( DOT field= identifier ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )? ( expression_chain[from, as] )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1106: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_chain2988); if (failed) return ;
-            pushFollow(FOLLOW_identifier_in_expression_chain2992);
+            match(input,DOT,FOLLOW_DOT_in_expression_chain3067); if (failed) return ;
+            pushFollow(FOLLOW_identifier_in_expression_chain3071);
             field=identifier();
             _fsp--;
             if (failed) return ;
@@ -4391,14 +4422,14 @@
               		fa.setEndCharacter( ((CommonToken)((Token)field.start)).getStopIndex() );
               	    
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1107:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1113:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?
             int alt52=3;
             alt52 = dfa52.predict(input);
             switch (alt52) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:6: ( LEFT_SQUARE )=>sqarg= square_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( LEFT_SQUARE )=>sqarg= square_chunk
                     {
-                    pushFollow(FOLLOW_square_chunk_in_expression_chain3023);
+                    pushFollow(FOLLOW_square_chunk_in_expression_chain3102);
                     sqarg=square_chunk();
                     _fsp--;
                     if (failed) return ;
@@ -4412,9 +4443,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( LEFT_PAREN )=>paarg= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:6: ( LEFT_PAREN )=>paarg= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3056);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_chain3135);
                     paarg=paren_chunk();
                     _fsp--;
                     if (failed) return ;
@@ -4432,7 +4463,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:4: ( expression_chain[from, as] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1128:4: ( expression_chain[from, as] )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -4441,9 +4472,9 @@
             }
             switch (alt53) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1122:4: expression_chain[from, as]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1128:4: expression_chain[from, as]
                     {
-                    pushFollow(FOLLOW_expression_chain_in_expression_chain3071);
+                    pushFollow(FOLLOW_expression_chain_in_expression_chain3150);
                     expression_chain(from,  as);
                     _fsp--;
                     if (failed) return ;
@@ -4480,7 +4511,7 @@
 
 
     // $ANTLR start collect_statement
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1136:1: collect_statement returns [CollectDescr d] : COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1142:1: collect_statement returns [CollectDescr d] : COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN ;
     public final CollectDescr collect_statement() throws RecognitionException {
         CollectDescr d = null;
 
@@ -4493,11 +4524,11 @@
         		d = factory.createCollect();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1140:2: ( COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1141:10: COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1146:2: ( COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1147:10: COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN
             {
             COLLECT47=(Token)input.LT(1);
-            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3122); if (failed) return d;
+            match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3201); if (failed) return d;
             if ( backtracking==0 ) {
                
               			d.setLocation( offset(COLLECT47.getLine()), COLLECT47.getCharPositionInLine() );
@@ -4505,13 +4536,13 @@
               			location.setType( Location.LOCATION_LHS_FROM_COLLECT );
               		
             }
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3132); if (failed) return d;
-            pushFollow(FOLLOW_pattern_source_in_collect_statement3136);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_collect_statement3211); if (failed) return d;
+            pushFollow(FOLLOW_pattern_source_in_collect_statement3215);
             pattern=pattern_source();
             _fsp--;
             if (failed) return d;
             RIGHT_PAREN48=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3138); if (failed) return d;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_collect_statement3217); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        d.setInputPattern( (PatternDescr) pattern );
@@ -4534,12 +4565,63 @@
     // $ANTLR end collect_statement
 
 
+    // $ANTLR start entrypoint_statement
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161:1: entrypoint_statement returns [EntryPointDescr d] : ENTRY_POINT id= name ;
+    public final EntryPointDescr entrypoint_statement() throws RecognitionException {
+        EntryPointDescr d = null;
+
+        Token ENTRY_POINT49=null;
+        name_return id = null;
+
+
+
+        		d = factory.createEntryPoint();
+        	
+        try {
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1165:2: ( ENTRY_POINT id= name )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1166:10: ENTRY_POINT id= name
+            {
+            ENTRY_POINT49=(Token)input.LT(1);
+            match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_entrypoint_statement3254); if (failed) return d;
+            if ( backtracking==0 ) {
+               
+              			d.setLocation( offset(ENTRY_POINT49.getLine()), ENTRY_POINT49.getCharPositionInLine() );
+              			d.setStartCharacter( ((CommonToken)ENTRY_POINT49).getStartIndex() );
+              			location.setType( Location.LOCATION_LHS_FROM_ENTRY_POINT );
+              		
+            }
+            pushFollow(FOLLOW_name_in_entrypoint_statement3266);
+            id=name();
+            _fsp--;
+            if (failed) return d;
+            if ( backtracking==0 ) {
+
+              		        d.setEntryId( id.name );
+              			d.setEndCharacter( ((CommonToken)((Token)id.stop)).getStopIndex() );
+              			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+              		
+            }
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return d;
+    }
+    // $ANTLR end entrypoint_statement
+
+
     // $ANTLR start fact_binding
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1155: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1180: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 ) ;
     public final BaseDescr fact_binding() throws RecognitionException {
         BaseDescr d = null;
 
-        Token ID49=null;
+        Token ID50=null;
         BaseDescr fe = null;
 
         BaseDescr left = null;
@@ -4552,20 +4634,20 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1160: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1161: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1185: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1186:4: ID ':' (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_binding3170); if (failed) return d;
-            match(input,76,FOLLOW_76_in_fact_binding3172); if (failed) return d;
+            ID50=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_fact_binding3298); if (failed) return d;
+            match(input,77,FOLLOW_77_in_fact_binding3300); if (failed) return d;
             if ( backtracking==0 ) {
 
                		        // handling incomplete parsing
                		        d = new PatternDescr( );
-               		        ((PatternDescr) d).setIdentifier( ID49.getText() );
+               		        ((PatternDescr) d).setIdentifier( ID50.getText() );
                		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1167:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1192:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )
             int alt55=2;
             int LA55_0 = input.LA(1);
 
@@ -4578,16 +4660,16 @@
             else {
                 if (backtracking>0) {failed=true; return d;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1167:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )", 55, 0, input);
+                    new NoViableAltException("1192:3: (fe= fact[$ID.text] | LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN )", 55, 0, input);
 
                 throw nvae;
             }
             switch (alt55) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1167:5: fe= fact[$ID.text]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1192:5: fe= fact[$ID.text]
                     {
-                    pushFollow(FOLLOW_fact_in_fact_binding3186);
-                    fe=fact(ID49.getText());
+                    pushFollow(FOLLOW_fact_in_fact_binding3314);
+                    fe=fact(ID50.getText());
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
@@ -4595,7 +4677,7 @@
                        		        // override previously instantiated pattern
                        			d =fe;
                        			if( d != null ) {
-                         			    d.setStartCharacter( ((CommonToken)ID49).getStartIndex() );
+                         			    d.setStartCharacter( ((CommonToken)ID50).getStartIndex() );
                          			}
                        		
                     }
@@ -4603,11 +4685,11 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1176:4: LEFT_PAREN left= fact[$ID.text] ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )* RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1201: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_binding3202); if (failed) return d;
-                    pushFollow(FOLLOW_fact_in_fact_binding3206);
-                    left=fact(ID49.getText());
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact_binding3330); if (failed) return d;
+                    pushFollow(FOLLOW_fact_in_fact_binding3334);
+                    left=fact(ID50.getText());
                     _fsp--;
                     if (failed) return d;
                     if ( backtracking==0 ) {
@@ -4615,11 +4697,11 @@
                        		        // override previously instantiated pattern
                        			d =left;
                        			if( d != null ) {
-                         			    d.setStartCharacter( ((CommonToken)ID49).getStartIndex() );
+                         			    d.setStartCharacter( ((CommonToken)ID50).getStartIndex() );
                          			}
                        		
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1184:4: ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1209:4: ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )*
                     loop54:
                     do {
                         int alt54=2;
@@ -4632,7 +4714,7 @@
 
                         switch (alt54) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1184:6: ( OR | DOUBLE_PIPE ) right= fact[$ID.text]
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1209:6: ( OR | DOUBLE_PIPE ) right= fact[$ID.text]
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -4642,11 +4724,11 @@
                     	        if (backtracking>0) {failed=true; return d;}
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_binding3219);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_binding3347);    throw mse;
                     	    }
 
-                    	    pushFollow(FOLLOW_fact_in_fact_binding3231);
-                    	    right=fact(ID49.getText());
+                    	    pushFollow(FOLLOW_fact_in_fact_binding3359);
+                    	    right=fact(ID50.getText());
                     	    _fsp--;
                     	    if (failed) return d;
                     	    if ( backtracking==0 ) {
@@ -4668,7 +4750,7 @@
                         }
                     } while (true);
 
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3249); if (failed) return d;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact_binding3377); if (failed) return d;
 
                     }
                     break;
@@ -4691,12 +4773,12 @@
 
 
     // $ANTLR start fact
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1199:1: fact[String ident] returns [BaseDescr d] : id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1224: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;
 
-        Token LEFT_PAREN50=null;
-        Token RIGHT_PAREN51=null;
+        Token LEFT_PAREN51=null;
+        Token RIGHT_PAREN52=null;
         qualified_id_return id = null;
 
 
@@ -4705,8 +4787,8 @@
         		PatternDescr pattern = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1204:3: (id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1205:11: id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1229:3: (id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1230:11: id= qualified_id LEFT_PAREN ( constraints[pattern] )? RIGHT_PAREN ( EOF )?
             {
             if ( backtracking==0 ) {
 
@@ -4717,7 +4799,7 @@
                			d = pattern; 
                	        
             }
-            pushFollow(FOLLOW_qualified_id_in_fact3304);
+            pushFollow(FOLLOW_qualified_id_in_fact3432);
             id=qualified_id();
             _fsp--;
             if (failed) return d;
@@ -4730,18 +4812,18 @@
                			}
                		
             }
-            LEFT_PAREN50=(Token)input.LT(1);
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3314); if (failed) return d;
+            LEFT_PAREN51=(Token)input.LT(1);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_fact3442); if (failed) return d;
             if ( backtracking==0 ) {
 
               		        location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
                           		location.setProperty( Location.LOCATION_PROPERTY_CLASS_NAME, id.text );
                				
-               			pattern.setLocation( offset(LEFT_PAREN50.getLine()), LEFT_PAREN50.getCharPositionInLine() );
-               			pattern.setLeftParentCharacter( ((CommonToken)LEFT_PAREN50).getStartIndex() );
+               			pattern.setLocation( offset(LEFT_PAREN51.getLine()), LEFT_PAREN51.getCharPositionInLine() );
+               			pattern.setLeftParentCharacter( ((CommonToken)LEFT_PAREN51).getStartIndex() );
                		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228:4: ( constraints[pattern] )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1253:4: ( constraints[pattern] )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
@@ -4750,9 +4832,9 @@
             }
             switch (alt56) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1228:4: constraints[pattern]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1253:4: constraints[pattern]
                     {
-                    pushFollow(FOLLOW_constraints_in_fact3326);
+                    pushFollow(FOLLOW_constraints_in_fact3454);
                     constraints(pattern);
                     _fsp--;
                     if (failed) return d;
@@ -4762,19 +4844,19 @@
 
             }
 
-            RIGHT_PAREN51=(Token)input.LT(1);
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3333); if (failed) return d;
+            RIGHT_PAREN52=(Token)input.LT(1);
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_fact3461); if (failed) return d;
             if ( backtracking==0 ) {
 
-              		        if( ")".equals( RIGHT_PAREN51.getText() ) ) {
+              		        if( ")".equals( RIGHT_PAREN52.getText() ) ) {
               				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-              				pattern.setEndLocation( offset(RIGHT_PAREN51.getLine()), RIGHT_PAREN51.getCharPositionInLine() );	
-              				pattern.setEndCharacter( ((CommonToken)RIGHT_PAREN51).getStopIndex() );
-              		        	pattern.setRightParentCharacter( ((CommonToken)RIGHT_PAREN51).getStartIndex() );
+              				pattern.setEndLocation( offset(RIGHT_PAREN52.getLine()), RIGHT_PAREN52.getCharPositionInLine() );	
+              				pattern.setEndCharacter( ((CommonToken)RIGHT_PAREN52).getStopIndex() );
+              		        	pattern.setRightParentCharacter( ((CommonToken)RIGHT_PAREN52).getStartIndex() );
               		        }
                		
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1238:4: ( EOF )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:4: ( EOF )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -4783,9 +4865,9 @@
             }
             switch (alt57) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1238:4: EOF
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1263:4: EOF
                     {
-                    match(input,EOF,FOLLOW_EOF_in_fact3342); if (failed) return d;
+                    match(input,EOF,FOLLOW_EOF_in_fact3470); if (failed) return d;
 
                     }
                     break;
@@ -4808,17 +4890,17 @@
 
 
     // $ANTLR start constraints
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1242:1: constraints[PatternDescr pattern] : constraint[$pattern] ( COMMA constraint[$pattern] )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1267:1: constraints[PatternDescr pattern] : constraint[$pattern] ( COMMA constraint[$pattern] )* ;
     public final void constraints(PatternDescr pattern) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1243:2: ( constraint[$pattern] ( COMMA constraint[$pattern] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1243:4: constraint[$pattern] ( COMMA constraint[$pattern] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1268:2: ( constraint[$pattern] ( COMMA constraint[$pattern] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1268:4: constraint[$pattern] ( COMMA constraint[$pattern] )*
             {
-            pushFollow(FOLLOW_constraint_in_constraints3360);
+            pushFollow(FOLLOW_constraint_in_constraints3488);
             constraint(pattern);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1244:3: ( COMMA constraint[$pattern] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1269:3: ( COMMA constraint[$pattern] )*
             loop58:
             do {
                 int alt58=2;
@@ -4831,13 +4913,13 @@
 
                 switch (alt58) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1244:5: COMMA constraint[$pattern]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1269:5: COMMA constraint[$pattern]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3367); if (failed) return ;
+            	    match(input,COMMA,FOLLOW_COMMA_in_constraints3495); if (failed) return ;
             	    if ( backtracking==0 ) {
             	       location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START ); 
             	    }
-            	    pushFollow(FOLLOW_constraint_in_constraints3376);
+            	    pushFollow(FOLLOW_constraint_in_constraints3504);
             	    constraint(pattern);
             	    _fsp--;
             	    if (failed) return ;
@@ -4866,7 +4948,7 @@
 
 
     // $ANTLR start constraint
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1249:1: constraint[PatternDescr pattern] : or_constr[top] ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1274:1: constraint[PatternDescr pattern] : or_constr[top] ;
     public final void constraint(PatternDescr pattern) throws RecognitionException {
 
         		ConditionalElementDescr top = null;
@@ -4874,15 +4956,15 @@
         		location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, input.LT(1).getText() );
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1255:2: ( or_constr[top] )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1256:3: or_constr[top]
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1280:2: ( or_constr[top] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1281:3: or_constr[top]
             {
             if ( backtracking==0 ) {
 
               			top = pattern.getConstraint();
               		
             }
-            pushFollow(FOLLOW_or_constr_in_constraint3409);
+            pushFollow(FOLLOW_or_constr_in_constraint3537);
             or_constr(top);
             _fsp--;
             if (failed) return ;
@@ -4902,20 +4984,20 @@
 
 
     // $ANTLR start or_constr
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1262:1: or_constr[ConditionalElementDescr base] : and_constr[or] ( DOUBLE_PIPE and_constr[or] )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1287: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:2: ( and_constr[or] ( DOUBLE_PIPE and_constr[or] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1267:3: and_constr[or] ( DOUBLE_PIPE and_constr[or] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1291:2: ( and_constr[or] ( DOUBLE_PIPE and_constr[or] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1292:3: and_constr[or] ( DOUBLE_PIPE and_constr[or] )*
             {
-            pushFollow(FOLLOW_and_constr_in_or_constr3432);
+            pushFollow(FOLLOW_and_constr_in_or_constr3560);
             and_constr(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1268:3: ( DOUBLE_PIPE and_constr[or] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1293:3: ( DOUBLE_PIPE and_constr[or] )*
             loop59:
             do {
                 int alt59=2;
@@ -4928,15 +5010,15 @@
 
                 switch (alt59) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1268:5: DOUBLE_PIPE and_constr[or]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1293:5: DOUBLE_PIPE and_constr[or]
             	    {
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3440); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3568); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      		
             	    }
-            	    pushFollow(FOLLOW_and_constr_in_or_constr3449);
+            	    pushFollow(FOLLOW_and_constr_in_or_constr3577);
             	    and_constr(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -4974,20 +5056,20 @@
 
 
     // $ANTLR start and_constr
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1283:1: and_constr[ConditionalElementDescr base] : unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1308: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1287:2: ( unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1288:3: unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1312:2: ( unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1313:3: unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )*
             {
-            pushFollow(FOLLOW_unary_constr_in_and_constr3481);
+            pushFollow(FOLLOW_unary_constr_in_and_constr3609);
             unary_constr(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1289:3: ( DOUBLE_AMPER unary_constr[and] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1314:3: ( DOUBLE_AMPER unary_constr[and] )*
             loop60:
             do {
                 int alt60=2;
@@ -5000,15 +5082,15 @@
 
                 switch (alt60) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1289:5: DOUBLE_AMPER unary_constr[and]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1314:5: DOUBLE_AMPER unary_constr[and]
             	    {
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3489); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3617); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_START);
             	      		
             	    }
-            	    pushFollow(FOLLOW_unary_constr_in_and_constr3498);
+            	    pushFollow(FOLLOW_unary_constr_in_and_constr3626);
             	    unary_constr(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -5046,13 +5128,13 @@
 
 
     // $ANTLR start unary_constr
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1304:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1329: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1305:2: ( ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1306:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1330:2: ( ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1331:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1306:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1331:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
             int alt61=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
@@ -5100,16 +5182,16 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1306:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )", 61, 0, input);
+                    new NoViableAltException("1331:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )", 61, 0, input);
 
                 throw nvae;
             }
 
             switch (alt61) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1306:5: field_constraint[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1331:5: field_constraint[$base]
                     {
-                    pushFollow(FOLLOW_field_constraint_in_unary_constr3526);
+                    pushFollow(FOLLOW_field_constraint_in_unary_constr3654);
                     field_constraint(base);
                     _fsp--;
                     if (failed) return ;
@@ -5117,22 +5199,22 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1307:5: LEFT_PAREN or_constr[$base] RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1332:5: LEFT_PAREN or_constr[$base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3534); if (failed) return ;
-                    pushFollow(FOLLOW_or_constr_in_unary_constr3536);
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_unary_constr3662); if (failed) return ;
+                    pushFollow(FOLLOW_or_constr_in_unary_constr3664);
                     or_constr(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3539); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_unary_constr3667); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1308:5: EVAL predicate[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1333:5: EVAL predicate[$base]
                     {
-                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr3545); if (failed) return ;
-                    pushFollow(FOLLOW_predicate_in_unary_constr3547);
+                    match(input,EVAL,FOLLOW_EVAL_in_unary_constr3673); if (failed) return ;
+                    pushFollow(FOLLOW_predicate_in_unary_constr3675);
                     predicate(base);
                     _fsp--;
                     if (failed) return ;
@@ -5158,9 +5240,9 @@
 
 
     // $ANTLR start field_constraint
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1312: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1337:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' 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;
+        Token ID53=null;
         accessor_path_return f = null;
 
 
@@ -5170,23 +5252,23 @@
         		RestrictionConnectiveDescr top = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1318:2: ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1343:2: ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) )
             int alt63=2;
             int LA63_0 = input.LA(1);
 
             if ( (LA63_0==ID) ) {
                 int LA63_1 = input.LA(2);
 
-                if ( (LA63_1==76) ) {
+                if ( (LA63_1==77) ) {
                     alt63=1;
                 }
-                else if ( (LA63_1==DOT||LA63_1==LEFT_PAREN||LA63_1==NOT||(LA63_1>=CONTAINS && LA63_1<=IN)||LA63_1==LEFT_SQUARE||(LA63_1>=78 && LA63_1<=83)) ) {
+                else if ( (LA63_1==DOT||LA63_1==LEFT_PAREN||LA63_1==NOT||(LA63_1>=CONTAINS && LA63_1<=IN)||LA63_1==LEFT_SQUARE||(LA63_1>=79 && LA63_1<=84)) ) {
                     alt63=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1312:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 63, 1, input);
+                        new NoViableAltException("1337:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 63, 1, input);
 
                     throw nvae;
                 }
@@ -5197,31 +5279,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1312:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 63, 0, input);
+                    new NoViableAltException("1337:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? ) | (f= accessor_path or_restr_connective[top] ) );", 63, 0, input);
 
                 throw nvae;
             }
             switch (alt63) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1344:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1320:3: ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1344:10: ( ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )? )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1345:3: ID ':' f= accessor_path ( or_restr_connective[top] | '->' predicate[$base] )?
                     {
-                    ID52=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_field_constraint3586); if (failed) return ;
-                    match(input,76,FOLLOW_76_in_field_constraint3588); if (failed) return ;
+                    ID53=(Token)input.LT(1);
+                    match(input,ID,FOLLOW_ID_in_field_constraint3714); if (failed) return ;
+                    match(input,77,FOLLOW_77_in_field_constraint3716); if (failed) return ;
                     if ( backtracking==0 ) {
                        
                       			fbd = new FieldBindingDescr();
-                      			fbd.setIdentifier( ID52.getText() );
-                      			fbd.setLocation( offset(ID52.getLine()), ID52.getCharPositionInLine() );
-                      			fbd.setStartCharacter( ((CommonToken)ID52).getStartIndex() );
+                      			fbd.setIdentifier( ID53.getText() );
+                      			fbd.setLocation( offset(ID53.getLine()), ID53.getCharPositionInLine() );
+                      			fbd.setStartCharacter( ((CommonToken)ID53).getStartIndex() );
                       			base.addDescr( fbd );
 
                       		    
                     }
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3607);
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3735);
                     f=accessor_path();
                     _fsp--;
                     if (failed) return ;
@@ -5236,7 +5318,7 @@
                       			if ( fbd != null ) {
                       			    fbd.setFieldName( f.text );
                       			    // may have been overwritten
-                      			    fbd.setStartCharacter( ((CommonToken)ID52).getStartIndex() );
+                      			    fbd.setStartCharacter( ((CommonToken)ID53).getStartIndex() );
                       			} 
                       			fc = new FieldConstraintDescr(f.text);
                       			fc.setLocation( offset(((Token)f.start).getLine()), ((Token)f.start).getCharPositionInLine() );
@@ -5244,34 +5326,34 @@
                       			top = fc.getRestriction();
                       			
                       			// it must be a field constraint, as it is not a binding
-                      			if( ID52 == null ) {
+                      			if( ID53 == null ) {
                       			    base.addDescr( fc );
                       			}
                       		    }
                       		
                     }
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1354:3: ( or_restr_connective[top] | '->' predicate[$base] )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1379:3: ( or_restr_connective[top] | '->' predicate[$base] )?
                     int alt62=3;
                     int LA62_0 = input.LA(1);
 
-                    if ( (LA62_0==LEFT_PAREN||LA62_0==NOT||(LA62_0>=CONTAINS && LA62_0<=IN)||(LA62_0>=78 && LA62_0<=83)) ) {
+                    if ( (LA62_0==LEFT_PAREN||LA62_0==NOT||(LA62_0>=CONTAINS && LA62_0<=IN)||(LA62_0>=79 && LA62_0<=84)) ) {
                         alt62=1;
                     }
-                    else if ( (LA62_0==77) ) {
+                    else if ( (LA62_0==78) ) {
                         alt62=2;
                     }
                     switch (alt62) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1355:4: or_restr_connective[top]
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1380:4: or_restr_connective[top]
                             {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3621);
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3749);
                             or_restr_connective(top);
                             _fsp--;
                             if (failed) return ;
                             if ( backtracking==0 ) {
 
                               				// we must add now as we didn't before
-                              				if( ID52 != null) {
+                              				if( ID53 != null) {
                               				    base.addDescr( fc );
                               				}
                               			
@@ -5280,10 +5362,10 @@
                             }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1363:4: '->' predicate[$base]
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1388:4: '->' predicate[$base]
                             {
-                            match(input,77,FOLLOW_77_in_field_constraint3636); if (failed) return ;
-                            pushFollow(FOLLOW_predicate_in_field_constraint3638);
+                            match(input,78,FOLLOW_78_in_field_constraint3764); if (failed) return ;
+                            pushFollow(FOLLOW_predicate_in_field_constraint3766);
                             predicate(base);
                             _fsp--;
                             if (failed) return ;
@@ -5300,12 +5382,12 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1367:3: (f= accessor_path or_restr_connective[top] )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1392:3: (f= accessor_path or_restr_connective[top] )
                     {
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1367:3: (f= accessor_path or_restr_connective[top] )
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1368:3: f= accessor_path or_restr_connective[top]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1392:3: (f= accessor_path or_restr_connective[top] )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1393:3: f= accessor_path or_restr_connective[top]
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3664);
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3792);
                     f=accessor_path();
                     _fsp--;
                     if (failed) return ;
@@ -5326,7 +5408,7 @@
                       		    }
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3673);
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3801);
                     or_restr_connective(top);
                     _fsp--;
                     if (failed) return ;
@@ -5360,35 +5442,35 @@
 
 
     // $ANTLR start or_restr_connective
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1400: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1425: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1407:2: ( and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1408:3: and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1432:2: ( and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:3: and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
             {
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3720);
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3848);
             and_restr_connective(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1409:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1434:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*
             loop64:
             do {
                 int alt64=2;
                 alt64 = dfa64.predict(input);
                 switch (alt64) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411:6: DOUBLE_PIPE and_restr_connective[or]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436:4: DOUBLE_PIPE and_restr_connective[or]
             	    {
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3743); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3872); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3754);
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3883);
             	    and_restr_connective(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -5424,7 +5506,7 @@
 
 
     // $ANTLR start and_restr_connective
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1426:1: and_restr_connective[ RestrictionConnectiveDescr base ] : constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1451: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;
 
@@ -5432,30 +5514,30 @@
         		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1430:2: ( constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1431:3: constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1455:2: ( constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1456:3: constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
             {
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3786);
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3915);
             constraint_expression(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1432:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1457:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*
             loop65:
             do {
                 int alt65=2;
                 alt65 = dfa65.predict(input);
                 switch (alt65) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:5: t= DOUBLE_AMPER constraint_expression[and]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1458:5: t= DOUBLE_AMPER constraint_expression[and]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3806); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3935); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3817);
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3946);
             	    constraint_expression(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -5491,13 +5573,13 @@
 
 
     // $ANTLR start constraint_expression
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1448:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1473: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1449:9: ( ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1450:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1474:9: ( ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1450:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )
             int alt66=3;
             switch ( input.LA(1) ) {
             case IN:
@@ -5518,7 +5600,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1450:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 2, input);
+                        new NoViableAltException("1475:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 2, input);
 
                     throw nvae;
                 }
@@ -5530,12 +5612,12 @@
             case SOUNDSLIKE:
             case MEMBEROF:
             case TILDE:
-            case 78:
             case 79:
             case 80:
             case 81:
             case 82:
             case 83:
+            case 84:
                 {
                 alt66=2;
                 }
@@ -5548,16 +5630,16 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1450:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 0, input);
+                    new NoViableAltException("1475:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 0, input);
 
                 throw nvae;
             }
 
             switch (alt66) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1450:5: compound_operator[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:5: compound_operator[$base]
                     {
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3854);
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3983);
                     compound_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -5565,9 +5647,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1451:5: simple_operator[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1476:5: simple_operator[$base]
                     {
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3861);
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3990);
                     simple_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -5575,19 +5657,19 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1452:5: LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1477:5: LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3869); if (failed) return ;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3998); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3878);
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression4007);
                     or_restr_connective(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3883); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression4012); if (failed) return ;
 
                     }
                     break;
@@ -5610,7 +5692,7 @@
 
 
     // $ANTLR start simple_operator
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1461: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1486: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;
@@ -5625,38 +5707,38 @@
         		boolean isNegated = false;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1467: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1468: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1492: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1468: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 )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493: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 alt69=16;
             switch ( input.LA(1) ) {
-            case 78:
+            case 79:
                 {
                 alt69=1;
                 }
                 break;
-            case 79:
+            case 80:
                 {
                 alt69=2;
                 }
                 break;
-            case 80:
+            case 81:
                 {
                 alt69=3;
                 }
                 break;
-            case 81:
+            case 82:
                 {
                 alt69=4;
                 }
                 break;
-            case 82:
+            case 83:
                 {
                 alt69=5;
                 }
                 break;
-            case 83:
+            case 84:
                 {
                 alt69=6;
                 }
@@ -5669,30 +5751,30 @@
             case NOT:
                 {
                 switch ( input.LA(2) ) {
-                case CONTAINS:
+                case TILDE:
                     {
-                    alt69=8;
+                    alt69=16;
                     }
                     break;
-                case TILDE:
+                case MEMBEROF:
                     {
-                    alt69=16;
+                    alt69=14;
                     }
                     break;
-                case MATCHES:
+                case CONTAINS:
                     {
-                    alt69=12;
+                    alt69=8;
                     }
                     break;
-                case MEMBEROF:
+                case MATCHES:
                     {
-                    alt69=14;
+                    alt69=12;
                     }
                     break;
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1468: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 )? )", 69, 8, input);
+                        new NoViableAltException("1493: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 )? )", 69, 8, input);
 
                     throw nvae;
                 }
@@ -5727,137 +5809,137 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1468: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 )? )", 69, 0, input);
+                    new NoViableAltException("1493: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 )? )", 69, 0, input);
 
                 throw nvae;
             }
 
             switch (alt69) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1468:5: t= '=='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1493:5: t= '=='
                     {
                     t=(Token)input.LT(1);
-                    match(input,78,FOLLOW_78_in_simple_operator3914); if (failed) return ;
+                    match(input,79,FOLLOW_79_in_simple_operator4043); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1469:5: t= '>'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1494:5: t= '>'
                     {
                     t=(Token)input.LT(1);
-                    match(input,79,FOLLOW_79_in_simple_operator3922); if (failed) return ;
+                    match(input,80,FOLLOW_80_in_simple_operator4051); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1470:5: t= '>='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1495:5: t= '>='
                     {
                     t=(Token)input.LT(1);
-                    match(input,80,FOLLOW_80_in_simple_operator3930); if (failed) return ;
+                    match(input,81,FOLLOW_81_in_simple_operator4059); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1471:5: t= '<'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1496:5: t= '<'
                     {
                     t=(Token)input.LT(1);
-                    match(input,81,FOLLOW_81_in_simple_operator3938); if (failed) return ;
+                    match(input,82,FOLLOW_82_in_simple_operator4067); if (failed) return ;
 
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1472:5: t= '<='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1497:5: t= '<='
                     {
                     t=(Token)input.LT(1);
-                    match(input,82,FOLLOW_82_in_simple_operator3946); if (failed) return ;
+                    match(input,83,FOLLOW_83_in_simple_operator4075); if (failed) return ;
 
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1473:5: t= '!='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1498:5: t= '!='
                     {
                     t=(Token)input.LT(1);
-                    match(input,83,FOLLOW_83_in_simple_operator3954); if (failed) return ;
+                    match(input,84,FOLLOW_84_in_simple_operator4083); if (failed) return ;
 
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1474:25: t= CONTAINS
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1499:25: t= CONTAINS
                     {
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator3982); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4111); if (failed) return ;
 
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:25: n= NOT t= CONTAINS
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1500:25: n= NOT t= CONTAINS
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4010); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4139); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4014); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4143); if (failed) return ;
 
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1476:25: t= EXCLUDES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1501:25: t= EXCLUDES
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4042); if (failed) return ;
+                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4171); if (failed) return ;
 
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1477:25: t= MATCHES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502:25: t= MATCHES
                     {
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4070); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4199); if (failed) return ;
 
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1478:25: t= SOUNDSLIKE
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1503:25: t= SOUNDSLIKE
                     {
                     t=(Token)input.LT(1);
-                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4098); if (failed) return ;
+                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4227); if (failed) return ;
 
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1479:25: n= NOT t= MATCHES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1504:25: n= NOT t= MATCHES
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4126); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4255); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4130); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4259); if (failed) return ;
 
                     }
                     break;
                 case 13 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1480:25: t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1505:25: t= MEMBEROF
                     {
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4158); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4287); if (failed) return ;
 
                     }
                     break;
                 case 14 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1481:25: n= NOT t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1506:25: n= NOT t= MEMBEROF
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4186); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4315); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4190); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4319); if (failed) return ;
 
                     }
                     break;
                 case 15 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:5: TILDE t= ID (param= square_chunk )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507:5: TILDE t= ID (param= square_chunk )?
                     {
-                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4196); if (failed) return ;
+                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4325); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4200); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:21: (param= square_chunk )?
+                    match(input,ID,FOLLOW_ID_in_simple_operator4329); if (failed) return ;
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507:21: (param= square_chunk )?
                     int alt67=2;
                     int LA67_0 = input.LA(1);
 
@@ -5866,9 +5948,9 @@
                     }
                     switch (alt67) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:21: param= square_chunk
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507:21: param= square_chunk
                             {
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4204);
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4333);
                             param=square_chunk();
                             _fsp--;
                             if (failed) return ;
@@ -5882,14 +5964,14 @@
                     }
                     break;
                 case 16 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:5: n= NOT TILDE t= ID (param= square_chunk )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:5: n= NOT TILDE t= ID (param= square_chunk )?
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4213); if (failed) return ;
-                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4215); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4342); if (failed) return ;
+                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4344); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_simple_operator4219); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:27: (param= square_chunk )?
+                    match(input,ID,FOLLOW_ID_in_simple_operator4348); if (failed) return ;
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:27: (param= square_chunk )?
                     int alt68=2;
                     int LA68_0 = input.LA(1);
 
@@ -5898,9 +5980,9 @@
                     }
                     switch (alt68) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:27: param= square_chunk
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:27: param= square_chunk
                             {
-                            pushFollow(FOLLOW_square_chunk_in_simple_operator4223);
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4352);
                             param=square_chunk();
                             _fsp--;
                             if (failed) return ;
@@ -5927,7 +6009,7 @@
                	            } 
               		
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator4238);
+            pushFollow(FOLLOW_expression_value_in_simple_operator4367);
             rd=expression_value(base,  op,  isNegated,  paramText);
             _fsp--;
             if (failed) return ;
@@ -5952,7 +6034,7 @@
 
 
     // $ANTLR start compound_operator
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1502: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1527: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;
 
@@ -5962,10 +6044,10 @@
         		RestrictionConnectiveDescr group = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1532: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:3: ( IN | NOT IN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533:3: ( IN | NOT IN )
             int alt70=2;
             int LA70_0 = input.LA(1);
 
@@ -5978,15 +6060,15 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1508:3: ( IN | NOT IN )", 70, 0, input);
+                    new NoViableAltException("1533:3: ( IN | NOT IN )", 70, 0, input);
 
                 throw nvae;
             }
             switch (alt70) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:5: IN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533:5: IN
                     {
-                    match(input,IN,FOLLOW_IN_in_compound_operator4268); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4397); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "==";
@@ -6000,10 +6082,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1516:5: NOT IN
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1541:5: NOT IN
                     {
-                    match(input,NOT,FOLLOW_NOT_in_compound_operator4280); if (failed) return ;
-                    match(input,IN,FOLLOW_IN_in_compound_operator4282); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_compound_operator4409); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4411); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "!=";
@@ -6019,12 +6101,12 @@
 
             }
 
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4297); if (failed) return ;
-            pushFollow(FOLLOW_expression_value_in_compound_operator4301);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4426); if (failed) return ;
+            pushFollow(FOLLOW_expression_value_in_compound_operator4430);
             rd=expression_value(group,  op,  false,  null);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526:3: ( COMMA rd= expression_value[group, op, false, null] )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1551:3: ( COMMA rd= expression_value[group, op, false, null] )*
             loop71:
             do {
                 int alt71=2;
@@ -6037,10 +6119,10 @@
 
                 switch (alt71) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526:5: COMMA rd= expression_value[group, op, false, null]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1551:5: COMMA rd= expression_value[group, op, false, null]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4308); if (failed) return ;
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator4312);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4437); if (failed) return ;
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4441);
             	    rd=expression_value(group,  op,  false,  null);
             	    _fsp--;
             	    if (failed) return ;
@@ -6053,7 +6135,7 @@
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4321); if (failed) return ;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4450); if (failed) return ;
             if ( backtracking==0 ) {
 
               			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
@@ -6075,7 +6157,7 @@
 
 
     // $ANTLR start expression_value
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1558: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;
 
@@ -6090,10 +6172,10 @@
         		rd = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1537:2: ( (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1562:2: ( (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
             int alt72=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
@@ -6145,16 +6227,16 @@
             default:
                 if (backtracking>0) {failed=true; return rd;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 72, 0, input);
+                    new NoViableAltException("1563:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 72, 0, input);
 
                 throw nvae;
             }
 
             switch (alt72) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:5: ap= accessor_path
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:5: ap= accessor_path
                     {
-                    pushFollow(FOLLOW_accessor_path_in_expression_value4355);
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4484);
                     ap=accessor_path();
                     _fsp--;
                     if (failed) return rd;
@@ -6171,9 +6253,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1546:5: lc= literal_constraint
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571:5: lc= literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value4375);
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4504);
                     lc=literal_constraint();
                     _fsp--;
                     if (failed) return rd;
@@ -6186,9 +6268,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1550:5: rvc= paren_chunk
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1575:5: rvc= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value4389);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4518);
                     rvc=paren_chunk();
                     _fsp--;
                     if (failed) return rd;
@@ -6231,7 +6313,7 @@
     };
 
     // $ANTLR start literal_constraint
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1563:1: literal_constraint returns [String text, int type] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1588: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);
@@ -6242,10 +6324,10 @@
         		retval.text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:2: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:2: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
             {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
             int alt73=5;
             switch ( input.LA(1) ) {
             case STRING:
@@ -6276,17 +6358,17 @@
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 73, 0, input);
+                    new NoViableAltException("1592:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 73, 0, input);
 
                 throw nvae;
             }
 
             switch (alt73) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:6: t= STRING
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:6: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4432); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4561); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = getString( t.getText() ); retval.type = LiteralRestrictionDescr.TYPE_STRING; 
                     }
@@ -6294,10 +6376,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1568:5: t= INT
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1593:5: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint4443); if (failed) return retval;
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4572); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6305,10 +6387,10 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1569:5: t= FLOAT
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:5: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4456); if (failed) return retval;
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4585); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6316,10 +6398,10 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1570:5: t= BOOL
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1595:5: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4467); if (failed) return retval;
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4596); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_BOOLEAN; 
                     }
@@ -6327,10 +6409,10 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1571:5: t= NULL
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1596:5: t= NULL
                     {
                     t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4479); if (failed) return retval;
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4608); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = null; retval.type = LiteralRestrictionDescr.TYPE_NULL; 
                     }
@@ -6358,7 +6440,7 @@
 
 
     // $ANTLR start predicate
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1575:1: predicate[ConditionalElementDescr base] : text= paren_chunk ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1600:1: predicate[ConditionalElementDescr base] : text= paren_chunk ;
     public final void predicate(ConditionalElementDescr base) throws RecognitionException {
         paren_chunk_return text = null;
 
@@ -6367,10 +6449,10 @@
         		PredicateDescr d = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1579:2: (text= paren_chunk )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1580:3: text= paren_chunk
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:2: (text= paren_chunk )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1605:3: text= paren_chunk
             {
-            pushFollow(FOLLOW_paren_chunk_in_predicate4517);
+            pushFollow(FOLLOW_paren_chunk_in_predicate4646);
             text=paren_chunk();
             _fsp--;
             if (failed) return ;
@@ -6402,23 +6484,23 @@
     };
 
     // $ANTLR start curly_chunk
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1592:1: curly_chunk : LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1617: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1593:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:3: LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1618:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:3: LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY
             {
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk4535); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:14: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )*
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk4664); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:14: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )*
             loop74:
             do {
                 int alt74=3;
                 int LA74_0 = input.LA(1);
 
-                if ( ((LA74_0>=PACKAGE && LA74_0<=NULL)||(LA74_0>=LEFT_SQUARE && LA74_0<=83)) ) {
+                if ( ((LA74_0>=PACKAGE && LA74_0<=NULL)||(LA74_0>=LEFT_SQUARE && LA74_0<=84)) ) {
                     alt74=1;
                 }
                 else if ( (LA74_0==LEFT_CURLY) ) {
@@ -6428,9 +6510,9 @@
 
                 switch (alt74) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=83) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=84) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6438,16 +6520,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4539);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4668);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:44: curly_chunk
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1619:44: curly_chunk
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4548);
+            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4677);
             	    curly_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6460,7 +6542,7 @@
                 }
             } while (true);
 
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk4553); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk4682); if (failed) return retval;
 
             }
 
@@ -6481,23 +6563,23 @@
     };
 
     // $ANTLR start paren_chunk
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1597:1: paren_chunk : LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1622: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1598:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1599:3: LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1623:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:3: LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN
             {
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk4567); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1599:14: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )*
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk4696); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:14: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )*
             loop75:
             do {
                 int alt75=3;
                 int LA75_0 = input.LA(1);
 
-                if ( ((LA75_0>=PACKAGE && LA75_0<=GLOBAL)||LA75_0==COMMA||(LA75_0>=QUERY && LA75_0<=83)) ) {
+                if ( ((LA75_0>=PACKAGE && LA75_0<=GLOBAL)||LA75_0==COMMA||(LA75_0>=QUERY && LA75_0<=84)) ) {
                     alt75=1;
                 }
                 else if ( (LA75_0==LEFT_PAREN) ) {
@@ -6507,9 +6589,9 @@
 
                 switch (alt75) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1599:16: ~ ( LEFT_PAREN | RIGHT_PAREN )
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:16: ~ ( LEFT_PAREN | RIGHT_PAREN )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=GLOBAL)||input.LA(1)==COMMA||(input.LA(1)>=QUERY && input.LA(1)<=83) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=GLOBAL)||input.LA(1)==COMMA||(input.LA(1)>=QUERY && input.LA(1)<=84) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6517,16 +6599,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk4571);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk4700);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1599:44: paren_chunk
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:44: paren_chunk
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk4580);
+            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk4709);
             	    paren_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6539,7 +6621,7 @@
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk4585); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk4714); if (failed) return retval;
 
             }
 
@@ -6560,23 +6642,23 @@
     };
 
     // $ANTLR start square_chunk
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1602:1: square_chunk : LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627: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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1603:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:3: LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1628:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1629:3: LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE
             {
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk4598); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:15: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )*
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk4727); if (failed) return retval;
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1629:15: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )*
             loop76:
             do {
                 int alt76=3;
                 int LA76_0 = input.LA(1);
 
-                if ( ((LA76_0>=PACKAGE && LA76_0<=RIGHT_CURLY)||(LA76_0>=THEN && LA76_0<=83)) ) {
+                if ( ((LA76_0>=PACKAGE && LA76_0<=RIGHT_CURLY)||(LA76_0>=THEN && LA76_0<=84)) ) {
                     alt76=1;
                 }
                 else if ( (LA76_0==LEFT_SQUARE) ) {
@@ -6586,9 +6668,9 @@
 
                 switch (alt76) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1629:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=THEN && input.LA(1)<=83) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=THEN && input.LA(1)<=84) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6596,16 +6678,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk4602);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk4731);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:47: square_chunk
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1629:47: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_square_chunk4611);
+            	    pushFollow(FOLLOW_square_chunk_in_square_chunk4740);
             	    square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6618,7 +6700,7 @@
                 }
             } while (true);
 
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk4616); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk4745); if (failed) return retval;
 
             }
 
@@ -6640,28 +6722,28 @@
     };
 
     // $ANTLR start qualified_id
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1607:1: qualified_id returns [ String text ] : ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1632: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);
 
-        Token ID53=null;
-        identifier_return identifier54 = null;
+        Token ID54=null;
+        identifier_return identifier55 = null;
 
 
 
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:2: ( ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:5: ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:2: ( ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:5: ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
             {
-            ID53=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_qualified_id4645); if (failed) return retval;
+            ID54=(Token)input.LT(1);
+            match(input,ID,FOLLOW_ID_in_qualified_id4774); if (failed) return retval;
             if ( backtracking==0 ) {
-              buf.append(ID53.getText());
+              buf.append(ID54.getText());
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:32: ( DOT identifier )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:32: ( DOT identifier )*
             loop77:
             do {
                 int alt77=2;
@@ -6674,15 +6756,15 @@
 
                 switch (alt77) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:34: DOT identifier
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:34: DOT identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_qualified_id4651); if (failed) return retval;
-            	    pushFollow(FOLLOW_identifier_in_qualified_id4653);
-            	    identifier54=identifier();
+            	    match(input,DOT,FOLLOW_DOT_in_qualified_id4780); if (failed) return retval;
+            	    pushFollow(FOLLOW_identifier_in_qualified_id4782);
+            	    identifier55=identifier();
             	    _fsp--;
             	    if (failed) return retval;
             	    if ( backtracking==0 ) {
-            	      buf.append("."+input.toString(identifier54.start,identifier54.stop));
+            	      buf.append("."+input.toString(identifier55.start,identifier55.stop));
             	    }
 
             	    }
@@ -6693,7 +6775,7 @@
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:88: ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:88: ( LEFT_SQUARE RIGHT_SQUARE )*
             loop78:
             do {
                 int alt78=2;
@@ -6706,10 +6788,10 @@
 
                 switch (alt78) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:90: LEFT_SQUARE RIGHT_SQUARE
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1639:90: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_qualified_id4662); if (failed) return retval;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_qualified_id4664); if (failed) return retval;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_qualified_id4791); if (failed) return retval;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_qualified_id4793); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -6745,7 +6827,7 @@
 
 
     // $ANTLR start dotted_name
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1617:1: dotted_name returns [ String text ] : i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1642: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;
 
@@ -6756,17 +6838,17 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:2: (i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:4: i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:2: (i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:4: i= identifier ( DOT i= identifier )* ( LEFT_SQUARE RIGHT_SQUARE )*
             {
-            pushFollow(FOLLOW_identifier_in_dotted_name4698);
+            pushFollow(FOLLOW_identifier_in_dotted_name4827);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:40: ( DOT i= identifier )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:40: ( DOT i= identifier )*
             loop79:
             do {
                 int alt79=2;
@@ -6779,10 +6861,10 @@
 
                 switch (alt79) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:42: DOT i= identifier
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:42: DOT i= identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_dotted_name4704); if (failed) return text;
-            	    pushFollow(FOLLOW_identifier_in_dotted_name4708);
+            	    match(input,DOT,FOLLOW_DOT_in_dotted_name4833); if (failed) return text;
+            	    pushFollow(FOLLOW_identifier_in_dotted_name4837);
             	    i=identifier();
             	    _fsp--;
             	    if (failed) return text;
@@ -6798,7 +6880,7 @@
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:89: ( LEFT_SQUARE RIGHT_SQUARE )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:89: ( LEFT_SQUARE RIGHT_SQUARE )*
             loop80:
             do {
                 int alt80=2;
@@ -6811,10 +6893,10 @@
 
                 switch (alt80) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:91: LEFT_SQUARE RIGHT_SQUARE
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:91: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4717); if (failed) return text;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4719); if (failed) return text;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4846); if (failed) return text;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4848); if (failed) return text;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -6851,7 +6933,7 @@
     };
 
     // $ANTLR start accessor_path
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1627:1: accessor_path returns [ String text ] : a= accessor_element ( DOT a= accessor_element )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1652: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);
@@ -6863,17 +6945,17 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:2: (a= accessor_element ( DOT a= accessor_element )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:4: a= accessor_element ( DOT a= accessor_element )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:2: (a= accessor_element ( DOT a= accessor_element )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:4: a= accessor_element ( DOT a= accessor_element )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path4753);
+            pushFollow(FOLLOW_accessor_element_in_accessor_path4882);
             a=accessor_element();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) {
               buf.append(a);
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:46: ( DOT a= accessor_element )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:46: ( DOT a= accessor_element )*
             loop81:
             do {
                 int alt81=2;
@@ -6886,10 +6968,10 @@
 
                 switch (alt81) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:48: DOT a= accessor_element
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1659:48: DOT a= accessor_element
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4759); if (failed) return retval;
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4763);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4888); if (failed) return retval;
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4892);
             	    a=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6928,7 +7010,7 @@
 
 
     // $ANTLR start accessor_element
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1637:1: accessor_element returns [ String text ] : i= identifier (s= square_chunk )* ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1662:1: accessor_element returns [ String text ] : i= identifier (s= square_chunk )* ;
     public final String accessor_element() throws RecognitionException {
         String text = null;
 
@@ -6941,17 +7023,17 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1644:2: (i= identifier (s= square_chunk )* )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:3: i= identifier (s= square_chunk )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1669:2: (i= identifier (s= square_chunk )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:3: i= identifier (s= square_chunk )*
             {
-            pushFollow(FOLLOW_identifier_in_accessor_element4801);
+            pushFollow(FOLLOW_identifier_in_accessor_element4930);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:39: (s= square_chunk )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:39: (s= square_chunk )*
             loop82:
             do {
                 int alt82=2;
@@ -6964,9 +7046,9 @@
 
                 switch (alt82) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:40: s= square_chunk
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:40: s= square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4808);
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4937);
             	    s=square_chunk();
             	    _fsp--;
             	    if (failed) return text;
@@ -7003,36 +7085,36 @@
 
 
     // $ANTLR start rhs_chunk
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1648:1: rhs_chunk[RuleDescr rule] : THEN (~ END )* loc= END opt_semicolon ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1673: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;
+        Token THEN56=null;
 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:2: ( THEN (~ END )* loc= END opt_semicolon )
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1650:3: THEN (~ END )* loc= END opt_semicolon
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1674:2: ( THEN (~ END )* loc= END opt_semicolon )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1675:3: THEN (~ END )* loc= END opt_semicolon
             {
-            THEN55=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4829); if (failed) return ;
+            THEN56=(Token)input.LT(1);
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4958); if (failed) return ;
             if ( backtracking==0 ) {
                location.setType( Location.LOCATION_RHS ); 
             }
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:3: (~ END )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1676:3: (~ END )*
             loop83:
             do {
                 int alt83=2;
                 int LA83_0 = input.LA(1);
 
-                if ( ((LA83_0>=PACKAGE && LA83_0<=QUERY)||(LA83_0>=TEMPLATE && LA83_0<=83)) ) {
+                if ( ((LA83_0>=PACKAGE && LA83_0<=QUERY)||(LA83_0>=TEMPLATE && LA83_0<=84)) ) {
                     alt83=1;
                 }
 
 
                 switch (alt83) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:5: ~ END
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1676:5: ~ END
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=83) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=84) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -7040,7 +7122,7 @@
             	        if (backtracking>0) {failed=true; return ;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4837);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4966);    throw mse;
             	    }
 
 
@@ -7053,24 +7135,25 @@
             } while (true);
 
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk4861); if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk4863);
+            match(input,END,FOLLOW_END_in_rhs_chunk4990); if (failed) return ;
+            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk4992);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
             if ( backtracking==0 ) {
 
                                   // ignoring first line in the consequence
-                                  String buf = input.toString( THEN55, loc );
+                                  String buf = input.toString( THEN56, loc );
                                   // removing final END keyword
-                                  buf = safeSubstring( buf, 0, buf.length()-3 );
-                                  if( buf.indexOf( '\n' ) > -1 ) {
-                                      buf = buf.substring( buf.indexOf( '\n' ) + 1 );
-                                  } else if ( buf.indexOf( '\r' ) > -1 ) {
-                                      buf = buf.substring( buf.indexOf( '\r' ) + 1 );
+                                  int idx=4;
+                                  while( idx < buf.length()-3 && (buf.charAt(idx) == ' ' || buf.charAt(idx) == '\t') ) {
+                                      idx++;
                                   }
+                                  if( idx < buf.length()-3 && buf.charAt(idx) == '\r' ) idx++;
+                                  if( idx < buf.length()-3 && buf.charAt(idx) == '\n' ) idx++;
+                                  buf = safeSubstring( buf, idx, buf.length()-3 );
               		    rule.setConsequence( buf );
-                   		    rule.setConsequenceLocation(offset(THEN55.getLine()), THEN55.getCharPositionInLine());
+                   		    rule.setConsequenceLocation(offset(THEN56.getLine()), THEN56.getCharPositionInLine());
                		    rule.setEndCharacter( ((CommonToken)loc).getStopIndex() );
                		    location.setProperty( Location.LOCATION_RHS_CONTENT, rule.getConsequence() );
                               
@@ -7089,17 +7172,21 @@
     }
     // $ANTLR end rhs_chunk
 
+    public static class name_return extends ParserRuleReturnScope {
+        public String name;
+    };
 
     // $ANTLR start name
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:1: name returns [String name] : ( ID | STRING );
-    public final String name() throws RecognitionException {
-        String name = null;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1696: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);
 
-        Token ID56=null;
-        Token STRING57=null;
+        Token ID57=null;
+        Token STRING58=null;
 
         try {
-            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1671:2: ( ID | STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1697:2: ( ID | STRING )
             int alt84=2;
             int LA84_0 = input.LA(1);
 
@@ -7110,37 +7197,39 @@
                 alt84=2;
             }
             else {
-                if (backtracking>0) {failed=true; return name;}
+                if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1670:1: name returns [String name] : ( ID | STRING );", 84, 0, input);
+                    new NoViableAltException("1696:1: name returns [String name] : ( ID | STRING );", 84, 0, input);
 
                 throw nvae;
             }
             switch (alt84) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1671:5: ID
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1697:5: ID
                     {
-                    ID56=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_name4897); if (failed) return name;
+                    ID57=(Token)input.LT(1);
+                    match(input,ID,FOLLOW_ID_in_name5026); if (failed) return retval;
                     if ( backtracking==0 ) {
-                       name = ID56.getText(); 
+                       retval.name = ID57.getText(); 
                     }
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1672:5: STRING
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1698:5: STRING
                     {
-                    STRING57=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_name4905); if (failed) return name;
+                    STRING58=(Token)input.LT(1);
+                    match(input,STRING,FOLLOW_STRING_in_name5034); if (failed) return retval;
                     if ( backtracking==0 ) {
-                       name = getString( STRING57.getText() ); 
+                       retval.name = getString( STRING58.getText() ); 
                     }
 
                     }
                     break;
 
             }
+            retval.stop = input.LT(-1);
+
         }
         catch (RecognitionException re) {
             reportError(re);
@@ -7148,7 +7237,7 @@
         }
         finally {
         }
-        return name;
+        return retval;
     }
     // $ANTLR end name
 
@@ -7156,13 +7245,13 @@
     };
 
     // $ANTLR start identifier
-    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1675:1: identifier : ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | WHEN | THEN | END | IN );
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1701:1: identifier : ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | 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/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1676:2: ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | WHEN | THEN | END | IN )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1702:2: ( ID | PACKAGE | FUNCTION | GLOBAL | IMPORT | EVENT | RULE | QUERY | TEMPLATE | ATTRIBUTES | ENABLED | SALIENCE | DURATION | DIALECT | FROM | INIT | ACTION | REVERSE | RESULT | CONTAINS | EXCLUDES | MEMBEROF | MATCHES | SOUNDSLIKE | WHEN | THEN | END | IN )
             // /home/etirelli/workspace/jboss/temporal/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)>=CONTAINS && input.LA(1)<=MEMBEROF)||input.LA(1)==IN||input.LA(1)==THEN ) {
@@ -7194,10 +7283,10 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:6: ( EXISTS )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:8: EXISTS
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:6: ( EXISTS )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:8: EXISTS
         {
-        match(input,EXISTS,FOLLOW_EXISTS_in_synpred11970); if (failed) return ;
+        match(input,EXISTS,FOLLOW_EXISTS_in_synpred11972); if (failed) return ;
 
         }
     }
@@ -7205,10 +7294,10 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:5: ( NOT )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:7: NOT
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:5: ( NOT )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:7: NOT
         {
-        match(input,NOT,FOLLOW_NOT_in_synpred21988); if (failed) return ;
+        match(input,NOT,FOLLOW_NOT_in_synpred21990); if (failed) return ;
 
         }
     }
@@ -7216,10 +7305,10 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:5: ( EVAL )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:7: EVAL
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:5: ( EVAL )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:7: EVAL
         {
-        match(input,EVAL,FOLLOW_EVAL_in_synpred32007); if (failed) return ;
+        match(input,EVAL,FOLLOW_EVAL_in_synpred32009); if (failed) return ;
 
         }
     }
@@ -7227,10 +7316,10 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:5: ( FORALL )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:7: FORALL
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:5: ( FORALL )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:822:7: FORALL
         {
-        match(input,FORALL,FOLLOW_FORALL_in_synpred42026); if (failed) return ;
+        match(input,FORALL,FOLLOW_FORALL_in_synpred42028); if (failed) return ;
 
         }
     }
@@ -7238,10 +7327,10 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:5: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:7: LEFT_PAREN
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:823:5: ( LEFT_PAREN )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:823:7: LEFT_PAREN
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred52045); if (failed) return ;
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred52047); if (failed) return ;
 
         }
     }
@@ -7249,61 +7338,73 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:6: ( LEFT_SQUARE )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:8: LEFT_SQUARE
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838:13: ( FROM ENTRY_POINT )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:838:14: FROM ENTRY_POINT
         {
-        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred63015); if (failed) return ;
+        match(input,FROM,FOLLOW_FROM_in_synpred62153); if (failed) return ;
+        match(input,ENTRY_POINT,FOLLOW_ENTRY_POINT_in_synpred62155); if (failed) return ;
 
         }
     }
     // $ANTLR end synpred6
 
-    // $ANTLR start synpred7
-    public final void synpred7_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:8: LEFT_PAREN
+    // $ANTLR start synpred9
+    public final void synpred9_fragment() throws RecognitionException {   
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( LEFT_SQUARE )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:8: LEFT_SQUARE
         {
-        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred73048); if (failed) return ;
+        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred93094); if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred7
+    // $ANTLR end synpred9
 
-    // $ANTLR start synpred8
-    public final void synpred8_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411:6: ( DOUBLE_PIPE and_restr_connective[or] )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411:6: DOUBLE_PIPE and_restr_connective[or]
+    // $ANTLR start synpred10
+    public final void synpred10_fragment() throws RecognitionException {   
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:6: ( LEFT_PAREN )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1120:8: LEFT_PAREN
         {
-        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred83743); if (failed) return ;
-        pushFollow(FOLLOW_and_restr_connective_in_synpred83754);
+        match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred103127); if (failed) return ;
+
+        }
+    }
+    // $ANTLR end synpred10
+
+    // $ANTLR start synpred11
+    public final void synpred11_fragment() throws RecognitionException {   
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436:4: ( DOUBLE_PIPE and_restr_connective[or] )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436:4: DOUBLE_PIPE and_restr_connective[or]
+        {
+        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred113872); if (failed) return ;
+        pushFollow(FOLLOW_and_restr_connective_in_synpred113883);
         and_restr_connective(or);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred8
+    // $ANTLR end synpred11
 
-    // $ANTLR start synpred9
-    public final void synpred9_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:5: ( DOUBLE_AMPER constraint_expression[and] )
-        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:5: DOUBLE_AMPER constraint_expression[and]
+    // $ANTLR start synpred12
+    public final void synpred12_fragment() throws RecognitionException {   
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1458:5: ( DOUBLE_AMPER constraint_expression[and] )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1458:5: DOUBLE_AMPER constraint_expression[and]
         {
-        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred93806); if (failed) return ;
-        pushFollow(FOLLOW_constraint_expression_in_synpred93817);
+        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred123935); if (failed) return ;
+        pushFollow(FOLLOW_constraint_expression_in_synpred123946);
         constraint_expression(and);
         _fsp--;
         if (failed) return ;
 
         }
     }
-    // $ANTLR end synpred9
+    // $ANTLR end synpred12
 
-    public final boolean synpred4() {
+    public final boolean synpred12() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred4_fragment(); // can never throw exception
+            synpred12_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7313,11 +7414,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred9() {
+    public final boolean synpred4() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred9_fragment(); // can never throw exception
+            synpred4_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7327,11 +7428,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred7() {
+    public final boolean synpred9() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred7_fragment(); // can never throw exception
+            synpred9_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7383,6 +7484,20 @@
         failed=false;
         return success;
     }
+    public final boolean synpred11() {
+        backtracking++;
+        int start = input.mark();
+        try {
+            synpred11_fragment(); // can never throw exception
+        } catch (RecognitionException re) {
+            System.err.println("impossible: "+re);
+        }
+        boolean success = !failed;
+        input.rewind(start);
+        backtracking--;
+        failed=false;
+        return success;
+    }
     public final boolean synpred5() {
         backtracking++;
         int start = input.mark();
@@ -7411,11 +7526,11 @@
         failed=false;
         return success;
     }
-    public final boolean synpred8() {
+    public final boolean synpred10() {
         backtracking++;
         int start = input.mark();
         try {
-            synpred8_fragment(); // can never throw exception
+            synpred10_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -7438,25 +7553,25 @@
     static final String DFA8_eofS =
         "\6\uffff";
     static final String DFA8_minS =
-        "\2\4\1\uffff\1\76\1\uffff\1\4";
+        "\2\4\1\uffff\1\77\1\uffff\1\4";
     static final String DFA8_maxS =
-        "\2\77\1\uffff\1\76\1\uffff\1\77";
+        "\2\100\1\uffff\1\77\1\uffff\1\100";
     static final String DFA8_acceptS =
         "\2\uffff\1\1\1\uffff\1\2\1\uffff";
     static final String DFA8_specialS =
         "\6\uffff}>";
     static final String[] DFA8_transitionS = {
             "\5\1\1\uffff\1\1\3\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6\uffff"+
-            "\2\1\5\uffff\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\1\1\6\uffff"+
+            "\2\1\5\uffff\1\1\5\uffff\4\1\2\uffff\5\1\1\uffff\1\1\6\uffff"+
             "\1\1",
             "\7\2\1\uffff\2\4\6\2\3\uffff\1\2\1\uffff\1\2\6\uffff\2\2\5\uffff"+
-            "\1\2\5\uffff\4\2\1\uffff\5\2\1\uffff\1\2\4\uffff\1\3\1\uffff"+
+            "\1\2\5\uffff\4\2\2\uffff\5\2\1\uffff\1\2\4\uffff\1\3\1\uffff"+
             "\1\2",
             "",
             "\1\5",
             "",
             "\5\2\1\uffff\1\2\1\uffff\2\4\6\2\3\uffff\1\2\1\uffff\1\2\6\uffff"+
-            "\2\2\5\uffff\1\2\5\uffff\4\2\1\uffff\5\2\1\uffff\1\2\4\uffff"+
+            "\2\2\5\uffff\1\2\5\uffff\4\2\2\uffff\5\2\1\uffff\1\2\4\uffff"+
             "\1\3\1\uffff\1\2"
     };
 
@@ -7490,7 +7605,7 @@
             this.transition = DFA8_transition;
         }
         public String getDescription() {
-            return "360:15: (paramType= dotted_name )?";
+            return "361:15: (paramType= dotted_name )?";
         }
     }
     static final String DFA9_eotS =
@@ -7498,25 +7613,25 @@
     static final String DFA9_eofS =
         "\6\uffff";
     static final String DFA9_minS =
-        "\2\4\1\76\2\uffff\1\4";
+        "\2\4\1\77\2\uffff\1\4";
     static final String DFA9_maxS =
-        "\2\77\1\76\2\uffff\1\77";
+        "\2\100\1\77\2\uffff\1\100";
     static final String DFA9_acceptS =
         "\3\uffff\1\2\1\1\1\uffff";
     static final String DFA9_specialS =
         "\6\uffff}>";
     static final String[] DFA9_transitionS = {
             "\5\1\1\uffff\1\1\3\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6\uffff"+
-            "\2\1\5\uffff\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\1\1\6\uffff"+
+            "\2\1\5\uffff\1\1\5\uffff\4\1\2\uffff\5\1\1\uffff\1\1\6\uffff"+
             "\1\1",
             "\7\4\1\uffff\2\3\6\4\3\uffff\1\4\1\uffff\1\4\6\uffff\2\4\5\uffff"+
-            "\1\4\5\uffff\4\4\1\uffff\5\4\1\uffff\1\4\4\uffff\1\2\1\uffff"+
+            "\1\4\5\uffff\4\4\2\uffff\5\4\1\uffff\1\4\4\uffff\1\2\1\uffff"+
             "\1\4",
             "\1\5",
             "",
             "",
             "\5\4\1\uffff\1\4\1\uffff\2\3\6\4\3\uffff\1\4\1\uffff\1\4\6\uffff"+
-            "\2\4\5\uffff\1\4\5\uffff\4\4\1\uffff\5\4\1\uffff\1\4\4\uffff"+
+            "\2\4\5\uffff\1\4\5\uffff\4\4\2\uffff\5\4\1\uffff\1\4\4\uffff"+
             "\1\2\1\uffff\1\4"
     };
 
@@ -7550,7 +7665,7 @@
             this.transition = DFA9_transition;
         }
         public String getDescription() {
-            return "365:22: (paramType= dotted_name )?";
+            return "366:22: (paramType= dotted_name )?";
         }
     }
     static final String DFA17_eotS =
@@ -7558,9 +7673,9 @@
     static final String DFA17_eofS =
         "\11\uffff";
     static final String DFA17_minS =
-        "\2\10\1\uffff\1\10\1\uffff\1\4\1\76\2\10";
+        "\2\10\1\uffff\1\10\1\uffff\1\4\1\77\2\10";
     static final String DFA17_maxS =
-        "\2\53\1\uffff\1\114\1\uffff\1\77\1\76\2\75";
+        "\2\53\1\uffff\1\115\1\uffff\1\100\1\77\2\76";
     static final String DFA17_acceptS =
         "\2\uffff\1\2\1\uffff\1\1\4\uffff";
     static final String DFA17_specialS =
@@ -7570,14 +7685,14 @@
             "\1\3\2\uffff\1\2\1\uffff\1\4\25\uffff\1\2\1\uffff\1\2\2\uffff"+
             "\4\2",
             "",
-            "\1\4\1\5\1\uffff\1\2\2\4\57\uffff\1\6\16\uffff\1\2",
+            "\1\4\1\5\1\uffff\1\2\2\4\60\uffff\1\6\16\uffff\1\2",
             "",
             "\5\7\1\uffff\1\7\3\uffff\6\7\3\uffff\1\7\1\uffff\1\7\6\uffff"+
-            "\2\7\5\uffff\1\7\5\uffff\4\7\1\uffff\5\7\1\uffff\1\7\6\uffff"+
+            "\2\7\5\uffff\1\7\5\uffff\4\7\2\uffff\5\7\1\uffff\1\7\6\uffff"+
             "\1\7",
             "\1\10",
-            "\1\4\1\5\1\uffff\1\2\61\uffff\1\6",
-            "\1\4\2\uffff\1\2\61\uffff\1\6"
+            "\1\4\1\5\1\uffff\1\2\62\uffff\1\6",
+            "\1\4\2\uffff\1\2\62\uffff\1\6"
     };
 
     static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
@@ -7610,7 +7725,7 @@
             this.transition = DFA17_transition;
         }
         public String getDescription() {
-            return "409:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?";
+            return "410:3: ( LEFT_PAREN ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )? RIGHT_PAREN )?";
         }
     }
     static final String DFA52_eotS =
@@ -7618,106 +7733,105 @@
     static final String DFA52_eofS =
         "\150\uffff";
     static final String DFA52_minS =
-        "\1\10\1\uffff\1\4\1\uffff\3\4\1\0\1\uffff\4\4\1\uffff\4\4\1\0\2"+
-        "\4\1\0\4\4\1\0\1\4\1\0\1\4\2\0\3\4\2\0\2\4\3\0\3\4\2\0\2\4\3\0\3"+
-        "\4\1\0\3\4\1\0\3\4\1\0\1\4\1\0\1\4\1\uffff\44\0";
+        "\1\10\1\uffff\1\4\1\uffff\2\4\1\0\5\4\2\uffff\4\4\1\0\2\4\1\0\4"+
+        "\4\1\0\1\4\1\0\1\4\2\0\3\4\2\0\2\4\3\0\2\4\1\0\1\4\1\0\2\4\3\0\2"+
+        "\4\1\0\4\4\1\0\3\4\1\0\1\4\1\0\1\4\1\uffff\44\0";
     static final String DFA52_maxS =
-        "\1\112\1\uffff\1\123\1\uffff\3\123\1\0\1\uffff\4\123\1\uffff\4\123"+
-        "\1\0\2\123\1\0\4\123\1\0\1\123\1\0\1\123\2\0\3\123\2\0\2\123\3\0"+
-        "\3\123\2\0\2\123\3\0\3\123\1\0\3\123\1\0\3\123\1\0\1\123\1\0\1\123"+
-        "\1\uffff\44\0";
+        "\1\113\1\uffff\1\124\1\uffff\2\124\1\0\5\124\2\uffff\4\124\1\0\2"+
+        "\124\1\0\4\124\1\0\1\124\1\0\1\124\2\0\3\124\2\0\2\124\3\0\2\124"+
+        "\1\0\1\124\1\0\2\124\3\0\2\124\1\0\4\124\1\0\3\124\1\0\1\124\1\0"+
+        "\1\124\1\uffff\44\0";
     static final String DFA52_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\4\uffff\1\2\4\uffff\1\2\65\uffff\1\2\44"+
-        "\uffff";
+        "\1\uffff\1\1\1\uffff\1\3\10\uffff\2\2\65\uffff\1\2\44\uffff";
     static final String DFA52_specialS =
-        "\1\13\1\uffff\1\55\1\uffff\1\66\1\30\1\21\1\74\1\uffff\1\54\1\56"+
-        "\1\65\1\34\1\uffff\1\70\1\5\1\76\1\63\1\35\1\53\1\62\1\6\1\72\1"+
-        "\61\1\17\1\16\1\64\1\33\1\10\1\32\1\12\1\11\1\25\1\22\1\41\1\44"+
-        "\1\31\1\52\1\51\1\20\1\50\1\37\1\73\1\36\1\40\1\1\1\47\1\15\1\14"+
-        "\1\67\1\4\1\60\1\57\1\75\1\0\1\7\1\26\1\23\1\42\1\71\1\27\1\24\1"+
-        "\43\1\45\1\2\1\46\1\3\45\uffff}>";
+        "\1\43\1\uffff\1\62\1\uffff\1\15\1\0\1\55\1\66\1\54\1\2\1\22\1\51"+
+        "\2\uffff\1\6\1\73\1\4\1\36\1\10\1\52\1\71\1\35\1\3\1\53\1\30\1\61"+
+        "\1\56\1\50\1\76\1\47\1\67\1\64\1\31\1\12\1\23\1\17\1\37\1\46\1\45"+
+        "\1\41\1\65\1\16\1\72\1\21\1\40\1\74\1\63\1\60\1\57\1\5\1\1\1\11"+
+        "\1\75\1\70\1\24\1\7\1\32\1\13\1\25\1\20\1\33\1\14\1\26\1\34\1\27"+
+        "\1\44\1\42\45\uffff}>";
     static final String[] DFA52_transitionS = {
             "\2\3\1\uffff\1\2\2\3\1\uffff\1\3\23\uffff\4\3\1\uffff\4\3\1"+
-            "\uffff\1\3\17\uffff\1\1\1\uffff\1\3\12\uffff\1\3",
+            "\uffff\1\3\20\uffff\1\1\1\uffff\1\3\12\uffff\1\3",
             "",
-            "\4\15\1\14\2\15\1\7\1\15\1\10\25\15\1\5\1\15\1\4\2\15\1\6\1"+
-            "\11\1\12\1\13\50\15",
+            "\4\14\1\13\2\14\1\6\1\14\1\15\25\14\1\5\1\14\1\4\2\14\1\7\1"+
+            "\10\1\11\1\12\51\14",
             "",
-            "\4\15\1\23\2\15\1\22\1\15\1\10\32\15\1\16\1\17\1\20\1\21\50"+
-            "\15",
-            "\4\15\1\31\2\15\1\25\1\15\1\10\32\15\1\24\1\26\1\27\1\30\50"+
-            "\15",
-            "\4\15\1\33\2\15\1\32\1\15\1\10\106\15",
+            "\4\14\1\23\2\14\1\22\1\14\1\15\32\14\1\16\1\17\1\20\1\21\51"+
+            "\14",
+            "\4\14\1\31\2\14\1\25\1\14\1\15\32\14\1\24\1\26\1\27\1\30\51"+
+            "\14",
             "\1\uffff",
+            "\4\14\1\33\2\14\1\32\1\14\1\15\107\14",
+            "\4\14\1\35\2\14\1\34\1\14\1\15\107\14",
+            "\7\14\1\36\1\14\1\15\107\14",
+            "\7\14\1\37\1\14\1\15\107\14",
+            "\5\14\1\41\1\14\1\43\1\14\1\15\60\14\1\42\16\14\1\40\7\14",
             "",
-            "\4\15\1\35\2\15\1\34\1\15\1\10\106\15",
-            "\7\15\1\36\1\15\1\10\106\15",
-            "\7\15\1\37\1\15\1\10\106\15",
-            "\5\15\1\41\1\15\1\43\1\15\1\10\57\15\1\42\16\15\1\40\7\15",
             "",
-            "\4\15\1\45\2\15\1\44\1\15\1\10\106\15",
-            "\4\15\1\46\2\15\1\47\1\15\1\10\106\15",
-            "\7\15\1\50\1\15\1\10\106\15",
-            "\7\15\1\51\1\15\1\10\106\15",
+            "\4\14\1\45\2\14\1\44\1\14\1\15\107\14",
+            "\4\14\1\46\2\14\1\47\1\14\1\15\107\14",
+            "\7\14\1\50\1\14\1\15\107\14",
+            "\7\14\1\51\1\14\1\15\107\14",
             "\1\uffff",
-            "\5\15\1\53\1\15\1\55\1\15\1\10\57\15\1\54\16\15\1\52\7\15",
-            "\4\15\1\57\2\15\1\56\1\15\1\10\106\15",
+            "\5\14\1\53\1\14\1\54\1\14\1\15\60\14\1\55\16\14\1\52\7\14",
+            "\4\14\1\57\2\14\1\56\1\14\1\15\107\14",
             "\1\uffff",
-            "\4\15\1\60\2\15\1\61\1\15\1\10\106\15",
-            "\7\15\1\62\1\15\1\10\106\15",
-            "\7\15\1\63\1\15\1\10\106\15",
-            "\5\15\1\65\1\15\1\67\1\15\1\10\57\15\1\66\16\15\1\64\7\15",
+            "\4\14\1\60\2\14\1\61\1\14\1\15\107\14",
+            "\7\14\1\62\1\14\1\15\107\14",
+            "\7\14\1\63\1\14\1\15\107\14",
+            "\5\14\1\65\1\14\1\66\1\14\1\15\60\14\1\67\16\14\1\64\7\14",
             "\1\uffff",
-            "\5\15\1\71\1\15\1\73\1\15\1\10\57\15\1\72\16\15\1\70\7\15",
+            "\5\14\1\71\1\14\1\73\1\14\1\15\60\14\1\72\16\14\1\70\7\14",
             "\1\uffff",
-            "\5\15\1\75\1\15\1\77\1\15\1\10\57\15\1\76\16\15\1\74\7\15",
+            "\5\14\1\75\1\14\1\77\1\14\1\15\60\14\1\76\16\14\1\74\7\14",
             "\1\uffff",
             "\1\uffff",
-            "\4\15\1\100\2\15\1\101\1\15\1\10\106\15",
-            "\5\102\1\15\1\102\1\103\1\15\1\10\6\102\3\15\1\102\1\15\1\102"+
-            "\6\15\2\102\5\15\1\102\5\15\4\102\1\15\5\102\1\15\1\102\6\15"+
-            "\1\102\24\15",
-            "\7\15\1\103\1\15\1\10\60\15\1\104\25\15",
+            "\4\14\1\100\2\14\1\101\1\14\1\15\107\14",
+            "\5\102\1\14\1\102\1\103\1\14\1\15\6\102\3\14\1\102\1\14\1\102"+
+            "\6\14\2\102\5\14\1\102\5\14\4\102\2\14\5\102\1\14\1\102\6\14"+
+            "\1\102\24\14",
+            "\7\14\1\103\1\14\1\15\61\14\1\104\25\14",
             "\1\uffff",
             "\1\uffff",
-            "\5\15\1\106\1\15\1\110\1\15\1\10\57\15\1\107\16\15\1\105\7\15",
-            "\5\15\1\112\1\15\1\114\1\15\1\10\57\15\1\113\16\15\1\111\7\15",
+            "\5\14\1\106\1\14\1\110\1\14\1\15\60\14\1\107\16\14\1\105\7\14",
+            "\5\14\1\112\1\14\1\114\1\14\1\15\60\14\1\113\16\14\1\111\7\14",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\4\15\1\115\2\15\1\116\1\15\1\10\106\15",
-            "\5\117\1\15\1\117\1\103\1\15\1\10\6\117\3\15\1\117\1\15\1\117"+
-            "\6\15\2\117\5\15\1\117\5\15\4\117\1\15\5\117\1\15\1\117\6\15"+
-            "\1\117\24\15",
-            "\7\15\1\103\1\15\1\10\60\15\1\120\25\15",
+            "\4\14\1\115\2\14\1\116\1\14\1\15\107\14",
+            "\5\117\1\14\1\117\1\103\1\14\1\15\6\117\3\14\1\117\1\14\1\117"+
+            "\6\14\2\117\5\14\1\117\5\14\4\117\2\14\5\117\1\14\1\117\6\14"+
+            "\1\117\24\14",
             "\1\uffff",
+            "\7\14\1\103\1\14\1\15\61\14\1\120\25\14",
             "\1\uffff",
-            "\5\15\1\122\1\15\1\123\1\15\1\10\57\15\1\124\16\15\1\121\7\15",
-            "\5\15\1\126\1\15\1\130\1\15\1\10\57\15\1\127\16\15\1\125\7\15",
+            "\5\14\1\122\1\14\1\123\1\14\1\15\60\14\1\124\16\14\1\121\7\14",
+            "\5\14\1\126\1\14\1\130\1\14\1\15\60\14\1\127\16\14\1\125\7\14",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\4\15\1\131\2\15\1\132\1\15\1\10\106\15",
-            "\5\133\1\15\1\133\1\103\1\15\1\10\6\133\3\15\1\133\1\15\1\133"+
-            "\6\15\2\133\5\15\1\133\5\15\4\133\1\15\5\133\1\15\1\133\6\15"+
-            "\1\133\24\15",
-            "\7\15\1\103\1\15\1\10\60\15\1\134\25\15",
+            "\4\14\1\131\2\14\1\132\1\14\1\15\107\14",
+            "\5\133\1\14\1\133\1\103\1\14\1\15\6\133\3\14\1\133\1\14\1\133"+
+            "\6\14\2\133\5\14\1\133\5\14\4\133\2\14\5\133\1\14\1\133\6\14"+
+            "\1\133\24\14",
             "\1\uffff",
-            "\4\15\1\135\2\15\1\136\1\15\1\10\106\15",
-            "\5\137\1\15\1\137\1\103\1\15\1\10\6\137\3\15\1\137\1\15\1\137"+
-            "\6\15\2\137\5\15\1\137\5\15\4\137\1\15\5\137\1\15\1\137\6\15"+
-            "\1\137\24\15",
-            "\7\15\1\103\1\15\1\10\60\15\1\140\25\15",
+            "\7\14\1\103\1\14\1\15\61\14\1\134\25\14",
+            "\4\14\1\135\2\14\1\136\1\14\1\15\107\14",
+            "\5\137\1\14\1\137\1\103\1\14\1\15\6\137\3\14\1\137\1\14\1\137"+
+            "\6\14\2\137\5\14\1\137\5\14\4\137\2\14\5\137\1\14\1\137\6\14"+
+            "\1\137\24\14",
+            "\7\14\1\103\1\14\1\15\61\14\1\140\25\14",
             "\1\uffff",
-            "\4\15\1\141\2\15\1\142\1\15\1\10\106\15",
-            "\5\143\1\15\1\143\1\103\1\15\1\10\6\143\3\15\1\143\1\15\1\143"+
-            "\6\15\2\143\5\15\1\143\5\15\4\143\1\15\5\143\1\15\1\143\6\15"+
-            "\1\143\24\15",
-            "\7\15\1\103\1\15\1\10\60\15\1\144\25\15",
+            "\4\14\1\141\2\14\1\142\1\14\1\15\107\14",
+            "\5\143\1\14\1\143\1\103\1\14\1\15\6\143\3\14\1\143\1\14\1\143"+
+            "\6\14\2\143\5\14\1\143\5\14\4\143\2\14\5\143\1\14\1\143\6\14"+
+            "\1\143\24\14",
+            "\7\14\1\103\1\14\1\15\61\14\1\144\25\14",
             "\1\uffff",
-            "\5\15\1\145\1\15\1\147\1\15\1\10\57\15\1\146\26\15",
+            "\5\14\1\145\1\14\1\146\1\14\1\15\60\14\1\147\26\14",
             "\1\uffff",
-            "\5\15\1\41\1\15\1\43\1\15\1\10\57\15\1\42\26\15",
+            "\5\14\1\41\1\14\1\43\1\14\1\15\60\14\1\42\26\14",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -7787,134 +7901,138 @@
             this.transition = DFA52_transition;
         }
         public String getDescription() {
-            return "1107:4: ( ( LEFT_SQUARE )=>sqarg= square_chunk | ( LEFT_PAREN )=>paarg= paren_chunk )?";
+            return "1113: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 LA52_54 = input.LA(1);
+                        int LA52_5 = input.LA(1);
 
                          
-                        int index52_54 = input.index();
+                        int index52_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_54==RIGHT_SQUARE) ) {s = 92;}
+                        if ( (LA52_5==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_54==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_5==EXISTS) ) {s = 20;}
 
-                        else if ( ((LA52_54>=PACKAGE && LA52_54<=GLOBAL)||LA52_54==COMMA||(LA52_54>=QUERY && LA52_54<=LEFT_SQUARE)||(LA52_54>=THEN && LA52_54<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_5==LEFT_PAREN) ) {s = 21;}
 
-                        else if ( (LA52_54==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_5==NOT) ) {s = 22;}
 
+                        else if ( (LA52_5==EVAL) ) {s = 23;}
+
+                        else if ( (LA52_5==FORALL) ) {s = 24;}
+
+                        else if ( (LA52_5==ID) ) {s = 25;}
+
+                        else if ( ((LA52_5>=PACKAGE && LA52_5<=EVENT)||(LA52_5>=DOT && LA52_5<=GLOBAL)||LA52_5==COMMA||(LA52_5>=QUERY && LA52_5<=FROM)||(LA52_5>=ACCUMULATE && LA52_5<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_54);
+                        input.seek(index52_5);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA52_45 = input.LA(1);
+                        int LA52_50 = input.LA(1);
 
                          
-                        int index52_45 = input.index();
+                        int index52_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_45);
+                        input.seek(index52_50);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA52_64 = input.LA(1);
+                        int LA52_9 = input.LA(1);
 
                          
-                        int index52_64 = input.index();
+                        int index52_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_64==DOT) ) {s = 101;}
+                        if ( (LA52_9==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_64==LEFT_SQUARE) ) {s = 102;}
+                        else if ( ((LA52_9>=PACKAGE && LA52_9<=GLOBAL)||LA52_9==COMMA||(LA52_9>=QUERY && LA52_9<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_64==LEFT_PAREN) ) {s = 103;}
+                        else if ( (LA52_9==LEFT_PAREN) ) {s = 30;}
 
-                        else if ( (LA52_64==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_64>=PACKAGE && LA52_64<=ID)||LA52_64==GLOBAL||LA52_64==COMMA||(LA52_64>=QUERY && LA52_64<=RIGHT_CURLY)||(LA52_64>=RIGHT_SQUARE && LA52_64<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_64);
+                        input.seek(index52_9);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA52_66 = input.LA(1);
+                        int LA52_22 = input.LA(1);
 
                          
-                        int index52_66 = input.index();
+                        int index52_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_66==LEFT_SQUARE) ) {s = 34;}
+                        if ( (LA52_22==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_66==LEFT_PAREN) ) {s = 35;}
+                        else if ( (LA52_22==ID) ) {s = 48;}
 
-                        else if ( (LA52_66==DOT) ) {s = 33;}
+                        else if ( (LA52_22==LEFT_PAREN) ) {s = 49;}
 
-                        else if ( (LA52_66==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( ((LA52_22>=PACKAGE && LA52_22<=EVENT)||(LA52_22>=DOT && LA52_22<=GLOBAL)||LA52_22==COMMA||(LA52_22>=QUERY && LA52_22<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA52_66>=PACKAGE && LA52_66<=ID)||LA52_66==GLOBAL||LA52_66==COMMA||(LA52_66>=QUERY && LA52_66<=RIGHT_CURLY)||(LA52_66>=RIGHT_SQUARE && LA52_66<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_66);
+                        input.seek(index52_22);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA52_50 = input.LA(1);
+                        int LA52_16 = input.LA(1);
 
                          
-                        int index52_50 = input.index();
+                        int index52_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_16==LEFT_PAREN) ) {s = 40;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_16==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA52_16>=PACKAGE && LA52_16<=GLOBAL)||LA52_16==COMMA||(LA52_16>=QUERY && LA52_16<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_50);
+                        input.seek(index52_16);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA52_15 = input.LA(1);
+                        int LA52_49 = input.LA(1);
 
                          
-                        int index52_15 = input.index();
+                        int index52_49 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_15==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_15==ID) ) {s = 38;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_15==LEFT_PAREN) ) {s = 39;}
-
-                        else if ( ((LA52_15>=PACKAGE && LA52_15<=EVENT)||(LA52_15>=DOT && LA52_15<=GLOBAL)||LA52_15==COMMA||(LA52_15>=QUERY && LA52_15<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_15);
+                        input.seek(index52_49);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA52_21 = input.LA(1);
+                        int LA52_14 = input.LA(1);
 
                          
-                        int index52_21 = input.index();
+                        int index52_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (LA52_14==LEFT_PAREN) ) {s = 36;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_14==ID) ) {s = 37;}
 
+                        else if ( (LA52_14==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_14>=PACKAGE && LA52_14<=EVENT)||(LA52_14>=DOT && LA52_14<=GLOBAL)||LA52_14==COMMA||(LA52_14>=QUERY && LA52_14<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_21);
+                        input.seek(index52_14);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
@@ -7924,468 +8042,440 @@
                         int index52_55 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_55==RIGHT_SQUARE) ) {s = 92;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_55==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA52_55>=PACKAGE && LA52_55<=GLOBAL)||LA52_55==COMMA||(LA52_55>=QUERY && LA52_55<=LEFT_SQUARE)||(LA52_55>=THEN && LA52_55<=84)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA52_55==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
                         input.seek(index52_55);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA52_28 = input.LA(1);
+                        int LA52_18 = input.LA(1);
 
                          
-                        int index52_28 = input.index();
+                        int index52_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_28);
+                        input.seek(index52_18);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA52_31 = input.LA(1);
+                        int LA52_51 = input.LA(1);
 
                          
-                        int index52_31 = input.index();
+                        int index52_51 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_31);
+                        input.seek(index52_51);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA52_30 = input.LA(1);
+                        int LA52_33 = input.LA(1);
 
                          
-                        int index52_30 = input.index();
+                        int index52_33 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( ((LA52_33>=PACKAGE && LA52_33<=ID)||LA52_33==GLOBAL||(LA52_33>=QUERY && LA52_33<=ATTRIBUTES)||LA52_33==ENABLED||LA52_33==SALIENCE||(LA52_33>=DURATION && LA52_33<=DIALECT)||LA52_33==FROM||(LA52_33>=INIT && LA52_33<=RESULT)||(LA52_33>=CONTAINS && LA52_33<=MEMBEROF)||LA52_33==IN||LA52_33==THEN) ) {s = 66;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_33==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( (LA52_33==DOT||LA52_33==COMMA||(LA52_33>=DATE_EFFECTIVE && LA52_33<=DATE_EXPIRES)||LA52_33==BOOL||(LA52_33>=INT && LA52_33<=AGENDA_GROUP)||(LA52_33>=LOCK_ON_ACTIVE && LA52_33<=DOUBLE_AMPER)||(LA52_33>=EXISTS && LA52_33<=ACCUMULATE)||(LA52_33>=COLLECT && LA52_33<=ENTRY_POINT)||LA52_33==TILDE||(LA52_33>=FLOAT && LA52_33<=RIGHT_SQUARE)||(LA52_33>=EOL && LA52_33<=84)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA52_33==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index52_30);
+                        input.seek(index52_33);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA52_0 = input.LA(1);
+                        int LA52_57 = input.LA(1);
 
                          
-                        int index52_0 = input.index();
+                        int index52_57 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_0==LEFT_SQUARE) && (synpred6())) {s = 1;}
+                        if ( ((LA52_57>=PACKAGE && LA52_57<=ID)||LA52_57==GLOBAL||(LA52_57>=QUERY && LA52_57<=ATTRIBUTES)||LA52_57==ENABLED||LA52_57==SALIENCE||(LA52_57>=DURATION && LA52_57<=DIALECT)||LA52_57==FROM||(LA52_57>=INIT && LA52_57<=RESULT)||(LA52_57>=CONTAINS && LA52_57<=MEMBEROF)||LA52_57==IN||LA52_57==THEN) ) {s = 95;}
 
-                        else if ( (LA52_0==LEFT_PAREN) ) {s = 2;}
+                        else if ( (LA52_57==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA52_0>=ID && LA52_0<=DOT)||(LA52_0>=COMMA && LA52_0<=RIGHT_PAREN)||LA52_0==END||(LA52_0>=OR && LA52_0<=DOUBLE_AMPER)||(LA52_0>=EXISTS && LA52_0<=FORALL)||LA52_0==INIT||LA52_0==THEN||LA52_0==74) ) {s = 3;}
+                        else if ( (LA52_57==DOT||LA52_57==COMMA||(LA52_57>=DATE_EFFECTIVE && LA52_57<=DATE_EXPIRES)||LA52_57==BOOL||(LA52_57>=INT && LA52_57<=AGENDA_GROUP)||(LA52_57>=LOCK_ON_ACTIVE && LA52_57<=DOUBLE_AMPER)||(LA52_57>=EXISTS && LA52_57<=ACCUMULATE)||(LA52_57>=COLLECT && LA52_57<=ENTRY_POINT)||LA52_57==TILDE||(LA52_57>=FLOAT && LA52_57<=RIGHT_SQUARE)||(LA52_57>=EOL && LA52_57<=84)) && (synpred10())) {s = 12;}
 
+                        else if ( (LA52_57==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index52_0);
+                        input.seek(index52_57);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA52_48 = input.LA(1);
+                        int LA52_61 = input.LA(1);
 
                          
-                        int index52_48 = input.index();
+                        int index52_61 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_48==76) ) {s = 85;}
+                        if ( ((LA52_61>=PACKAGE && LA52_61<=ID)||LA52_61==GLOBAL||(LA52_61>=QUERY && LA52_61<=ATTRIBUTES)||LA52_61==ENABLED||LA52_61==SALIENCE||(LA52_61>=DURATION && LA52_61<=DIALECT)||LA52_61==FROM||(LA52_61>=INIT && LA52_61<=RESULT)||(LA52_61>=CONTAINS && LA52_61<=MEMBEROF)||LA52_61==IN||LA52_61==THEN) ) {s = 99;}
 
-                        else if ( (LA52_48==DOT) ) {s = 86;}
+                        else if ( (LA52_61==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_48==LEFT_SQUARE) ) {s = 87;}
+                        else if ( (LA52_61==DOT||LA52_61==COMMA||(LA52_61>=DATE_EFFECTIVE && LA52_61<=DATE_EXPIRES)||LA52_61==BOOL||(LA52_61>=INT && LA52_61<=AGENDA_GROUP)||(LA52_61>=LOCK_ON_ACTIVE && LA52_61<=DOUBLE_AMPER)||(LA52_61>=EXISTS && LA52_61<=ACCUMULATE)||(LA52_61>=COLLECT && LA52_61<=ENTRY_POINT)||LA52_61==TILDE||(LA52_61>=FLOAT && LA52_61<=RIGHT_SQUARE)||(LA52_61>=EOL && LA52_61<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_48==LEFT_PAREN) ) {s = 88;}
+                        else if ( (LA52_61==LEFT_PAREN) && (synpred10())) {s = 67;}
 
-                        else if ( (LA52_48==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_48>=PACKAGE && LA52_48<=ID)||LA52_48==GLOBAL||LA52_48==COMMA||(LA52_48>=QUERY && LA52_48<=RIGHT_CURLY)||(LA52_48>=RIGHT_SQUARE && LA52_48<=75)||(LA52_48>=77 && LA52_48<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_48);
+                        input.seek(index52_61);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA52_47 = input.LA(1);
+                        int LA52_4 = input.LA(1);
 
                          
-                        int index52_47 = input.index();
+                        int index52_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_47==76) ) {s = 81;}
+                        if ( (LA52_4==EXISTS) ) {s = 14;}
 
-                        else if ( (LA52_47==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_4==NOT) ) {s = 15;}
 
-                        else if ( (LA52_47==DOT) ) {s = 82;}
+                        else if ( (LA52_4==EVAL) ) {s = 16;}
 
-                        else if ( (LA52_47==LEFT_PAREN) ) {s = 83;}
+                        else if ( (LA52_4==FORALL) ) {s = 17;}
 
-                        else if ( (LA52_47==LEFT_SQUARE) ) {s = 84;}
+                        else if ( (LA52_4==LEFT_PAREN) ) {s = 18;}
 
-                        else if ( ((LA52_47>=PACKAGE && LA52_47<=ID)||LA52_47==GLOBAL||LA52_47==COMMA||(LA52_47>=QUERY && LA52_47<=RIGHT_CURLY)||(LA52_47>=RIGHT_SQUARE && LA52_47<=75)||(LA52_47>=77 && LA52_47<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_4==ID) ) {s = 19;}
 
+                        else if ( (LA52_4==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_4>=PACKAGE && LA52_4<=EVENT)||(LA52_4>=DOT && LA52_4<=GLOBAL)||LA52_4==COMMA||(LA52_4>=QUERY && LA52_4<=FROM)||(LA52_4>=ACCUMULATE && LA52_4<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_47);
+                        input.seek(index52_4);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA52_25 = input.LA(1);
+                        int LA52_41 = input.LA(1);
 
                          
-                        int index52_25 = input.index();
+                        int index52_41 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_25==76) ) {s = 52;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_25==DOT) ) {s = 53;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_25==LEFT_SQUARE) ) {s = 54;}
-
-                        else if ( (LA52_25==LEFT_PAREN) ) {s = 55;}
-
-                        else if ( (LA52_25==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_25>=PACKAGE && LA52_25<=ID)||LA52_25==GLOBAL||LA52_25==COMMA||(LA52_25>=QUERY && LA52_25<=RIGHT_CURLY)||(LA52_25>=RIGHT_SQUARE && LA52_25<=75)||(LA52_25>=77 && LA52_25<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_25);
+                        input.seek(index52_41);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA52_24 = input.LA(1);
+                        int LA52_35 = input.LA(1);
 
                          
-                        int index52_24 = input.index();
+                        int index52_35 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_24==LEFT_PAREN) ) {s = 51;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_24==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_24>=PACKAGE && LA52_24<=GLOBAL)||LA52_24==COMMA||(LA52_24>=QUERY && LA52_24<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_24);
+                        input.seek(index52_35);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA52_39 = input.LA(1);
+                        int LA52_59 = input.LA(1);
 
                          
-                        int index52_39 = input.index();
+                        int index52_59 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_39);
+                        input.seek(index52_59);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA52_6 = input.LA(1);
+                        int LA52_43 = input.LA(1);
 
                          
-                        int index52_6 = input.index();
+                        int index52_43 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_6==LEFT_PAREN) ) {s = 26;}
+                        if ( (LA52_43==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_6==ID) ) {s = 27;}
+                        else if ( ((LA52_43>=PACKAGE && LA52_43<=ID)||LA52_43==GLOBAL||(LA52_43>=QUERY && LA52_43<=ATTRIBUTES)||LA52_43==ENABLED||LA52_43==SALIENCE||(LA52_43>=DURATION && LA52_43<=DIALECT)||LA52_43==FROM||(LA52_43>=INIT && LA52_43<=RESULT)||(LA52_43>=CONTAINS && LA52_43<=MEMBEROF)||LA52_43==IN||LA52_43==THEN) ) {s = 79;}
 
-                        else if ( (LA52_6==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_43==LEFT_PAREN) && (synpred10())) {s = 67;}
 
-                        else if ( ((LA52_6>=PACKAGE && LA52_6<=EVENT)||(LA52_6>=DOT && LA52_6<=GLOBAL)||LA52_6==COMMA||(LA52_6>=QUERY && LA52_6<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_43==DOT||LA52_43==COMMA||(LA52_43>=DATE_EFFECTIVE && LA52_43<=DATE_EXPIRES)||LA52_43==BOOL||(LA52_43>=INT && LA52_43<=AGENDA_GROUP)||(LA52_43>=LOCK_ON_ACTIVE && LA52_43<=DOUBLE_AMPER)||(LA52_43>=EXISTS && LA52_43<=ACCUMULATE)||(LA52_43>=COLLECT && LA52_43<=ENTRY_POINT)||LA52_43==TILDE||(LA52_43>=FLOAT && LA52_43<=RIGHT_SQUARE)||(LA52_43>=EOL && LA52_43<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_6);
+                        input.seek(index52_43);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA52_33 = input.LA(1);
+                        int LA52_10 = input.LA(1);
 
                          
-                        int index52_33 = input.index();
+                        int index52_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA52_33>=PACKAGE && LA52_33<=ID)||LA52_33==GLOBAL||(LA52_33>=QUERY && LA52_33<=ATTRIBUTES)||LA52_33==ENABLED||LA52_33==SALIENCE||(LA52_33>=DURATION && LA52_33<=DIALECT)||LA52_33==FROM||(LA52_33>=INIT && LA52_33<=RESULT)||(LA52_33>=CONTAINS && LA52_33<=MEMBEROF)||LA52_33==IN||LA52_33==THEN) ) {s = 66;}
+                        if ( (LA52_10==LEFT_PAREN) ) {s = 31;}
 
-                        else if ( (LA52_33==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_10==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_33==DOT||LA52_33==COMMA||(LA52_33>=DATE_EFFECTIVE && LA52_33<=DATE_EXPIRES)||LA52_33==BOOL||(LA52_33>=INT && LA52_33<=AGENDA_GROUP)||(LA52_33>=LOCK_ON_ACTIVE && LA52_33<=DOUBLE_AMPER)||(LA52_33>=EXISTS && LA52_33<=ACCUMULATE)||LA52_33==COLLECT||LA52_33==TILDE||(LA52_33>=FLOAT && LA52_33<=RIGHT_SQUARE)||(LA52_33>=EOL && LA52_33<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_10>=PACKAGE && LA52_10<=GLOBAL)||LA52_10==COMMA||(LA52_10>=QUERY && LA52_10<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_33==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_33);
+                        input.seek(index52_10);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA52_57 = input.LA(1);
+                        int LA52_34 = input.LA(1);
 
                          
-                        int index52_57 = input.index();
+                        int index52_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA52_57>=PACKAGE && LA52_57<=ID)||LA52_57==GLOBAL||(LA52_57>=QUERY && LA52_57<=ATTRIBUTES)||LA52_57==ENABLED||LA52_57==SALIENCE||(LA52_57>=DURATION && LA52_57<=DIALECT)||LA52_57==FROM||(LA52_57>=INIT && LA52_57<=RESULT)||(LA52_57>=CONTAINS && LA52_57<=MEMBEROF)||LA52_57==IN||LA52_57==THEN) ) {s = 95;}
+                        if ( (LA52_34==RIGHT_SQUARE) ) {s = 68;}
 
-                        else if ( (LA52_57==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_34==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_57==DOT||LA52_57==COMMA||(LA52_57>=DATE_EFFECTIVE && LA52_57<=DATE_EXPIRES)||LA52_57==BOOL||(LA52_57>=INT && LA52_57<=AGENDA_GROUP)||(LA52_57>=LOCK_ON_ACTIVE && LA52_57<=DOUBLE_AMPER)||(LA52_57>=EXISTS && LA52_57<=ACCUMULATE)||LA52_57==COLLECT||LA52_57==TILDE||(LA52_57>=FLOAT && LA52_57<=RIGHT_SQUARE)||(LA52_57>=EOL && LA52_57<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_34>=PACKAGE && LA52_34<=GLOBAL)||LA52_34==COMMA||(LA52_34>=QUERY && LA52_34<=LEFT_SQUARE)||(LA52_34>=THEN && LA52_34<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_57==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_34==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index52_57);
+                        input.seek(index52_34);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA52_61 = input.LA(1);
+                        int LA52_54 = input.LA(1);
 
                          
-                        int index52_61 = input.index();
+                        int index52_54 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA52_61>=PACKAGE && LA52_61<=ID)||LA52_61==GLOBAL||(LA52_61>=QUERY && LA52_61<=ATTRIBUTES)||LA52_61==ENABLED||LA52_61==SALIENCE||(LA52_61>=DURATION && LA52_61<=DIALECT)||LA52_61==FROM||(LA52_61>=INIT && LA52_61<=RESULT)||(LA52_61>=CONTAINS && LA52_61<=MEMBEROF)||LA52_61==IN||LA52_61==THEN) ) {s = 99;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_61==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_61==DOT||LA52_61==COMMA||(LA52_61>=DATE_EFFECTIVE && LA52_61<=DATE_EXPIRES)||LA52_61==BOOL||(LA52_61>=INT && LA52_61<=AGENDA_GROUP)||(LA52_61>=LOCK_ON_ACTIVE && LA52_61<=DOUBLE_AMPER)||(LA52_61>=EXISTS && LA52_61<=ACCUMULATE)||LA52_61==COLLECT||LA52_61==TILDE||(LA52_61>=FLOAT && LA52_61<=RIGHT_SQUARE)||(LA52_61>=EOL && LA52_61<=83)) && (synpred7())) {s = 13;}
-
-                        else if ( (LA52_61==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_61);
+                        input.seek(index52_54);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA52_32 = input.LA(1);
+                        int LA52_58 = input.LA(1);
 
                          
-                        int index52_32 = input.index();
+                        int index52_58 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_32==ID) ) {s = 64;}
+                        if ( (LA52_58==RIGHT_SQUARE) ) {s = 96;}
 
-                        else if ( (LA52_32==LEFT_PAREN) ) {s = 65;}
+                        else if ( (LA52_58==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_32==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( ((LA52_58>=PACKAGE && LA52_58<=GLOBAL)||LA52_58==COMMA||(LA52_58>=QUERY && LA52_58<=LEFT_SQUARE)||(LA52_58>=THEN && LA52_58<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA52_32>=PACKAGE && LA52_32<=EVENT)||(LA52_32>=DOT && LA52_32<=GLOBAL)||LA52_32==COMMA||(LA52_32>=QUERY && LA52_32<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_58==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index52_32);
+                        input.seek(index52_58);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA52_56 = input.LA(1);
+                        int LA52_62 = input.LA(1);
 
                          
-                        int index52_56 = input.index();
+                        int index52_62 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_56==ID) ) {s = 93;}
+                        if ( (LA52_62==RIGHT_SQUARE) ) {s = 100;}
 
-                        else if ( (LA52_56==LEFT_PAREN) ) {s = 94;}
+                        else if ( (LA52_62==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_56==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( ((LA52_62>=PACKAGE && LA52_62<=GLOBAL)||LA52_62==COMMA||(LA52_62>=QUERY && LA52_62<=LEFT_SQUARE)||(LA52_62>=THEN && LA52_62<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( ((LA52_56>=PACKAGE && LA52_56<=EVENT)||(LA52_56>=DOT && LA52_56<=GLOBAL)||LA52_56==COMMA||(LA52_56>=QUERY && LA52_56<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_62==LEFT_PAREN) && (synpred10())) {s = 67;}
 
                          
-                        input.seek(index52_56);
+                        input.seek(index52_62);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA52_60 = input.LA(1);
+                        int LA52_64 = input.LA(1);
 
                          
-                        int index52_60 = input.index();
+                        int index52_64 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_60==ID) ) {s = 97;}
+                        if ( (LA52_64==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_60==LEFT_PAREN) ) {s = 98;}
+                        else if ( (LA52_64==DOT) ) {s = 101;}
 
-                        else if ( (LA52_60==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_64==LEFT_PAREN) ) {s = 102;}
 
-                        else if ( ((LA52_60>=PACKAGE && LA52_60<=EVENT)||(LA52_60>=DOT && LA52_60<=GLOBAL)||LA52_60==COMMA||(LA52_60>=QUERY && LA52_60<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_64==LEFT_SQUARE) ) {s = 103;}
 
+                        else if ( ((LA52_64>=PACKAGE && LA52_64<=ID)||LA52_64==GLOBAL||LA52_64==COMMA||(LA52_64>=QUERY && LA52_64<=RIGHT_CURLY)||(LA52_64>=RIGHT_SQUARE && LA52_64<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_60);
+                        input.seek(index52_64);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA52_5 = input.LA(1);
+                        int LA52_24 = input.LA(1);
 
                          
-                        int index52_5 = input.index();
+                        int index52_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_5==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (LA52_24==LEFT_PAREN) ) {s = 51;}
 
-                        else if ( (LA52_5==EXISTS) ) {s = 20;}
+                        else if ( (LA52_24==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_5==LEFT_PAREN) ) {s = 21;}
+                        else if ( ((LA52_24>=PACKAGE && LA52_24<=GLOBAL)||LA52_24==COMMA||(LA52_24>=QUERY && LA52_24<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_5==NOT) ) {s = 22;}
-
-                        else if ( (LA52_5==EVAL) ) {s = 23;}
-
-                        else if ( (LA52_5==FORALL) ) {s = 24;}
-
-                        else if ( (LA52_5==ID) ) {s = 25;}
-
-                        else if ( ((LA52_5>=PACKAGE && LA52_5<=EVENT)||(LA52_5>=DOT && LA52_5<=GLOBAL)||LA52_5==COMMA||(LA52_5>=QUERY && LA52_5<=FROM)||(LA52_5>=ACCUMULATE && LA52_5<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_5);
+                        input.seek(index52_24);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA52_36 = input.LA(1);
+                        int LA52_32 = input.LA(1);
 
                          
-                        int index52_36 = input.index();
+                        int index52_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_32==ID) ) {s = 64;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_32==LEFT_PAREN) ) {s = 65;}
 
+                        else if ( (LA52_32==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_32>=PACKAGE && LA52_32<=EVENT)||(LA52_32>=DOT && LA52_32<=GLOBAL)||LA52_32==COMMA||(LA52_32>=QUERY && LA52_32<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_36);
+                        input.seek(index52_32);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA52_29 = input.LA(1);
+                        int LA52_56 = input.LA(1);
 
                          
-                        int index52_29 = input.index();
+                        int index52_56 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_29==76) ) {s = 60;}
+                        if ( (LA52_56==ID) ) {s = 93;}
 
-                        else if ( (LA52_29==DOT) ) {s = 61;}
+                        else if ( (LA52_56==LEFT_PAREN) ) {s = 94;}
 
-                        else if ( (LA52_29==LEFT_SQUARE) ) {s = 62;}
+                        else if ( (LA52_56==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_29==LEFT_PAREN) ) {s = 63;}
+                        else if ( ((LA52_56>=PACKAGE && LA52_56<=EVENT)||(LA52_56>=DOT && LA52_56<=GLOBAL)||LA52_56==COMMA||(LA52_56>=QUERY && LA52_56<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_29==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_29>=PACKAGE && LA52_29<=ID)||LA52_29==GLOBAL||LA52_29==COMMA||(LA52_29>=QUERY && LA52_29<=RIGHT_CURLY)||(LA52_29>=RIGHT_SQUARE && LA52_29<=75)||(LA52_29>=77 && LA52_29<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_29);
+                        input.seek(index52_56);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA52_27 = input.LA(1);
+                        int LA52_60 = input.LA(1);
 
                          
-                        int index52_27 = input.index();
+                        int index52_60 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_27==76) ) {s = 56;}
+                        if ( (LA52_60==ID) ) {s = 97;}
 
-                        else if ( (LA52_27==DOT) ) {s = 57;}
+                        else if ( (LA52_60==LEFT_PAREN) ) {s = 98;}
 
-                        else if ( (LA52_27==LEFT_SQUARE) ) {s = 58;}
+                        else if ( (LA52_60==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_27==LEFT_PAREN) ) {s = 59;}
+                        else if ( ((LA52_60>=PACKAGE && LA52_60<=EVENT)||(LA52_60>=DOT && LA52_60<=GLOBAL)||LA52_60==COMMA||(LA52_60>=QUERY && LA52_60<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_27==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_27>=PACKAGE && LA52_27<=ID)||LA52_27==GLOBAL||LA52_27==COMMA||(LA52_27>=QUERY && LA52_27<=RIGHT_CURLY)||(LA52_27>=RIGHT_SQUARE && LA52_27<=75)||(LA52_27>=77 && LA52_27<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_27);
+                        input.seek(index52_60);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA52_12 = input.LA(1);
+                        int LA52_63 = input.LA(1);
 
                          
-                        int index52_12 = input.index();
+                        int index52_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_12==76) ) {s = 32;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_12==DOT) ) {s = 33;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_12==LEFT_SQUARE) ) {s = 34;}
-
-                        else if ( (LA52_12==LEFT_PAREN) ) {s = 35;}
-
-                        else if ( (LA52_12==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_12>=PACKAGE && LA52_12<=ID)||LA52_12==GLOBAL||LA52_12==COMMA||(LA52_12>=QUERY && LA52_12<=RIGHT_CURLY)||(LA52_12>=RIGHT_SQUARE && LA52_12<=75)||(LA52_12>=77 && LA52_12<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_12);
+                        input.seek(index52_63);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA52_18 = input.LA(1);
+                        int LA52_21 = input.LA(1);
 
                          
-                        int index52_18 = input.index();
+                        int index52_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_18);
+                        input.seek(index52_21);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA52_43 = input.LA(1);
+                        int LA52_17 = input.LA(1);
 
                          
-                        int index52_43 = input.index();
+                        int index52_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA52_43>=PACKAGE && LA52_43<=ID)||LA52_43==GLOBAL||(LA52_43>=QUERY && LA52_43<=ATTRIBUTES)||LA52_43==ENABLED||LA52_43==SALIENCE||(LA52_43>=DURATION && LA52_43<=DIALECT)||LA52_43==FROM||(LA52_43>=INIT && LA52_43<=RESULT)||(LA52_43>=CONTAINS && LA52_43<=MEMBEROF)||LA52_43==IN||LA52_43==THEN) ) {s = 79;}
+                        if ( (LA52_17==LEFT_PAREN) ) {s = 41;}
 
-                        else if ( (LA52_43==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_17==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_43==DOT||LA52_43==COMMA||(LA52_43>=DATE_EFFECTIVE && LA52_43<=DATE_EXPIRES)||LA52_43==BOOL||(LA52_43>=INT && LA52_43<=AGENDA_GROUP)||(LA52_43>=LOCK_ON_ACTIVE && LA52_43<=DOUBLE_AMPER)||(LA52_43>=EXISTS && LA52_43<=ACCUMULATE)||LA52_43==COLLECT||LA52_43==TILDE||(LA52_43>=FLOAT && LA52_43<=RIGHT_SQUARE)||(LA52_43>=EOL && LA52_43<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_17>=PACKAGE && LA52_17<=GLOBAL)||LA52_17==COMMA||(LA52_17>=QUERY && LA52_17<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_43==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_43);
+                        input.seek(index52_17);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA52_41 = input.LA(1);
+                        int LA52_36 = input.LA(1);
 
                          
-                        int index52_41 = input.index();
+                        int index52_36 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_41);
+                        input.seek(index52_36);
                         if ( s>=0 ) return s;
                         break;
                     case 32 : 
@@ -8395,568 +8485,592 @@
                         int index52_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_44==RIGHT_SQUARE) ) {s = 80;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_44==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_44>=PACKAGE && LA52_44<=GLOBAL)||LA52_44==COMMA||(LA52_44>=QUERY && LA52_44<=LEFT_SQUARE)||(LA52_44>=THEN && LA52_44<=83)) && (synpred7())) {s = 13;}
-
-                        else if ( (LA52_44==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
                         input.seek(index52_44);
                         if ( s>=0 ) return s;
                         break;
                     case 33 : 
-                        int LA52_34 = input.LA(1);
+                        int LA52_39 = input.LA(1);
 
                          
-                        int index52_34 = input.index();
+                        int index52_39 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_34==RIGHT_SQUARE) ) {s = 68;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_34==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_34>=PACKAGE && LA52_34<=GLOBAL)||LA52_34==COMMA||(LA52_34>=QUERY && LA52_34<=LEFT_SQUARE)||(LA52_34>=THEN && LA52_34<=83)) && (synpred7())) {s = 13;}
-
-                        else if ( (LA52_34==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_34);
+                        input.seek(index52_39);
                         if ( s>=0 ) return s;
                         break;
                     case 34 : 
-                        int LA52_58 = input.LA(1);
+                        int LA52_66 = input.LA(1);
 
                          
-                        int index52_58 = input.index();
+                        int index52_66 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_58==RIGHT_SQUARE) ) {s = 96;}
+                        if ( (LA52_66==LEFT_SQUARE) ) {s = 34;}
 
-                        else if ( (LA52_58==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_66==LEFT_PAREN) ) {s = 35;}
 
-                        else if ( ((LA52_58>=PACKAGE && LA52_58<=GLOBAL)||LA52_58==COMMA||(LA52_58>=QUERY && LA52_58<=LEFT_SQUARE)||(LA52_58>=THEN && LA52_58<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_66==DOT) ) {s = 33;}
 
-                        else if ( (LA52_58==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_66==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA52_66>=PACKAGE && LA52_66<=ID)||LA52_66==GLOBAL||LA52_66==COMMA||(LA52_66>=QUERY && LA52_66<=RIGHT_CURLY)||(LA52_66>=RIGHT_SQUARE && LA52_66<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_58);
+                        input.seek(index52_66);
                         if ( s>=0 ) return s;
                         break;
                     case 35 : 
-                        int LA52_62 = input.LA(1);
+                        int LA52_0 = input.LA(1);
 
                          
-                        int index52_62 = input.index();
+                        int index52_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_62==RIGHT_SQUARE) ) {s = 100;}
+                        if ( (LA52_0==LEFT_SQUARE) && (synpred9())) {s = 1;}
 
-                        else if ( (LA52_62==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_0==LEFT_PAREN) ) {s = 2;}
 
-                        else if ( ((LA52_62>=PACKAGE && LA52_62<=GLOBAL)||LA52_62==COMMA||(LA52_62>=QUERY && LA52_62<=LEFT_SQUARE)||(LA52_62>=THEN && LA52_62<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_0>=ID && LA52_0<=DOT)||(LA52_0>=COMMA && LA52_0<=RIGHT_PAREN)||LA52_0==END||(LA52_0>=OR && LA52_0<=DOUBLE_AMPER)||(LA52_0>=EXISTS && LA52_0<=FORALL)||LA52_0==INIT||LA52_0==THEN||LA52_0==75) ) {s = 3;}
 
-                        else if ( (LA52_62==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_62);
+                        input.seek(index52_0);
                         if ( s>=0 ) return s;
                         break;
                     case 36 : 
-                        int LA52_35 = input.LA(1);
+                        int LA52_65 = input.LA(1);
 
                          
-                        int index52_35 = input.index();
+                        int index52_65 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_35);
+                        input.seek(index52_65);
                         if ( s>=0 ) return s;
                         break;
                     case 37 : 
-                        int LA52_63 = input.LA(1);
+                        int LA52_38 = input.LA(1);
 
                          
-                        int index52_63 = input.index();
+                        int index52_38 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_38==77) ) {s = 73;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_38==DOT) ) {s = 74;}
 
+                        else if ( (LA52_38==LEFT_SQUARE) ) {s = 75;}
+
+                        else if ( (LA52_38==LEFT_PAREN) ) {s = 76;}
+
+                        else if ( (LA52_38==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_38>=PACKAGE && LA52_38<=ID)||LA52_38==GLOBAL||LA52_38==COMMA||(LA52_38>=QUERY && LA52_38<=RIGHT_CURLY)||(LA52_38>=RIGHT_SQUARE && LA52_38<=76)||(LA52_38>=78 && LA52_38<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_63);
+                        input.seek(index52_38);
                         if ( s>=0 ) return s;
                         break;
                     case 38 : 
-                        int LA52_65 = input.LA(1);
+                        int LA52_37 = input.LA(1);
 
                          
-                        int index52_65 = input.index();
+                        int index52_37 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_37==77) ) {s = 69;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_37==DOT) ) {s = 70;}
 
+                        else if ( (LA52_37==LEFT_SQUARE) ) {s = 71;}
+
+                        else if ( (LA52_37==LEFT_PAREN) ) {s = 72;}
+
+                        else if ( (LA52_37==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_37>=PACKAGE && LA52_37<=ID)||LA52_37==GLOBAL||LA52_37==COMMA||(LA52_37>=QUERY && LA52_37<=RIGHT_CURLY)||(LA52_37>=RIGHT_SQUARE && LA52_37<=76)||(LA52_37>=78 && LA52_37<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_65);
+                        input.seek(index52_37);
                         if ( s>=0 ) return s;
                         break;
                     case 39 : 
-                        int LA52_46 = input.LA(1);
+                        int LA52_29 = input.LA(1);
 
                          
-                        int index52_46 = input.index();
+                        int index52_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_29==77) ) {s = 60;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_29==DOT) ) {s = 61;}
 
+                        else if ( (LA52_29==LEFT_SQUARE) ) {s = 62;}
+
+                        else if ( (LA52_29==LEFT_PAREN) ) {s = 63;}
+
+                        else if ( (LA52_29==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_29>=PACKAGE && LA52_29<=ID)||LA52_29==GLOBAL||LA52_29==COMMA||(LA52_29>=QUERY && LA52_29<=RIGHT_CURLY)||(LA52_29>=RIGHT_SQUARE && LA52_29<=76)||(LA52_29>=78 && LA52_29<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_46);
+                        input.seek(index52_29);
                         if ( s>=0 ) return s;
                         break;
                     case 40 : 
-                        int LA52_40 = input.LA(1);
+                        int LA52_27 = input.LA(1);
 
                          
-                        int index52_40 = input.index();
+                        int index52_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_27==77) ) {s = 56;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_27==DOT) ) {s = 57;}
 
+                        else if ( (LA52_27==LEFT_SQUARE) ) {s = 58;}
+
+                        else if ( (LA52_27==LEFT_PAREN) ) {s = 59;}
+
+                        else if ( (LA52_27==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_27>=PACKAGE && LA52_27<=ID)||LA52_27==GLOBAL||LA52_27==COMMA||(LA52_27>=QUERY && LA52_27<=RIGHT_CURLY)||(LA52_27>=RIGHT_SQUARE && LA52_27<=76)||(LA52_27>=78 && LA52_27<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_40);
+                        input.seek(index52_27);
                         if ( s>=0 ) return s;
                         break;
                     case 41 : 
-                        int LA52_38 = input.LA(1);
+                        int LA52_11 = input.LA(1);
 
                          
-                        int index52_38 = input.index();
+                        int index52_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_38==76) ) {s = 73;}
+                        if ( (LA52_11==77) ) {s = 32;}
 
-                        else if ( (LA52_38==DOT) ) {s = 74;}
+                        else if ( (LA52_11==DOT) ) {s = 33;}
 
-                        else if ( (LA52_38==LEFT_SQUARE) ) {s = 75;}
+                        else if ( (LA52_11==LEFT_SQUARE) ) {s = 34;}
 
-                        else if ( (LA52_38==LEFT_PAREN) ) {s = 76;}
+                        else if ( (LA52_11==LEFT_PAREN) ) {s = 35;}
 
-                        else if ( (LA52_38==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_11==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA52_38>=PACKAGE && LA52_38<=ID)||LA52_38==GLOBAL||LA52_38==COMMA||(LA52_38>=QUERY && LA52_38<=RIGHT_CURLY)||(LA52_38>=RIGHT_SQUARE && LA52_38<=75)||(LA52_38>=77 && LA52_38<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_11>=PACKAGE && LA52_11<=ID)||LA52_11==GLOBAL||LA52_11==COMMA||(LA52_11>=QUERY && LA52_11<=RIGHT_CURLY)||(LA52_11>=RIGHT_SQUARE && LA52_11<=76)||(LA52_11>=78 && LA52_11<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_38);
+                        input.seek(index52_11);
                         if ( s>=0 ) return s;
                         break;
                     case 42 : 
-                        int LA52_37 = input.LA(1);
+                        int LA52_19 = input.LA(1);
 
                          
-                        int index52_37 = input.index();
+                        int index52_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_37==76) ) {s = 69;}
+                        if ( (LA52_19==77) ) {s = 42;}
 
-                        else if ( (LA52_37==DOT) ) {s = 70;}
+                        else if ( (LA52_19==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_37==LEFT_SQUARE) ) {s = 71;}
+                        else if ( (LA52_19==DOT) ) {s = 43;}
 
-                        else if ( (LA52_37==LEFT_PAREN) ) {s = 72;}
+                        else if ( (LA52_19==LEFT_PAREN) ) {s = 44;}
 
-                        else if ( (LA52_37==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_19==LEFT_SQUARE) ) {s = 45;}
 
-                        else if ( ((LA52_37>=PACKAGE && LA52_37<=ID)||LA52_37==GLOBAL||LA52_37==COMMA||(LA52_37>=QUERY && LA52_37<=RIGHT_CURLY)||(LA52_37>=RIGHT_SQUARE && LA52_37<=75)||(LA52_37>=77 && LA52_37<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_19>=PACKAGE && LA52_19<=ID)||LA52_19==GLOBAL||LA52_19==COMMA||(LA52_19>=QUERY && LA52_19<=RIGHT_CURLY)||(LA52_19>=RIGHT_SQUARE && LA52_19<=76)||(LA52_19>=78 && LA52_19<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_37);
+                        input.seek(index52_19);
                         if ( s>=0 ) return s;
                         break;
                     case 43 : 
-                        int LA52_19 = input.LA(1);
+                        int LA52_23 = input.LA(1);
 
                          
-                        int index52_19 = input.index();
+                        int index52_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_19==76) ) {s = 42;}
+                        if ( (LA52_23==LEFT_PAREN) ) {s = 50;}
 
-                        else if ( (LA52_19==DOT) ) {s = 43;}
+                        else if ( (LA52_23==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_19==LEFT_SQUARE) ) {s = 44;}
+                        else if ( ((LA52_23>=PACKAGE && LA52_23<=GLOBAL)||LA52_23==COMMA||(LA52_23>=QUERY && LA52_23<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_19==LEFT_PAREN) ) {s = 45;}
-
-                        else if ( (LA52_19==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_19>=PACKAGE && LA52_19<=ID)||LA52_19==GLOBAL||LA52_19==COMMA||(LA52_19>=QUERY && LA52_19<=RIGHT_CURLY)||(LA52_19>=RIGHT_SQUARE && LA52_19<=75)||(LA52_19>=77 && LA52_19<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_19);
+                        input.seek(index52_23);
                         if ( s>=0 ) return s;
                         break;
                     case 44 : 
-                        int LA52_9 = input.LA(1);
+                        int LA52_8 = input.LA(1);
 
                          
-                        int index52_9 = input.index();
+                        int index52_8 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_9==LEFT_PAREN) ) {s = 28;}
+                        if ( (LA52_8==LEFT_PAREN) ) {s = 28;}
 
-                        else if ( (LA52_9==ID) ) {s = 29;}
+                        else if ( (LA52_8==ID) ) {s = 29;}
 
-                        else if ( (LA52_9==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_8==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA52_9>=PACKAGE && LA52_9<=EVENT)||(LA52_9>=DOT && LA52_9<=GLOBAL)||LA52_9==COMMA||(LA52_9>=QUERY && LA52_9<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_8>=PACKAGE && LA52_8<=EVENT)||(LA52_8>=DOT && LA52_8<=GLOBAL)||LA52_8==COMMA||(LA52_8>=QUERY && LA52_8<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_9);
+                        input.seek(index52_8);
                         if ( s>=0 ) return s;
                         break;
                     case 45 : 
-                        int LA52_2 = input.LA(1);
+                        int LA52_6 = input.LA(1);
 
                          
-                        int index52_2 = input.index();
+                        int index52_6 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_2==AND) ) {s = 4;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( (LA52_2==OR) ) {s = 5;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_2==EXISTS) ) {s = 6;}
-
-                        else if ( (LA52_2==LEFT_PAREN) ) {s = 7;}
-
-                        else if ( (LA52_2==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( (LA52_2==NOT) ) {s = 9;}
-
-                        else if ( (LA52_2==EVAL) ) {s = 10;}
-
-                        else if ( (LA52_2==FORALL) ) {s = 11;}
-
-                        else if ( (LA52_2==ID) ) {s = 12;}
-
-                        else if ( ((LA52_2>=PACKAGE && LA52_2<=EVENT)||(LA52_2>=DOT && LA52_2<=GLOBAL)||LA52_2==COMMA||(LA52_2>=QUERY && LA52_2<=LOCK_ON_ACTIVE)||LA52_2==DOUBLE_PIPE||(LA52_2>=DOUBLE_AMPER && LA52_2<=FROM)||(LA52_2>=ACCUMULATE && LA52_2<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_2);
+                        input.seek(index52_6);
                         if ( s>=0 ) return s;
                         break;
                     case 46 : 
-                        int LA52_10 = input.LA(1);
+                        int LA52_26 = input.LA(1);
 
                          
-                        int index52_10 = input.index();
+                        int index52_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_10==LEFT_PAREN) ) {s = 30;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( (LA52_10==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_10>=PACKAGE && LA52_10<=GLOBAL)||LA52_10==COMMA||(LA52_10>=QUERY && LA52_10<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_10);
+                        input.seek(index52_26);
                         if ( s>=0 ) return s;
                         break;
                     case 47 : 
-                        int LA52_52 = input.LA(1);
+                        int LA52_48 = input.LA(1);
 
                          
-                        int index52_52 = input.index();
+                        int index52_48 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_52==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (LA52_48==77) ) {s = 85;}
 
-                        else if ( (LA52_52==ID) ) {s = 89;}
+                        else if ( (LA52_48==DOT) ) {s = 86;}
 
-                        else if ( (LA52_52==LEFT_PAREN) ) {s = 90;}
+                        else if ( (LA52_48==LEFT_SQUARE) ) {s = 87;}
 
-                        else if ( ((LA52_52>=PACKAGE && LA52_52<=EVENT)||(LA52_52>=DOT && LA52_52<=GLOBAL)||LA52_52==COMMA||(LA52_52>=QUERY && LA52_52<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_48==LEFT_PAREN) ) {s = 88;}
 
+                        else if ( (LA52_48==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_48>=PACKAGE && LA52_48<=ID)||LA52_48==GLOBAL||LA52_48==COMMA||(LA52_48>=QUERY && LA52_48<=RIGHT_CURLY)||(LA52_48>=RIGHT_SQUARE && LA52_48<=76)||(LA52_48>=78 && LA52_48<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_52);
+                        input.seek(index52_48);
                         if ( s>=0 ) return s;
                         break;
                     case 48 : 
-                        int LA52_51 = input.LA(1);
+                        int LA52_47 = input.LA(1);
 
                          
-                        int index52_51 = input.index();
+                        int index52_47 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_47==77) ) {s = 81;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_47==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( (LA52_47==DOT) ) {s = 82;}
+
+                        else if ( (LA52_47==LEFT_PAREN) ) {s = 83;}
+
+                        else if ( (LA52_47==LEFT_SQUARE) ) {s = 84;}
+
+                        else if ( ((LA52_47>=PACKAGE && LA52_47<=ID)||LA52_47==GLOBAL||LA52_47==COMMA||(LA52_47>=QUERY && LA52_47<=RIGHT_CURLY)||(LA52_47>=RIGHT_SQUARE && LA52_47<=76)||(LA52_47>=78 && LA52_47<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_51);
+                        input.seek(index52_47);
                         if ( s>=0 ) return s;
                         break;
                     case 49 : 
-                        int LA52_23 = input.LA(1);
+                        int LA52_25 = input.LA(1);
 
                          
-                        int index52_23 = input.index();
+                        int index52_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_23==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (LA52_25==77) ) {s = 52;}
 
-                        else if ( ((LA52_23>=PACKAGE && LA52_23<=GLOBAL)||LA52_23==COMMA||(LA52_23>=QUERY && LA52_23<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_25==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_23==LEFT_PAREN) ) {s = 50;}
+                        else if ( (LA52_25==DOT) ) {s = 53;}
 
+                        else if ( (LA52_25==LEFT_PAREN) ) {s = 54;}
+
+                        else if ( (LA52_25==LEFT_SQUARE) ) {s = 55;}
+
+                        else if ( ((LA52_25>=PACKAGE && LA52_25<=ID)||LA52_25==GLOBAL||LA52_25==COMMA||(LA52_25>=QUERY && LA52_25<=RIGHT_CURLY)||(LA52_25>=RIGHT_SQUARE && LA52_25<=76)||(LA52_25>=78 && LA52_25<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_23);
+                        input.seek(index52_25);
                         if ( s>=0 ) return s;
                         break;
                     case 50 : 
-                        int LA52_20 = input.LA(1);
+                        int LA52_2 = input.LA(1);
 
                          
-                        int index52_20 = input.index();
+                        int index52_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_20==LEFT_PAREN) ) {s = 46;}
+                        if ( (LA52_2==AND) ) {s = 4;}
 
-                        else if ( (LA52_20==ID) ) {s = 47;}
+                        else if ( (LA52_2==OR) ) {s = 5;}
 
-                        else if ( (LA52_20==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_2==LEFT_PAREN) ) {s = 6;}
 
-                        else if ( ((LA52_20>=PACKAGE && LA52_20<=EVENT)||(LA52_20>=DOT && LA52_20<=GLOBAL)||LA52_20==COMMA||(LA52_20>=QUERY && LA52_20<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_2==EXISTS) ) {s = 7;}
 
+                        else if ( (LA52_2==NOT) ) {s = 8;}
+
+                        else if ( (LA52_2==EVAL) ) {s = 9;}
+
+                        else if ( (LA52_2==FORALL) ) {s = 10;}
+
+                        else if ( (LA52_2==ID) ) {s = 11;}
+
+                        else if ( ((LA52_2>=PACKAGE && LA52_2<=EVENT)||(LA52_2>=DOT && LA52_2<=GLOBAL)||LA52_2==COMMA||(LA52_2>=QUERY && LA52_2<=LOCK_ON_ACTIVE)||LA52_2==DOUBLE_PIPE||(LA52_2>=DOUBLE_AMPER && LA52_2<=FROM)||(LA52_2>=ACCUMULATE && LA52_2<=84)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA52_2==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
                          
-                        input.seek(index52_20);
+                        input.seek(index52_2);
                         if ( s>=0 ) return s;
                         break;
                     case 51 : 
-                        int LA52_17 = input.LA(1);
+                        int LA52_46 = input.LA(1);
 
                          
-                        int index52_17 = input.index();
+                        int index52_46 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_17==LEFT_PAREN) ) {s = 41;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_17==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_17>=PACKAGE && LA52_17<=GLOBAL)||LA52_17==COMMA||(LA52_17>=QUERY && LA52_17<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_17);
+                        input.seek(index52_46);
                         if ( s>=0 ) return s;
                         break;
                     case 52 : 
-                        int LA52_26 = input.LA(1);
+                        int LA52_31 = input.LA(1);
 
                          
-                        int index52_26 = input.index();
+                        int index52_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_26);
+                        input.seek(index52_31);
                         if ( s>=0 ) return s;
                         break;
                     case 53 : 
-                        int LA52_11 = input.LA(1);
+                        int LA52_40 = input.LA(1);
 
                          
-                        int index52_11 = input.index();
+                        int index52_40 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_11==LEFT_PAREN) ) {s = 31;}
+                        if ( (synpred10()) ) {s = 67;}
 
-                        else if ( (LA52_11==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_11>=PACKAGE && LA52_11<=GLOBAL)||LA52_11==COMMA||(LA52_11>=QUERY && LA52_11<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_11);
+                        input.seek(index52_40);
                         if ( s>=0 ) return s;
                         break;
                     case 54 : 
-                        int LA52_4 = input.LA(1);
+                        int LA52_7 = input.LA(1);
 
                          
-                        int index52_4 = input.index();
+                        int index52_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_4==EXISTS) ) {s = 14;}
+                        if ( (LA52_7==LEFT_PAREN) ) {s = 26;}
 
-                        else if ( (LA52_4==NOT) ) {s = 15;}
+                        else if ( (LA52_7==ID) ) {s = 27;}
 
-                        else if ( (LA52_4==EVAL) ) {s = 16;}
+                        else if ( (LA52_7==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_4==FORALL) ) {s = 17;}
+                        else if ( ((LA52_7>=PACKAGE && LA52_7<=EVENT)||(LA52_7>=DOT && LA52_7<=GLOBAL)||LA52_7==COMMA||(LA52_7>=QUERY && LA52_7<=84)) && (synpred10())) {s = 12;}
 
-                        else if ( (LA52_4==LEFT_PAREN) ) {s = 18;}
-
-                        else if ( (LA52_4==ID) ) {s = 19;}
-
-                        else if ( (LA52_4==RIGHT_PAREN) && (synpred7())) {s = 8;}
-
-                        else if ( ((LA52_4>=PACKAGE && LA52_4<=EVENT)||(LA52_4>=DOT && LA52_4<=GLOBAL)||LA52_4==COMMA||(LA52_4>=QUERY && LA52_4<=FROM)||(LA52_4>=ACCUMULATE && LA52_4<=83)) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_4);
+                        input.seek(index52_7);
                         if ( s>=0 ) return s;
                         break;
                     case 55 : 
-                        int LA52_49 = input.LA(1);
+                        int LA52_30 = input.LA(1);
 
                          
-                        int index52_49 = input.index();
+                        int index52_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred10()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_49);
+                        input.seek(index52_30);
                         if ( s>=0 ) return s;
                         break;
                     case 56 : 
-                        int LA52_14 = input.LA(1);
+                        int LA52_53 = input.LA(1);
 
                          
-                        int index52_14 = input.index();
+                        int index52_53 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_14==LEFT_PAREN) ) {s = 36;}
+                        if ( (LA52_53==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_14==ID) ) {s = 37;}
+                        else if ( ((LA52_53>=PACKAGE && LA52_53<=ID)||LA52_53==GLOBAL||(LA52_53>=QUERY && LA52_53<=ATTRIBUTES)||LA52_53==ENABLED||LA52_53==SALIENCE||(LA52_53>=DURATION && LA52_53<=DIALECT)||LA52_53==FROM||(LA52_53>=INIT && LA52_53<=RESULT)||(LA52_53>=CONTAINS && LA52_53<=MEMBEROF)||LA52_53==IN||LA52_53==THEN) ) {s = 91;}
 
-                        else if ( (LA52_14==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_53==LEFT_PAREN) && (synpred10())) {s = 67;}
 
-                        else if ( ((LA52_14>=PACKAGE && LA52_14<=EVENT)||(LA52_14>=DOT && LA52_14<=GLOBAL)||LA52_14==COMMA||(LA52_14>=QUERY && LA52_14<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_53==DOT||LA52_53==COMMA||(LA52_53>=DATE_EFFECTIVE && LA52_53<=DATE_EXPIRES)||LA52_53==BOOL||(LA52_53>=INT && LA52_53<=AGENDA_GROUP)||(LA52_53>=LOCK_ON_ACTIVE && LA52_53<=DOUBLE_AMPER)||(LA52_53>=EXISTS && LA52_53<=ACCUMULATE)||(LA52_53>=COLLECT && LA52_53<=ENTRY_POINT)||LA52_53==TILDE||(LA52_53>=FLOAT && LA52_53<=RIGHT_SQUARE)||(LA52_53>=EOL && LA52_53<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_14);
+                        input.seek(index52_53);
                         if ( s>=0 ) return s;
                         break;
                     case 57 : 
-                        int LA52_59 = input.LA(1);
+                        int LA52_20 = input.LA(1);
 
                          
-                        int index52_59 = input.index();
+                        int index52_20 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_20==LEFT_PAREN) ) {s = 46;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_20==ID) ) {s = 47;}
 
+                        else if ( (LA52_20==RIGHT_PAREN) && (synpred10())) {s = 13;}
+
+                        else if ( ((LA52_20>=PACKAGE && LA52_20<=EVENT)||(LA52_20>=DOT && LA52_20<=GLOBAL)||LA52_20==COMMA||(LA52_20>=QUERY && LA52_20<=84)) && (synpred10())) {s = 12;}
+
                          
-                        input.seek(index52_59);
+                        input.seek(index52_20);
                         if ( s>=0 ) return s;
                         break;
                     case 58 : 
-                        int LA52_22 = input.LA(1);
+                        int LA52_42 = input.LA(1);
 
                          
-                        int index52_22 = input.index();
+                        int index52_42 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_22==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (LA52_42==ID) ) {s = 77;}
 
-                        else if ( (LA52_22==ID) ) {s = 48;}
+                        else if ( (LA52_42==LEFT_PAREN) ) {s = 78;}
 
-                        else if ( (LA52_22==LEFT_PAREN) ) {s = 49;}
+                        else if ( (LA52_42==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( ((LA52_22>=PACKAGE && LA52_22<=EVENT)||(LA52_22>=DOT && LA52_22<=GLOBAL)||LA52_22==COMMA||(LA52_22>=QUERY && LA52_22<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_42>=PACKAGE && LA52_42<=EVENT)||(LA52_42>=DOT && LA52_42<=GLOBAL)||LA52_42==COMMA||(LA52_42>=QUERY && LA52_42<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_22);
+                        input.seek(index52_42);
                         if ( s>=0 ) return s;
                         break;
                     case 59 : 
-                        int LA52_42 = input.LA(1);
+                        int LA52_15 = input.LA(1);
 
                          
-                        int index52_42 = input.index();
+                        int index52_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_42==ID) ) {s = 77;}
+                        if ( (LA52_15==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_42==LEFT_PAREN) ) {s = 78;}
+                        else if ( (LA52_15==ID) ) {s = 38;}
 
-                        else if ( (LA52_42==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_15==LEFT_PAREN) ) {s = 39;}
 
-                        else if ( ((LA52_42>=PACKAGE && LA52_42<=EVENT)||(LA52_42>=DOT && LA52_42<=GLOBAL)||LA52_42==COMMA||(LA52_42>=QUERY && LA52_42<=83)) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_15>=PACKAGE && LA52_15<=EVENT)||(LA52_15>=DOT && LA52_15<=GLOBAL)||LA52_15==COMMA||(LA52_15>=QUERY && LA52_15<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_42);
+                        input.seek(index52_15);
                         if ( s>=0 ) return s;
                         break;
                     case 60 : 
-                        int LA52_7 = input.LA(1);
+                        int LA52_45 = input.LA(1);
 
                          
-                        int index52_7 = input.index();
+                        int index52_45 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (LA52_45==RIGHT_SQUARE) ) {s = 80;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_45==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
+                        else if ( ((LA52_45>=PACKAGE && LA52_45<=GLOBAL)||LA52_45==COMMA||(LA52_45>=QUERY && LA52_45<=LEFT_SQUARE)||(LA52_45>=THEN && LA52_45<=84)) && (synpred10())) {s = 12;}
+
+                        else if ( (LA52_45==LEFT_PAREN) && (synpred10())) {s = 67;}
+
                          
-                        input.seek(index52_7);
+                        input.seek(index52_45);
                         if ( s>=0 ) return s;
                         break;
                     case 61 : 
-                        int LA52_53 = input.LA(1);
+                        int LA52_52 = input.LA(1);
 
                          
-                        int index52_53 = input.index();
+                        int index52_52 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( ((LA52_53>=PACKAGE && LA52_53<=ID)||LA52_53==GLOBAL||(LA52_53>=QUERY && LA52_53<=ATTRIBUTES)||LA52_53==ENABLED||LA52_53==SALIENCE||(LA52_53>=DURATION && LA52_53<=DIALECT)||LA52_53==FROM||(LA52_53>=INIT && LA52_53<=RESULT)||(LA52_53>=CONTAINS && LA52_53<=MEMBEROF)||LA52_53==IN||LA52_53==THEN) ) {s = 91;}
+                        if ( (LA52_52==ID) ) {s = 89;}
 
-                        else if ( (LA52_53==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        else if ( (LA52_52==LEFT_PAREN) ) {s = 90;}
 
-                        else if ( (LA52_53==DOT||LA52_53==COMMA||(LA52_53>=DATE_EFFECTIVE && LA52_53<=DATE_EXPIRES)||LA52_53==BOOL||(LA52_53>=INT && LA52_53<=AGENDA_GROUP)||(LA52_53>=LOCK_ON_ACTIVE && LA52_53<=DOUBLE_AMPER)||(LA52_53>=EXISTS && LA52_53<=ACCUMULATE)||LA52_53==COLLECT||LA52_53==TILDE||(LA52_53>=FLOAT && LA52_53<=RIGHT_SQUARE)||(LA52_53>=EOL && LA52_53<=83)) && (synpred7())) {s = 13;}
+                        else if ( (LA52_52==RIGHT_PAREN) && (synpred10())) {s = 13;}
 
-                        else if ( (LA52_53==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( ((LA52_52>=PACKAGE && LA52_52<=EVENT)||(LA52_52>=DOT && LA52_52<=GLOBAL)||LA52_52==COMMA||(LA52_52>=QUERY && LA52_52<=84)) && (synpred10())) {s = 12;}
 
                          
-                        input.seek(index52_53);
+                        input.seek(index52_52);
                         if ( s>=0 ) return s;
                         break;
                     case 62 : 
-                        int LA52_16 = input.LA(1);
+                        int LA52_28 = input.LA(1);
 
                          
-                        int index52_16 = input.index();
+                        int index52_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_16==RIGHT_PAREN) && (synpred7())) {s = 8;}
+                        if ( (synpred10()) ) {s = 13;}
 
-                        else if ( ((LA52_16>=PACKAGE && LA52_16<=GLOBAL)||LA52_16==COMMA||(LA52_16>=QUERY && LA52_16<=83)) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_16==LEFT_PAREN) ) {s = 40;}
-
                          
-                        input.seek(index52_16);
+                        input.seek(index52_28);
                         if ( s>=0 ) return s;
                         break;
             }
@@ -8974,7 +9088,7 @@
     static final String DFA64_minS =
         "\1\14\1\uffff\1\4\1\11\1\0\1\4\1\uffff\1\4\13\0";
     static final String DFA64_maxS =
-        "\1\46\1\uffff\2\123\1\0\1\123\1\uffff\1\123\13\0";
+        "\1\46\1\uffff\2\124\1\0\1\124\1\uffff\1\124\13\0";
     static final String DFA64_acceptS =
         "\1\uffff\1\2\4\uffff\1\1\14\uffff";
     static final String DFA64_specialS =
@@ -8983,19 +9097,19 @@
             "\2\1\26\uffff\1\2\1\uffff\1\1",
             "",
             "\5\1\1\uffff\1\1\1\4\2\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6\uffff"+
-            "\2\1\5\uffff\1\1\1\uffff\1\6\1\1\2\uffff\4\1\1\uffff\1\5\1\7"+
+            "\2\1\5\uffff\1\1\1\uffff\1\6\1\1\2\uffff\4\1\2\uffff\1\5\1\7"+
             "\1\10\1\11\1\12\1\6\1\3\6\uffff\1\1\16\uffff\6\6",
-            "\1\1\1\uffff\1\13\35\uffff\1\1\10\uffff\7\1\4\uffff\1\1\20\uffff"+
+            "\1\1\1\uffff\1\13\35\uffff\1\1\11\uffff\7\1\4\uffff\1\1\20\uffff"+
             "\6\1",
             "\1\uffff",
-            "\5\6\1\1\1\6\1\22\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
-            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\1\uffff\1\15\1\16\1"+
-            "\17\1\20\1\21\1\1\1\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
+            "\5\6\1\1\1\6\1\15\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
+            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\2\uffff\1\16\1\17\1"+
+            "\20\1\21\1\22\1\1\1\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
             "\6\1",
             "",
-            "\5\6\1\1\1\6\1\22\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
-            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\1\uffff\1\15\1\16\1"+
-            "\17\1\20\1\21\1\1\1\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
+            "\5\6\1\1\1\6\1\15\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
+            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\2\uffff\1\16\1\17\1"+
+            "\20\1\21\1\22\1\1\1\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
             "\6\1",
             "\1\uffff",
             "\1\uffff",
@@ -9040,7 +9154,7 @@
             this.transition = DFA64_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1409:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*";
+            return "()* loopback of 1434:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
@@ -9052,7 +9166,7 @@
                         int index64_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred8()) ) {s = 6;}
+                        if ( (synpred11()) ) {s = 6;}
 
                         else if ( (true) ) {s = 1;}
 
@@ -9069,82 +9183,38 @@
         }
     }
     static final String DFA65_eotS =
-        "\70\uffff";
+        "\32\uffff";
     static final String DFA65_eofS =
-        "\1\1\13\uffff\1\4\1\uffff\5\4\45\uffff";
+        "\1\1\31\uffff";
     static final String DFA65_minS =
-        "\1\14\1\uffff\1\4\1\11\1\uffff\7\4\1\11\6\4\1\11\1\0\2\4\41\0";
+        "\1\14\1\uffff\1\4\1\11\2\4\1\uffff\1\4\22\0";
     static final String DFA65_maxS =
-        "\1\46\1\uffff\2\123\1\uffff\7\123\1\75\1\123\5\77\1\123\1\0\2\123"+
-        "\41\0";
+        "\1\46\1\uffff\4\124\1\uffff\1\124\22\0";
     static final String DFA65_acceptS =
-        "\1\uffff\1\2\2\uffff\1\1\63\uffff";
+        "\1\uffff\1\2\4\uffff\1\1\23\uffff";
     static final String DFA65_specialS =
-        "\24\uffff\1\0\43\uffff}>";
+        "\32\uffff}>";
     static final String[] DFA65_transitionS = {
             "\2\1\26\uffff\1\1\1\uffff\1\2",
             "",
-            "\5\1\1\uffff\1\1\1\12\2\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6"+
-            "\uffff\2\1\5\uffff\1\1\1\uffff\1\4\1\1\2\uffff\4\1\1\uffff\1"+
-            "\5\1\6\1\7\1\10\1\11\1\4\1\3\6\uffff\1\1\16\uffff\6\4",
-            "\1\1\1\uffff\1\13\35\uffff\1\1\10\uffff\7\1\4\uffff\1\1\20\uffff"+
+            "\5\1\1\uffff\1\1\1\4\2\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6\uffff"+
+            "\2\1\5\uffff\1\1\1\uffff\1\6\1\1\2\uffff\4\1\2\uffff\1\5\1\7"+
+            "\1\10\1\11\1\12\1\6\1\3\6\uffff\1\1\16\uffff\6\6",
+            "\1\1\1\uffff\1\13\35\uffff\1\1\11\uffff\7\1\4\uffff\1\1\20\uffff"+
             "\6\1",
+            "\5\1\1\uffff\1\1\1\22\2\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6"+
+            "\uffff\2\1\5\uffff\1\1\1\uffff\1\6\1\1\2\uffff\4\1\2\uffff\1"+
+            "\15\1\16\1\17\1\20\1\21\1\6\1\14\6\uffff\1\1\16\uffff\6\6",
+            "\5\6\1\1\1\6\1\31\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
+            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\2\uffff\1\24\1\25\1"+
+            "\26\1\27\1\30\1\1\1\23\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
+            "\6\1",
             "",
-            "\5\4\1\1\1\4\1\15\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\16\1\17\1"+
-            "\20\1\21\1\22\1\1\1\14\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
+            "\5\6\1\1\1\6\1\31\2\uffff\6\6\1\uffff\1\6\1\uffff\4\6\5\uffff"+
+            "\2\6\5\uffff\1\6\1\uffff\1\1\3\uffff\4\6\2\uffff\1\24\1\25\1"+
+            "\26\1\27\1\30\1\1\1\23\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
             "\6\1",
-            "\5\4\1\1\1\4\1\15\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\16\1\17\1"+
-            "\20\1\21\1\22\1\1\1\14\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
-            "\5\4\1\1\1\4\1\15\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\16\1\17\1"+
-            "\20\1\21\1\22\1\1\1\14\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
-            "\5\4\1\1\1\4\1\15\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\16\1\17\1"+
-            "\20\1\21\1\22\1\1\1\14\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
-            "\5\4\1\1\1\4\1\15\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\16\1\17\1"+
-            "\20\1\21\1\22\1\1\1\14\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
-            "\5\1\1\uffff\1\1\1\24\2\uffff\6\1\3\uffff\1\1\1\uffff\1\1\6"+
-            "\uffff\2\1\5\uffff\1\1\1\uffff\1\4\1\1\2\uffff\4\1\1\uffff\1"+
-            "\25\1\26\1\27\1\30\1\31\1\4\1\23\6\uffff\1\1\16\uffff\6\4",
-            "\5\4\1\uffff\1\4\1\33\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5"+
-            "\uffff\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\34"+
-            "\1\35\1\36\1\37\1\40\1\1\1\32\2\4\4\uffff\1\4\16\uffff\6\1",
-            "\1\4\1\uffff\1\1\2\4\26\uffff\1\4\1\uffff\1\4\26\uffff\1\4",
-            "\7\4\1\42\35\4\1\43\10\4\1\52\1\53\1\54\1\55\1\56\1\57\1\41"+
-            "\25\4\1\44\1\45\1\46\1\47\1\50\1\51",
-            "\5\1\1\4\2\1\2\4\6\1\1\uffff\1\1\1\uffff\4\1\5\uffff\2\1\2\uffff"+
-            "\1\4\1\uffff\1\4\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\3\1\2\uffff"+
-            "\1\4\1\uffff\1\1",
-            "\5\1\1\4\2\1\2\4\6\1\1\uffff\1\1\1\uffff\4\1\5\uffff\2\1\2\uffff"+
-            "\1\4\1\uffff\1\4\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\3\1\2\uffff"+
-            "\1\4\1\uffff\1\1",
-            "\5\1\1\4\2\1\2\4\6\1\1\uffff\1\1\1\uffff\4\1\5\uffff\2\1\2\uffff"+
-            "\1\4\1\uffff\1\4\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\3\1\2\uffff"+
-            "\1\4\1\uffff\1\1",
-            "\5\1\1\4\2\1\2\4\6\1\1\uffff\1\1\1\uffff\4\1\5\uffff\2\1\2\uffff"+
-            "\1\4\1\uffff\1\4\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\3\1\2\uffff"+
-            "\1\4\1\uffff\1\1",
-            "\5\1\1\4\2\1\2\4\6\1\1\uffff\1\1\1\uffff\4\1\5\uffff\2\1\2\uffff"+
-            "\1\4\1\uffff\1\4\1\1\5\uffff\4\1\1\uffff\5\1\1\uffff\3\1\2\uffff"+
-            "\1\4\1\uffff\1\1",
-            "\1\1\1\uffff\1\60\35\uffff\1\1\10\uffff\7\1\4\uffff\1\1\20\uffff"+
-            "\6\1",
             "\1\uffff",
-            "\5\4\1\1\1\4\1\62\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\63\1\64\1"+
-            "\65\1\66\1\67\1\1\1\61\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
-            "\5\4\1\1\1\4\1\62\2\uffff\6\4\1\uffff\1\4\1\uffff\4\4\5\uffff"+
-            "\2\4\5\uffff\1\4\1\uffff\1\1\3\uffff\4\4\1\uffff\1\63\1\64\1"+
-            "\65\1\66\1\67\1\1\1\61\2\4\2\uffff\1\1\1\uffff\1\4\16\uffff"+
-            "\6\1",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -9161,22 +9231,6 @@
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
-            "\1\uffff",
             "\1\uffff"
     };
 
@@ -9210,37 +9264,12 @@
             this.transition = DFA65_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1432:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*";
+            return "()* loopback of 1457:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*";
         }
-        public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
-        	int _s = s;
-            switch ( s ) {
-                    case 0 : 
-                        int LA65_20 = input.LA(1);
-
-                         
-                        int index65_20 = input.index();
-                        input.rewind();
-                        s = -1;
-                        if ( (synpred9()) ) {s = 4;}
-
-                        else if ( (true) ) {s = 1;}
-
-                         
-                        input.seek(index65_20);
-                        if ( s>=0 ) return s;
-                        break;
-            }
-            if (backtracking>0) {failed=true; return -1;}
-            NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 65, _s, input);
-            error(nvae);
-            throw nvae;
-        }
     }
  
 
-    public static final BitSet FOLLOW_74_in_opt_semicolon39 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_75_in_opt_semicolon39 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_prolog_in_compilation_unit57 = new BitSet(new long[]{0x00000007FAD34460L});
     public static final BitSet FOLLOW_statement_in_compilation_unit62 = new BitSet(new long[]{0x00000007FAD34460L});
     public static final BitSet FOLLOW_EOF_in_compilation_unit67 = new BitSet(new long[]{0x0000000000000002L});
@@ -9254,326 +9283,332 @@
     public static final BitSet FOLLOW_template_in_statement165 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule_in_statement174 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_query_in_statement186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_PACKAGE_in_package_statement210 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_package_statement214 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_package_statement216 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_import_statement247 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_import_name_in_import_statement270 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_import_statement273 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_function_import_statement297 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement299 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_import_name_in_function_import_statement322 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement325 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IMPORT_in_event_import_statement349 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_EVENT_in_event_import_statement351 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_import_name_in_event_import_statement374 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_event_import_statement377 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_name403 = new BitSet(new long[]{0x0000000000000202L,0x0000000000000800L});
-    public static final BitSet FOLLOW_DOT_in_import_name415 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_import_name419 = new BitSet(new long[]{0x0000000000000202L,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_import_name443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_global477 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_global488 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_global499 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_global501 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FUNCTION_in_function526 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function530 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_function535 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_function544 = new BitSet(new long[]{0x817DE083028FE5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function553 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_argument_in_function558 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_COMMA_in_function572 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function576 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_argument_in_function581 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_function605 = new BitSet(new long[]{0x0800000000000000L});
-    public static final BitSet FOLLOW_curly_chunk_in_function611 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_argument638 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument644 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument646 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_QUERY_in_query676 = new BitSet(new long[]{0x0000000000200100L});
-    public static final BitSet FOLLOW_name_in_query680 = new BitSet(new long[]{0x00000F0000008900L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_query690 = new BitSet(new long[]{0x0000000000002100L});
-    public static final BitSet FOLLOW_qualified_id_in_query725 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ID_in_query730 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_COMMA_in_query751 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_qualified_id_in_query755 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ID_in_query760 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_query810 = new BitSet(new long[]{0x00000F0000008900L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query839 = new BitSet(new long[]{0x0000000000008000L});
-    public static final BitSet FOLLOW_END_in_query844 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_query846 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_TEMPLATE_in_template874 = new BitSet(new long[]{0x0000000000200100L});
-    public static final BitSet FOLLOW_name_in_template878 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template880 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_template_slot_in_template895 = new BitSet(new long[]{0x0000000000008100L});
-    public static final BitSet FOLLOW_END_in_template910 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template912 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualified_id_in_template_slot958 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_template_slot974 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_template_slot976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_in_rule1007 = new BitSet(new long[]{0x0000000000200100L});
-    public static final BitSet FOLLOW_name_in_rule1011 = new BitSet(new long[]{0x80000007FADC0000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule1020 = new BitSet(new long[]{0x8000000000040000L});
-    public static final BitSet FOLLOW_WHEN_in_rule1032 = new BitSet(new long[]{0x80000F0000000900L,0x0000000000001000L});
-    public static final BitSet FOLLOW_76_in_rule1034 = new BitSet(new long[]{0x80000F0000000900L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule1045 = new BitSet(new long[]{0x8000000000000000L});
-    public static final BitSet FOLLOW_rhs_chunk_in_rule1055 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes1075 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_76_in_rule_attributes1077 = new BitSet(new long[]{0x00000007FAD00000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1085 = new BitSet(new long[]{0x00000007FAD01002L});
-    public static final BitSet FOLLOW_COMMA_in_rule_attributes1092 = new BitSet(new long[]{0x00000007FAD00000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1097 = new BitSet(new long[]{0x00000007FAD01002L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute1134 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute1142 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1160 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1169 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1177 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_effective_in_rule_attribute1185 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_date_expires_in_rule_attribute1193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_enabled_in_rule_attribute1201 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1209 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1217 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dialect_in_rule_attribute1224 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1250 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_date_effective1252 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1281 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_date_expires1283 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ENABLED_in_enabled1312 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_BOOL_in_enabled1314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_SALIENCE_in_salience1347 = new BitSet(new long[]{0x0000000004000800L});
-    public static final BitSet FOLLOW_INT_in_salience1358 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_salience1373 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1403 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1416 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1451 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1464 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1500 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1502 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1530 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_ruleflow_group1532 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1560 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1562 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DURATION_in_duration1590 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_INT_in_duration1592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DIALECT_in_dialect1620 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_STRING_in_dialect1622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1654 = new BitSet(new long[]{0x0000000001000002L});
-    public static final BitSet FOLLOW_BOOL_in_lock_on_active1667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1706 = new BitSet(new long[]{0x00000F0000000902L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1743 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or1768 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_OR_in_lhs_or1770 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1783 = new BitSet(new long[]{0x00000F0000002900L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or1794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1812 = new BitSet(new long[]{0x0000001800000002L});
-    public static final BitSet FOLLOW_set_in_lhs_or1820 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or1836 = new BitSet(new long[]{0x0000001800000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and1867 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_AND_in_lhs_and1869 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1881 = new BitSet(new long[]{0x00000F0000002900L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and1891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1909 = new BitSet(new long[]{0x0000006000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_and1917 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1933 = new BitSet(new long[]{0x0000006000000002L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary1978 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary1996 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2015 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2034 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2051 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2055 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2057 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2068 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary2080 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2107 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_FROM_in_pattern_source2119 = new BitSet(new long[]{0x817FF083028FC5F0L});
-    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2175 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_collect_statement_in_pattern_source2198 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_statement_in_pattern_source2222 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EXISTS_in_lhs_exist2265 = new BitSet(new long[]{0x0000000000000900L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2285 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2289 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2319 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_lhs_not2421 = new BitSet(new long[]{0x0000000000000900L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2434 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_or_in_lhs_not2438 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2469 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2506 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_lhs_eval2552 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2563 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_lhs_forall2589 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2591 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2595 = new BitSet(new long[]{0x0000000000002100L});
-    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2610 = new BitSet(new long[]{0x0000000000002100L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2626 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern2659 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_pattern2667 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_from_source_in_from_statement2694 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2731 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2741 = new BitSet(new long[]{0x00000F0000000900L});
-    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2745 = new BitSet(new long[]{0x0000200000001100L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2747 = new BitSet(new long[]{0x0000200000000100L});
-    public static final BitSet FOLLOW_INIT_in_accumulate_statement2765 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2778 = new BitSet(new long[]{0x0000400000001000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2780 = new BitSet(new long[]{0x0000400000000000L});
-    public static final BitSet FOLLOW_ACTION_in_accumulate_statement2791 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2795 = new BitSet(new long[]{0x0001800000001000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2797 = new BitSet(new long[]{0x0001800000000000L});
-    public static final BitSet FOLLOW_REVERSE_in_accumulate_statement2810 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2814 = new BitSet(new long[]{0x0001000000001000L});
-    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2816 = new BitSet(new long[]{0x0001000000000000L});
-    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2833 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2837 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_ID_in_accumulate_statement2863 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2867 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2884 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_from_source2912 = new BitSet(new long[]{0x0000000000000A02L});
-    public static final BitSet FOLLOW_paren_chunk_in_from_source2940 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_expression_chain_in_from_source2953 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOT_in_expression_chain2988 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_expression_chain2992 = new BitSet(new long[]{0x2000000000000A02L});
-    public static final BitSet FOLLOW_square_chunk_in_expression_chain3023 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3056 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_expression_chain_in_expression_chain3071 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_COLLECT_in_collect_statement3122 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3132 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_pattern_source_in_collect_statement3136 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3138 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_fact_binding3170 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_76_in_fact_binding3172 = new BitSet(new long[]{0x0000000000000900L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3186 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3202 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3206 = new BitSet(new long[]{0x0000001800002000L});
-    public static final BitSet FOLLOW_set_in_fact_binding3219 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_fact_in_fact_binding3231 = new BitSet(new long[]{0x0000001800002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3249 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_qualified_id_in_fact3304 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3314 = new BitSet(new long[]{0x817DE483028FEDF0L});
-    public static final BitSet FOLLOW_constraints_in_fact3326 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3333 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EOF_in_fact3342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_constraint_in_constraints3360 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_COMMA_in_constraints3367 = new BitSet(new long[]{0x817DE483028FCDF0L});
-    public static final BitSet FOLLOW_constraint_in_constraints3376 = new BitSet(new long[]{0x0000000000001002L});
-    public static final BitSet FOLLOW_or_constr_in_constraint3409 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3432 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3440 = new BitSet(new long[]{0x817DE483028FCDF0L});
-    public static final BitSet FOLLOW_and_constr_in_or_constr3449 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3481 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3489 = new BitSet(new long[]{0x817DE483028FCDF0L});
-    public static final BitSet FOLLOW_unary_constr_in_and_constr3498 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_field_constraint_in_unary_constr3526 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3534 = new BitSet(new long[]{0x817DE483028FCDF0L});
-    public static final BitSet FOLLOW_or_constr_in_unary_constr3536 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_unary_constr3545 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_predicate_in_unary_constr3547 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_field_constraint3586 = new BitSet(new long[]{0x0000000000000000L,0x0000000000001000L});
-    public static final BitSet FOLLOW_76_in_field_constraint3588 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3607 = new BitSet(new long[]{0x01FC020000000802L,0x00000000000FE000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3621 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_field_constraint3636 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_predicate_in_field_constraint3638 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3664 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3673 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3720 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective3743 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3754 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3786 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective3806 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3817 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression3854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression3861 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression3869 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression3878 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression3883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_78_in_simple_operator3914 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_79_in_simple_operator3922 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_80_in_simple_operator3930 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_81_in_simple_operator3938 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_82_in_simple_operator3946 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_83_in_simple_operator3954 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator3982 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4010 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4014 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator4042 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4070 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_SOUNDSLIKE_in_simple_operator4098 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4126 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4130 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4158 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4186 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4190 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_TILDE_in_simple_operator4196 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4200 = new BitSet(new long[]{0xA77DE08307AFCDF0L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4204 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4213 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_TILDE_in_simple_operator4215 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_ID_in_simple_operator4219 = new BitSet(new long[]{0xA77DE08307AFCDF0L});
-    public static final BitSet FOLLOW_square_chunk_in_simple_operator4223 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator4238 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4268 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_NOT_in_compound_operator4280 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4282 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4297 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4301 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator4308 = new BitSet(new long[]{0x877DE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4312 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4321 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_expression_value4355 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value4375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_value4389 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint4432 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint4443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint4467 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint4479 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate4517 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk4535 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_set_in_curly_chunk4539 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk4548 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk4553 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk4567 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_set_in_paren_chunk4571 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk4580 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk4585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk4598 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_set_in_square_chunk4602 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_square_chunk_in_square_chunk4611 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk4616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_qualified_id4645 = new BitSet(new long[]{0x2000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_qualified_id4651 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_qualified_id4653 = new BitSet(new long[]{0x2000000000000202L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_qualified_id4662 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_qualified_id4664 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4698 = new BitSet(new long[]{0x2000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_dotted_name4704 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4708 = new BitSet(new long[]{0x2000000000000202L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4717 = new BitSet(new long[]{0x4000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4719 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4753 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_accessor_path4759 = new BitSet(new long[]{0x817DE083028FC5F0L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4763 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_identifier_in_accessor_element4801 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_square_chunk_in_accessor_element4808 = new BitSet(new long[]{0x2000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk4829 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_set_in_rhs_chunk4837 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000000FFFFFL});
-    public static final BitSet FOLLOW_END_in_rhs_chunk4861 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000400L});
-    public static final BitSet FOLLOW_opt_semicolon_in_rhs_chunk4863 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_name4897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_name4905 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_PACKAGE_in_package_statement212 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_dotted_name_in_package_statement216 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_package_statement218 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IMPORT_in_import_statement249 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_import_name_in_import_statement272 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_import_statement275 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IMPORT_in_function_import_statement299 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_FUNCTION_in_function_import_statement301 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_import_name_in_function_import_statement324 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_function_import_statement327 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IMPORT_in_event_import_statement351 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_EVENT_in_event_import_statement353 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_import_name_in_event_import_statement376 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_event_import_statement379 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_name405 = new BitSet(new long[]{0x0000000000000202L,0x0000000000001000L});
+    public static final BitSet FOLLOW_DOT_in_import_name417 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_import_name421 = new BitSet(new long[]{0x0000000000000202L,0x0000000000001000L});
+    public static final BitSet FOLLOW_76_in_import_name445 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_GLOBAL_in_global479 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_dotted_name_in_global490 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_global501 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_global503 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FUNCTION_in_function528 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_dotted_name_in_function532 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_function537 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_function546 = new BitSet(new long[]{0x02F9E083028FE5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_dotted_name_in_function555 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_argument_in_function560 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_COMMA_in_function574 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_dotted_name_in_function578 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_argument_in_function583 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_function607 = new BitSet(new long[]{0x1000000000000000L});
+    public static final BitSet FOLLOW_curly_chunk_in_function613 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_argument640 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument646 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument648 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_QUERY_in_query678 = new BitSet(new long[]{0x0000000000200100L});
+    public static final BitSet FOLLOW_name_in_query682 = new BitSet(new long[]{0x00000F0000008900L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_query692 = new BitSet(new long[]{0x0000000000002100L});
+    public static final BitSet FOLLOW_qualified_id_in_query727 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ID_in_query732 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_COMMA_in_query753 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_qualified_id_in_query757 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ID_in_query762 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_query812 = new BitSet(new long[]{0x00000F0000008900L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query841 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_END_in_query846 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_query848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_TEMPLATE_in_template876 = new BitSet(new long[]{0x0000000000200100L});
+    public static final BitSet FOLLOW_name_in_template880 = new BitSet(new long[]{0x0000000000000100L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template882 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_template_slot_in_template897 = new BitSet(new long[]{0x0000000000008100L});
+    public static final BitSet FOLLOW_END_in_template912 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template914 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualified_id_in_template_slot960 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_template_slot976 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_template_slot978 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_in_rule1009 = new BitSet(new long[]{0x0000000000200100L});
+    public static final BitSet FOLLOW_name_in_rule1013 = new BitSet(new long[]{0x00000007FADC0000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule1022 = new BitSet(new long[]{0x0000000000040000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_WHEN_in_rule1034 = new BitSet(new long[]{0x00000F0000000900L,0x0000000000002001L});
+    public static final BitSet FOLLOW_77_in_rule1036 = new BitSet(new long[]{0x00000F0000000900L,0x0000000000000001L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_rule1047 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000001L});
+    public static final BitSet FOLLOW_rhs_chunk_in_rule1057 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ATTRIBUTES_in_rule_attributes1077 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_77_in_rule_attributes1079 = new BitSet(new long[]{0x00000007FAD00000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1087 = new BitSet(new long[]{0x00000007FAD01002L});
+    public static final BitSet FOLLOW_COMMA_in_rule_attributes1094 = new BitSet(new long[]{0x00000007FAD00000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes1099 = new BitSet(new long[]{0x00000007FAD01002L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1136 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1144 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1153 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1162 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1171 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1179 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_effective_in_rule_attribute1187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_date_expires_in_rule_attribute1195 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_enabled_in_rule_attribute1203 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleflow_group_in_rule_attribute1211 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lock_on_active_in_rule_attribute1219 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dialect_in_rule_attribute1226 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EFFECTIVE_in_date_effective1252 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_date_effective1254 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DATE_EXPIRES_in_date_expires1283 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_date_expires1285 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENABLED_in_enabled1314 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_BOOL_in_enabled1316 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_SALIENCE_in_salience1349 = new BitSet(new long[]{0x0000000004000800L});
+    public static final BitSet FOLLOW_INT_in_salience1360 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_salience1375 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NO_LOOP_in_no_loop1405 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1418 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AUTO_FOCUS_in_auto_focus1453 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACTIVATION_GROUP_in_activation_group1502 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1504 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1532 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_ruleflow_group1534 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_AGENDA_GROUP_in_agenda_group1562 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1564 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DURATION_in_duration1592 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_INT_in_duration1594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DIALECT_in_dialect1622 = new BitSet(new long[]{0x0000000000200000L});
+    public static final BitSet FOLLOW_STRING_in_dialect1624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1656 = new BitSet(new long[]{0x0000000001000002L});
+    public static final BitSet FOLLOW_BOOL_in_lock_on_active1669 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1708 = new BitSet(new long[]{0x00000F0000000902L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs1745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_or1770 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_OR_in_lhs_or1772 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or1785 = new BitSet(new long[]{0x00000F0000002900L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_or1796 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or1814 = new BitSet(new long[]{0x0000001800000002L});
+    public static final BitSet FOLLOW_set_in_lhs_or1822 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or1838 = new BitSet(new long[]{0x0000001800000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_and1869 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_AND_in_lhs_and1871 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1883 = new BitSet(new long[]{0x00000F0000002900L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_and1893 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1911 = new BitSet(new long[]{0x0000006000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_and1919 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and1935 = new BitSet(new long[]{0x0000006000000002L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary1980 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary1998 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2017 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2036 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_unary2053 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_unary2057 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_unary2059 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2070 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_lhs_unary2082 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_pattern_source2109 = new BitSet(new long[]{0x0000008000000002L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2160 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_entrypoint_statement_in_pattern_source2164 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_pattern_source2184 = new BitSet(new long[]{0x02FBF083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_accumulate_statement_in_pattern_source2242 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_collect_statement_in_pattern_source2265 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_statement_in_pattern_source2302 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_lhs_exist2345 = new BitSet(new long[]{0x0000000000000900L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_exist2365 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_exist2369 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_exist2399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_exist2449 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_lhs_not2501 = new BitSet(new long[]{0x0000000000000900L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_not2514 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_or_in_lhs_not2518 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_not2549 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_not2586 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_lhs_eval2632 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_lhs_eval2643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_lhs_forall2669 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_lhs_forall2671 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2675 = new BitSet(new long[]{0x0000000000002100L});
+    public static final BitSet FOLLOW_lhs_pattern_in_lhs_forall2690 = new BitSet(new long[]{0x0000000000002100L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_lhs_forall2706 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_pattern2739 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_pattern2747 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_from_source_in_from_statement2774 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ACCUMULATE_in_accumulate_statement2811 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_accumulate_statement2821 = new BitSet(new long[]{0x00000F0000000900L});
+    public static final BitSet FOLLOW_lhs_or_in_accumulate_statement2825 = new BitSet(new long[]{0x0000200000001100L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2827 = new BitSet(new long[]{0x0000200000000100L});
+    public static final BitSet FOLLOW_INIT_in_accumulate_statement2845 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2858 = new BitSet(new long[]{0x0000400000001000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2860 = new BitSet(new long[]{0x0000400000000000L});
+    public static final BitSet FOLLOW_ACTION_in_accumulate_statement2871 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2875 = new BitSet(new long[]{0x0001800000001000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2877 = new BitSet(new long[]{0x0001800000000000L});
+    public static final BitSet FOLLOW_REVERSE_in_accumulate_statement2890 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2894 = new BitSet(new long[]{0x0001000000001000L});
+    public static final BitSet FOLLOW_COMMA_in_accumulate_statement2896 = new BitSet(new long[]{0x0001000000000000L});
+    public static final BitSet FOLLOW_RESULT_in_accumulate_statement2913 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2917 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_ID_in_accumulate_statement2943 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_paren_chunk_in_accumulate_statement2947 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_accumulate_statement2964 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_from_source2995 = new BitSet(new long[]{0x0000000000000A02L});
+    public static final BitSet FOLLOW_paren_chunk_in_from_source3023 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_expression_chain_in_from_source3036 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOT_in_expression_chain3067 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_expression_chain3071 = new BitSet(new long[]{0x4000000000000A02L});
+    public static final BitSet FOLLOW_square_chunk_in_expression_chain3102 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_chain3135 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_expression_chain_in_expression_chain3150 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_COLLECT_in_collect_statement3201 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_collect_statement3211 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_pattern_source_in_collect_statement3215 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_collect_statement3217 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ENTRY_POINT_in_entrypoint_statement3254 = new BitSet(new long[]{0x0000000000200100L});
+    public static final BitSet FOLLOW_name_in_entrypoint_statement3266 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_fact_binding3298 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_77_in_fact_binding3300 = new BitSet(new long[]{0x0000000000000900L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact_binding3330 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3334 = new BitSet(new long[]{0x0000001800002000L});
+    public static final BitSet FOLLOW_set_in_fact_binding3347 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_fact_in_fact_binding3359 = new BitSet(new long[]{0x0000001800002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact_binding3377 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_qualified_id_in_fact3432 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_fact3442 = new BitSet(new long[]{0x02F9E483028FEDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_constraints_in_fact3454 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_fact3461 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EOF_in_fact3470 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_constraint_in_constraints3488 = new BitSet(new long[]{0x0000000000001002L});
+    public static final BitSet FOLLOW_COMMA_in_constraints3495 = new BitSet(new long[]{0x02F9E483028FCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_constraint_in_constraints3504 = new BitSet(new long[]{0x0000000000001002L});
+    public static final BitSet FOLLOW_or_constr_in_constraint3537 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3560 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_constr3568 = new BitSet(new long[]{0x02F9E483028FCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_and_constr_in_or_constr3577 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3609 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_constr3617 = new BitSet(new long[]{0x02F9E483028FCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_unary_constr_in_and_constr3626 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_field_constraint_in_unary_constr3654 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_unary_constr3662 = new BitSet(new long[]{0x02F9E483028FCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_or_constr_in_unary_constr3664 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_unary_constr3667 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_unary_constr3673 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_predicate_in_unary_constr3675 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_field_constraint3714 = new BitSet(new long[]{0x0000000000000000L,0x0000000000002000L});
+    public static final BitSet FOLLOW_77_in_field_constraint3716 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3735 = new BitSet(new long[]{0x03F8020000000802L,0x00000000001FC000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3749 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_78_in_field_constraint3764 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_predicate_in_field_constraint3766 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_field_constraint3792 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3801 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3848 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective3872 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3883 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3915 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective3935 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3946 = new BitSet(new long[]{0x0000004000000002L});
+    public static final BitSet FOLLOW_compound_operator_in_constraint_expression3983 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_simple_operator_in_constraint_expression3990 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression3998 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression4007 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression4012 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_79_in_simple_operator4043 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_80_in_simple_operator4051 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_81_in_simple_operator4059 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_82_in_simple_operator4067 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_83_in_simple_operator4075 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_84_in_simple_operator4083 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4111 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4139 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4143 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator4171 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator4199 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_SOUNDSLIKE_in_simple_operator4227 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4255 = new BitSet(new long[]{0x0020000000000000L});
+    public static final BitSet FOLLOW_MATCHES_in_simple_operator4259 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4287 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4315 = new BitSet(new long[]{0x0080000000000000L});
+    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4319 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_TILDE_in_simple_operator4325 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4329 = new BitSet(new long[]{0x4EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4333 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_NOT_in_simple_operator4342 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_TILDE_in_simple_operator4344 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_ID_in_simple_operator4348 = new BitSet(new long[]{0x4EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_square_chunk_in_simple_operator4352 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_expression_value_in_simple_operator4367 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_IN_in_compound_operator4397 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_NOT_in_compound_operator4409 = new BitSet(new long[]{0x0200000000000000L});
+    public static final BitSet FOLLOW_IN_in_compound_operator4411 = new BitSet(new long[]{0x0000000000000800L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4426 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4430 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_COMMA_in_compound_operator4437 = new BitSet(new long[]{0x0EF9E08307AFCDF0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_expression_value_in_compound_operator4441 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4450 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_accessor_path_in_expression_value4484 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_constraint_in_expression_value4504 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expression_value4518 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint4561 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint4572 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4585 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint4596 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NULL_in_literal_constraint4608 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_predicate4646 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk4664 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_set_in_curly_chunk4668 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk4677 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk4682 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk4696 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_set_in_paren_chunk4700 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk4709 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk4714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk4727 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_set_in_square_chunk4731 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_square_chunk_in_square_chunk4740 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk4745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_qualified_id4774 = new BitSet(new long[]{0x4000000000000202L});
+    public static final BitSet FOLLOW_DOT_in_qualified_id4780 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_qualified_id4782 = new BitSet(new long[]{0x4000000000000202L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_qualified_id4791 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_qualified_id4793 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_identifier_in_dotted_name4827 = new BitSet(new long[]{0x4000000000000202L});
+    public static final BitSet FOLLOW_DOT_in_dotted_name4833 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_identifier_in_dotted_name4837 = new BitSet(new long[]{0x4000000000000202L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4846 = new BitSet(new long[]{0x8000000000000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4848 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4882 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_DOT_in_accessor_path4888 = new BitSet(new long[]{0x02F9E083028FC5F0L,0x0000000000000001L});
+    public static final BitSet FOLLOW_accessor_element_in_accessor_path4892 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_identifier_in_accessor_element4930 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_square_chunk_in_accessor_element4937 = new BitSet(new long[]{0x4000000000000002L});
+    public static final BitSet FOLLOW_THEN_in_rhs_chunk4958 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_set_in_rhs_chunk4966 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x00000000001FFFFFL});
+    public static final BitSet FOLLOW_END_in_rhs_chunk4990 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000800L});
+    public static final BitSet FOLLOW_opt_semicolon_in_rhs_chunk4992 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_name5026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_name5034 = 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_synpred11970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NOT_in_synpred21988 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EVAL_in_synpred32007 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FORALL_in_synpred42026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred52045 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred63015 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred73048 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred83743 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_synpred83754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred93806 = new BitSet(new long[]{0x01FC020000000800L,0x00000000000FC000L});
-    public static final BitSet FOLLOW_constraint_expression_in_synpred93817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EXISTS_in_synpred11972 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_NOT_in_synpred21990 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EVAL_in_synpred32009 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FORALL_in_synpred42028 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred52047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FROM_in_synpred62153 = new BitSet(new long[]{0x0004000000000000L});
+    public static final BitSet FOLLOW_ENTRY_POINT_in_synpred62155 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred93094 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_PAREN_in_synpred103127 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_PIPE_in_synpred113872 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_and_restr_connective_in_synpred113883 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred123935 = new BitSet(new long[]{0x03F8020000000800L,0x00000000001F8000L});
+    public static final BitSet FOLLOW_constraint_expression_in_synpred123946 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/Location.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/Location.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/Location.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -52,6 +52,7 @@
     public static final int LOCATION_LHS_FROM_ACCUMULATE_REVERSE_INSIDE = 308;
     public static final int LOCATION_LHS_FROM_ACCUMULATE_RESULT = 309;
     public static final int LOCATION_LHS_FROM_ACCUMULATE_RESULT_INSIDE = 310;
+    public static final int LOCATION_LHS_FROM_ENTRY_POINT = 311;
     
     public static final int LOCATION_RHS = 1000;
     public static final int LOCATION_RULE_HEADER = 2000;

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/DescrFactory.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -64,4 +64,8 @@
     public FieldTemplateDescr createFieldTemplate() {
         return new FieldTemplateDescr();
     }
+
+    public EntryPointDescr createEntryPoint() {
+        return new EntryPointDescr();
+    }
 }

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EntryPointDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EntryPointDescr.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EntryPointDescr.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007 JBoss Inc
+ * 
+ * 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.
+ *
+ * Created on Dec 13, 2007
+ */
+package org.drools.lang.descr;
+
+/**
+ * An entry point descriptor for facts. This is part of the
+ * support to multi-stream concurrent event assertion.
+ * 
+ * @author etirelli
+ */
+public class EntryPointDescr extends PatternSourceDescr {
+
+    private static final long serialVersionUID = 1765353532342L;
+    
+    public EntryPointDescr() {
+    }
+    
+    public EntryPointDescr( String id ) {
+        this.setText( id );
+    }
+    
+    public void setEntryId( String id ) {
+        this.setText( id );
+    }
+    
+    public String getEntryId() {
+        return this.getText();
+    }
+
+}

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/EntryPointBuilder.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/EntryPointBuilder.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/EntryPointBuilder.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,45 @@
+package org.drools.rule.builder;
+
+import java.io.Serializable;
+
+import org.drools.base.dataproviders.MVELDataProvider;
+import org.drools.base.mvel.DroolsMVELFactory;
+import org.drools.compiler.Dialect;
+import org.drools.compiler.RuleError;
+import org.drools.lang.descr.AccessorDescr;
+import org.drools.lang.descr.BaseDescr;
+import org.drools.lang.descr.EntryPointDescr;
+import org.drools.lang.descr.FromDescr;
+import org.drools.rule.EntryPoint;
+import org.drools.rule.From;
+import org.drools.rule.Pattern;
+import org.drools.rule.RuleConditionElement;
+import org.drools.rule.builder.dialect.mvel.MVELDialect;
+import org.drools.spi.DataProvider;
+
+/**
+ * A class capable of building entry point instances
+ * 
+ * @author etirelli
+ *
+ */
+public class EntryPointBuilder
+    implements
+    RuleConditionBuilder {
+
+    public RuleConditionElement build(RuleBuildContext context,
+                                      BaseDescr descr) {
+        return build( context,
+                      descr,
+                      null );
+    }
+
+    public RuleConditionElement build(RuleBuildContext context,
+                                      BaseDescr descr,
+                                      Pattern prefixPattern) {
+        final EntryPointDescr entryDescr = (EntryPointDescr) descr;
+
+        return new EntryPoint( entryDescr.getEntryId() );
+    }
+
+}
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -28,6 +28,7 @@
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.CollectDescr;
+import org.drools.lang.descr.EntryPointDescr;
 import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.ExistsDescr;
 import org.drools.lang.descr.ForallDescr;
@@ -38,12 +39,14 @@
 import org.drools.lang.descr.PatternDescr;
 import org.drools.lang.descr.QueryDescr;
 import org.drools.lang.descr.RuleDescr;
+import org.drools.rule.EntryPoint;
 import org.drools.rule.LineMappings;
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.CollectBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.ForallBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.FunctionBuilder;
@@ -81,6 +84,7 @@
     private final JavaFunctionBuilder      function                = new JavaFunctionBuilder();
     private final CollectBuilder           collect                 = new CollectBuilder();
     private final ForallBuilder            forall                  = new ForallBuilder();
+    private final EntryPointBuilder        entrypoint              = new EntryPointBuilder();
 
     //
     private KnowledgeHelperFixer     knowledgeHelperFixer;
@@ -168,6 +172,9 @@
 
         this.builders.put( EvalDescr.class,
                            getEvalBuilder() );
+
+        this.builders.put( EntryPointDescr.class,
+                           getEntryPointBuilder() );
     }
 
     public Map getBuilders() {
@@ -317,6 +324,10 @@
         return this.from;
     }
 
+    public EntryPointBuilder getEntryPointBuilder() {
+        return this.entrypoint;
+    }
+
     /**
      * This actually triggers the compiling of all the resources.
      * Errors are mapped back to the element that originally generated the semantic

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -23,6 +23,7 @@
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.CollectDescr;
+import org.drools.lang.descr.EntryPointDescr;
 import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.ExistsDescr;
 import org.drools.lang.descr.ForallDescr;
@@ -39,6 +40,7 @@
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.CollectBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.ForallBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.GroupElementBuilder;
@@ -66,46 +68,47 @@
     implements
     Dialect {
 
-    public final static String                ID 					  = "mvel";
+    public final static String           ID                      = "mvel";
 
-    private final static String               EXPRESSION_DIALECT_NAME = "MVEL";
+    private final static String          EXPRESSION_DIALECT_NAME = "MVEL";
 
-    private final MVELRuleClassBuilder        rule                    = new MVELRuleClassBuilder();
+    private final MVELRuleClassBuilder   rule                    = new MVELRuleClassBuilder();
 
-    private final PatternBuilder              pattern                 = new PatternBuilder();
-    private final QueryBuilder                query                   = new QueryBuilder();
-    private final MVELAccumulateBuilder       accumulate              = new MVELAccumulateBuilder();
-    private final SalienceBuilder             salience                = new MVELSalienceBuilder();
-    private final MVELEvalBuilder             eval                    = new MVELEvalBuilder();
-    private final MVELPredicateBuilder        predicate               = new MVELPredicateBuilder();
-    private final MVELReturnValueBuilder      returnValue             = new MVELReturnValueBuilder();
-    private final MVELConsequenceBuilder      consequence             = new MVELConsequenceBuilder();
+    private final PatternBuilder         pattern                 = new PatternBuilder();
+    private final QueryBuilder           query                   = new QueryBuilder();
+    private final MVELAccumulateBuilder  accumulate              = new MVELAccumulateBuilder();
+    private final SalienceBuilder        salience                = new MVELSalienceBuilder();
+    private final MVELEvalBuilder        eval                    = new MVELEvalBuilder();
+    private final MVELPredicateBuilder   predicate               = new MVELPredicateBuilder();
+    private final MVELReturnValueBuilder returnValue             = new MVELReturnValueBuilder();
+    private final MVELConsequenceBuilder consequence             = new MVELConsequenceBuilder();
     //private final JavaRuleClassBuilder            rule        = new JavaRuleClassBuilder();
-    private final MVELFromBuilder             from                    = new MVELFromBuilder();
-    private final JavaFunctionBuilder         function                = new JavaFunctionBuilder();
-    private final CollectBuilder              collect                 = new CollectBuilder();
-    private final ForallBuilder               forall                  = new ForallBuilder();
+    private final MVELFromBuilder        from                    = new MVELFromBuilder();
+    private final JavaFunctionBuilder    function                = new JavaFunctionBuilder();
+    private final CollectBuilder         collect                 = new CollectBuilder();
+    private final ForallBuilder          forall                  = new ForallBuilder();
+    private final EntryPointBuilder      entrypoint              = new EntryPointBuilder();
 
-    private Map                               interceptors;
+    private Map                          interceptors;
 
-    private List                              results;
+    private List                         results;
     //private final JavaFunctionBuilder             function    = new JavaFunctionBuilder();
 
-    private MemoryResourceReader                    src;
+    private MemoryResourceReader         src;
 
-    private Package                           pkg;
-    private MVELDialectConfiguration          configuration;
-    private TypeResolver                      typeResolver;
-    private ClassFieldExtractorCache          classFieldExtractorCache;
-    private MVELExprAnalyzer                  analyzer;
+    private Package                      pkg;
+    private MVELDialectConfiguration     configuration;
+    private TypeResolver                 typeResolver;
+    private ClassFieldExtractorCache     classFieldExtractorCache;
+    private MVELExprAnalyzer             analyzer;
 
-    private Map                               imports;
-    private Map                               packageImports;
+    private Map                          imports;
+    private Map                          packageImports;
 
-    private boolean                           strictMode;
-    
-    private static Boolean                           languageSet = new Boolean( false );
+    private boolean                      strictMode;
 
+    private static Boolean               languageSet             = new Boolean( false );
+
     public void addFunction(FunctionDescr functionDescr,
                             TypeResolver typeResolver) {
         throw new UnsupportedOperationException( "MVEL does not support functions" );
@@ -117,7 +120,7 @@
 
     public MVELDialect() {
     }
-    
+
     public static void setLanguageLevel(int level) {
         synchronized ( languageSet ) {
             // this synchronisation is needed as setLanguageLevel is now thread safe
@@ -139,8 +142,8 @@
         this.strictMode = this.configuration.isStrict();
 
         // we currently default to reflective optimisation
-        OptimizerFactory.setDefaultOptimizer("reflective");
-        
+        OptimizerFactory.setDefaultOptimizer( "reflective" );
+
         MVEL.setThreadSafe( true );
 
         this.analyzer = new MVELExprAnalyzer();
@@ -203,14 +206,17 @@
 
         this.builders.put( FunctionDescr.class,
                            this.function );
-   }
+        
+        this.builders.put( EntryPointDescr.class,
+                           this.entrypoint );
+    }
 
     public void init(Package pkg) {
         this.pkg = pkg;
         this.results = new ArrayList();
         this.src = new MemoryResourceReader();
-        if( this.pkg != null ) {
-            this.addImport( this.pkg.getName()+".*" );
+        if ( this.pkg != null ) {
+            this.addImport( this.pkg.getName() + ".*" );
         }
     }
 
@@ -218,11 +224,11 @@
         //MVEL:test null to Fix failing test on org.drools.rule.builder.dialect.mvel.MVELConsequenceBuilderTest.testImperativeCodeError()
 
         // @todo: why is this here, MVEL doesn't compile anything? mdp
-        String pkgName = this.pkg == null? "": this.pkg.getName();
+        String pkgName = this.pkg == null ? "" : this.pkg.getName();
         final String ruleClassName = JavaDialect.getUniqueLegalName( pkgName,
-        															 ruleDescr.getName(),
-        															 "mvel",
-        															 this.src );
+                                                                     ruleDescr.getName(),
+                                                                     "mvel",
+                                                                     this.src );
         ruleDescr.setClassName( StringUtils.ucFirst( ruleClassName ) );
         ruleDescr.setDialect( this );
     }
@@ -232,7 +238,7 @@
     }
 
     public void addRule(RuleBuildContext context) {
-    	//MVEL: Compiler change
+        //MVEL: Compiler change
         final RuleDescr ruleDescr = context.getRuleDescr();
 
         // setup the line mappins for this rule
@@ -241,20 +247,25 @@
         mapping.setStartLine( ruleDescr.getConsequenceLine() );
         mapping.setOffset( ruleDescr.getConsequenceOffset() );
 
-        context.getPkg().getPackageCompilationData().getLineMappings().put( name, mapping );
+        context.getPkg().getPackageCompilationData().getLineMappings().put( name,
+                                                                            mapping );
 
     }
 
     public void addImport(String importEntry) {
         if ( importEntry.endsWith( ".*" ) ) {
-            importEntry = importEntry.substring( 0, importEntry.length()-2  );
-            this.packageImports.put( importEntry, importEntry );
+            importEntry = importEntry.substring( 0,
+                                                 importEntry.length() - 2 );
+            this.packageImports.put( importEntry,
+                                     importEntry );
         } else {
             try {
                 Class cls = this.typeResolver.resolveType( importEntry );
-                this.imports.put( ParseTools.getSimpleClassName( cls ), cls );
+                this.imports.put( ParseTools.getSimpleClassName( cls ),
+                                  cls );
             } catch ( ClassNotFoundException e ) {
-                this.results.add( new ImportError( importEntry, 1 ) );
+                this.results.add( new ImportError( importEntry,
+                                                   1 ) );
             }
         }
     }
@@ -282,12 +293,14 @@
             Method[] methods = cls.getDeclaredMethods();
             for ( int i = 0; i < methods.length; i++ ) {
                 if ( methods[i].getName().equals( methodName ) ) {
-                    this.imports.put( methodName, methods[i] );
+                    this.imports.put( methodName,
+                                      methods[i] );
                     break;
                 }
             }
         } catch ( ClassNotFoundException e ) {
-            this.results.add( new ImportError( staticImportEntry, -1 ) );
+            this.results.add( new ImportError( staticImportEntry,
+                                               -1 ) );
         }
     }
 
@@ -325,7 +338,7 @@
             context.getErrors().add( new RuleError( context.getRule(),
                                                     descr,
                                                     null,
-                                                    "Unable to determine the used declarations.\n" + e.getMessage()) );
+                                                    "Unable to determine the used declarations.\n" + e.getMessage() ) );
         }
         return result;
     }
@@ -355,7 +368,7 @@
             context.getErrors().add( new RuleError( context.getRule(),
                                                     descr,
                                                     e,
-                                                    "Unable to determine the used declarations.\n" + e.getMessage()) );
+                                                    "Unable to determine the used declarations.\n" + e.getMessage() ) );
         }
         return result;
     }
@@ -365,12 +378,14 @@
                                 final Map interceptors,
                                 final Map outerDeclarations,
                                 final RuleBuildContext context) {
-        final ParserContext parserContext = getParserContext(analysis, outerDeclarations, context );
+        final ParserContext parserContext = getParserContext( analysis,
+                                                              outerDeclarations,
+                                                              context );
 
         ExpressionCompiler compiler = new ExpressionCompiler( text.trim() );
 
-        if (MVELDebugHandler.isDebugMode()) {
-        	System.out.println("Source before MVEL Compilation:\n"+text.trim());
+        if ( MVELDebugHandler.isDebugMode() ) {
+            System.out.println( "Source before MVEL Compilation:\n" + text.trim() );
             compiler.setDebugSymbols( true );
         }
 
@@ -378,13 +393,15 @@
         return expr;
     }
 
-    public ParserContext getParserContext(final Dialect.AnalysisResult analysis, final Map outerDeclarations, final RuleBuildContext context) {
+    public ParserContext getParserContext(final Dialect.AnalysisResult analysis,
+                                          final Map outerDeclarations,
+                                          final RuleBuildContext context) {
         final ParserContext parserContext = new ParserContext( this.imports,
                                                                null,
-                                                               context.getPkg().getName()+"."+context.getRuleDescr().getClassName() );
+                                                               context.getPkg().getName() + "." + context.getRuleDescr().getClassName() );
 
         for ( Iterator it = this.packageImports.values().iterator(); it.hasNext(); ) {
-            String packageImport = ( String ) it.next();
+            String packageImport = (String) it.next();
             parserContext.addPackageImport( packageImport );
         }
 
@@ -469,6 +486,10 @@
         return this.from;
     }
 
+    public EntryPointBuilder getEntryPointBuilder() {
+        return this.entrypoint;
+    }
+
     public PredicateBuilder getPredicateBuilder() {
         return this.predicate;
     }
@@ -505,6 +526,4 @@
         return ID;
     }
 
-
-
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/org/drools/lang/DRL.g
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-12-16 11:41:49 UTC (rev 17264)
@@ -183,7 +183,7 @@
         }
         
         private String safeSubstring( String text, int start, int end ) {
-        	return text.substring( start, Math.max( start, end ) );
+            	return text.substring( Math.min( start, text.length() ), Math.min( Math.max( start, end ), text.length() ) );
         }
       
 }
@@ -488,13 +488,14 @@
 			$rule = new RuleDescr( $ruleName.name, null ); 
 			$rule.setLocation( offset($RULE.line), $RULE.pos );
 			$rule.setStartCharacter( ((CommonToken)$RULE).getStartIndex() );
+			lhs = new AndDescr(); 
+			$rule.setLhs( lhs ); 
 		}
 		rule_attributes[$rule]?
 		(	
 			WHEN ':'?
 			{ 
 				this.location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
-				lhs = new AndDescr(); $rule.setLhs( lhs ); 
 				lhs.setLocation( offset($WHEN.line), $WHEN.pos );
 				lhs.setStartCharacter( ((CommonToken)$WHEN).getStartIndex() );
 			}
@@ -832,15 +833,20 @@
 	:	
 		u=lhs_pattern { $d = $u.d; } 
 		(
+		        // THIS IS SIMPLY DUMB IMO, but it was the only way I could make it work... :( not sure if it is an 
+		        // ANTLR bug or if I'm doing something wrong.
+		        ( (FROM ENTRY_POINT) => FROM ep=entrypoint_statement { if( $d != null ) ((PatternDescr)$d).setSource((PatternSourceDescr) $ep.d); })
+		        |
 			FROM 
 		        {
 				location.setType(Location.LOCATION_LHS_FROM);
 				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
 		        }
-		        ( options { k=1; } :
-		            ( ac=accumulate_statement { ((PatternDescr)$d).setSource((PatternSourceDescr) $ac.d); })
-		          | ( cs=collect_statement { ((PatternDescr)$d).setSource((PatternSourceDescr) $cs.d); }) 
-		          | ( fm=from_statement { ((PatternDescr)$d).setSource((PatternSourceDescr) $fm.d); }) 
+		        ( options { k=1; backtrack=true;} :
+		          ( ac=accumulate_statement { if( $d != null ) ((PatternDescr)$d).setSource((PatternSourceDescr) $ac.d); })
+		          | ( cs=collect_statement { if( $d != null ) ((PatternDescr)$d).setSource((PatternSourceDescr) $cs.d); }) 
+		          //| ( ep=entrypoint_statement { if( $d != null ) ((PatternDescr)$d).setSource((PatternSourceDescr) $ep.d); })
+		          | ( fm=from_statement { if( $d != null ) ((PatternDescr)$d).setSource((PatternSourceDescr) $fm.d); }) 
 		        )
 		)?
 	;
@@ -1042,7 +1048,9 @@
 			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
 			d.setEndCharacter( ((CommonToken)$RIGHT_PAREN).getStopIndex() );
 		} 
-	; from_source[FromDescr from] returns [DeclarativeInvokerDescr ds]
+	; 
+	
+from_source[FromDescr from] returns [DeclarativeInvokerDescr ds]
 	@init {
 		$ds = null;
 		AccessorDescr ad = null;
@@ -1089,9 +1097,6 @@
 		}
 	}
 	
-
-
-	
 expression_chain[FromDescr from, AccessorDescr as] 
 	@init {
   		FieldAccessDescr fa = null;
@@ -1153,6 +1158,25 @@
 		}
 	; 		
 
+entrypoint_statement returns [EntryPointDescr d]
+	@init {
+		$d = factory.createEntryPoint();
+	}
+	:
+	        ENTRY_POINT 
+		{ 
+			$d.setLocation( offset($ENTRY_POINT.line), $ENTRY_POINT.pos );
+			$d.setStartCharacter( ((CommonToken)$ENTRY_POINT).getStartIndex() );
+			location.setType( Location.LOCATION_LHS_FROM_ENTRY_POINT );
+		}	
+		id=name
+		{
+		        $d.setEntryId( $id.name );
+			$d.setEndCharacter( ((CommonToken)$id.stop).getStopIndex() );
+			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
+		}
+	; 		
+
 fact_binding returns [BaseDescr d]
 	@init {
 		$d=null;
@@ -1408,8 +1432,8 @@
 	:
 		and_restr_connective[or]
 		( 
-			options {backtrack=true;}
-			: DOUBLE_PIPE 
+			options {backtrack=true;} : 
+			DOUBLE_PIPE 
 			{
 				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
 			}
@@ -1655,12 +1679,13 @@
                     // ignoring first line in the consequence
                     String buf = input.toString( $THEN, $loc );
                     // removing final END keyword
-                    buf = safeSubstring( buf, 0, buf.length()-3 );
-                    if( buf.indexOf( '\n' ) > -1 ) {
-                        buf = buf.substring( buf.indexOf( '\n' ) + 1 );
-                    } else if ( buf.indexOf( '\r' ) > -1 ) {
-                        buf = buf.substring( buf.indexOf( '\r' ) + 1 );
+                    int idx=4;
+                    while( idx < buf.length()-3 && (buf.charAt(idx) == ' ' || buf.charAt(idx) == '\t') ) {
+                        idx++;
                     }
+                    if( idx < buf.length()-3 && buf.charAt(idx) == '\r' ) idx++;
+                    if( idx < buf.length()-3 && buf.charAt(idx) == '\n' ) idx++;
+                    buf = safeSubstring( buf, idx, buf.length()-3 );
 		    $rule.setConsequence( buf );
      		    $rule.setConsequenceLocation(offset($THEN.line), $THEN.pos);
  		    $rule.setEndCharacter( ((CommonToken)$loc).getStopIndex() );
@@ -1829,6 +1854,8 @@
 
 COLLECT :	'collect';
 
+ENTRY_POINT :	'entry-point';
+
 OR	:	'or';
 
 AND	:	'and';

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -24,6 +24,7 @@
 import org.drools.rule.RuleConditionElement;
 import org.drools.rule.builder.AccumulateBuilder;
 import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.EntryPointBuilder;
 import org.drools.rule.builder.FromBuilder;
 import org.drools.rule.builder.GroupElementBuilder;
 import org.drools.rule.builder.PatternBuilder;
@@ -409,6 +410,11 @@
         public String getId() {
             return "mock";
         }
+
+        public EntryPointBuilder getEntryPointBuilder() {
+            // TODO Auto-generated method stub
+            return null;
+        }
     }
 
     public static class MockEvalBuilder

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2007 JBoss Inc
+ * 
+ * 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.
+ *
+ * Created on Dec 14, 2007
+ */
+package org.drools.integrationtests;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.ClockType;
+import org.drools.EntryPointInterface;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.StockTick;
+import org.drools.WorkingMemory;
+import org.drools.common.InternalFactHandle;
+import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
+import org.drools.compiler.PackageBuilder;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.rule.Package;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/**
+ * Tests related to the stream support features
+ * 
+ * @author etirelli
+ */
+public class StreamsTest extends TestCase {
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    protected RuleBase getRuleBase() throws Exception {
+
+        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
+                                            null );
+    }
+
+    protected RuleBase getRuleBase(final RuleBaseConfiguration config) throws Exception {
+
+        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
+                                            config );
+    }
+
+    private RuleBase loadRuleBase(final Reader reader) throws IOException,
+                                                      DroolsParserException,
+                                                      Exception {
+        final DrlParser parser = new DrlParser();
+        final PackageDescr packageDescr = parser.parse( reader );
+        if ( parser.hasErrors() ) {
+            System.out.println( parser.getErrors() );
+            Assert.fail( "Error messages in parser, need to sort this our (or else collect error messages)" );
+        }
+        // pre build the package
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackage( packageDescr );
+        final Package pkg = builder.getPackage();
+
+        // add the package to a rulebase
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        // load up the rulebase
+        return ruleBase;
+    }
+
+    public void testEventAssertion() throws Exception {
+        // read in the source
+        final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_EntryPoint.drl" ) );
+        final RuleBase ruleBase = loadRuleBase( reader );
+
+        final WorkingMemory wm = ruleBase.newTemporalSession( ClockType.PSEUDO_CLOCK );
+        final List results = new ArrayList();
+
+        wm.setGlobal( "results",
+                      results );
+
+        StockTick tick1 = new StockTick( 1,
+                                         "DROO",
+                                         50,
+                                         System.currentTimeMillis() );
+        StockTick tick2 = new StockTick( 2,
+                                         "ACME",
+                                         10,
+                                         System.currentTimeMillis() );
+        StockTick tick3 = new StockTick( 3,
+                                         "ACME",
+                                         10,
+                                         System.currentTimeMillis() );
+        StockTick tick4 = new StockTick( 4,
+                                         "DROO",
+                                         50,
+                                         System.currentTimeMillis() );
+
+        InternalFactHandle handle1 = (InternalFactHandle) wm.insert( tick1 );
+        InternalFactHandle handle2 = (InternalFactHandle) wm.insert( tick2 );
+        InternalFactHandle handle3 = (InternalFactHandle) wm.insert( tick3 );
+        InternalFactHandle handle4 = (InternalFactHandle) wm.insert( tick4 );
+
+        assertNotNull( handle1 );
+        assertNotNull( handle2 );
+        assertNotNull( handle3 );
+        assertNotNull( handle4 );
+
+        assertTrue( handle1.isEvent() );
+        assertTrue( handle2.isEvent() );
+        assertTrue( handle3.isEvent() );
+        assertTrue( handle4.isEvent() );
+
+        wm.fireAllRules();
+
+        assertEquals( 0,
+                      results.size() );
+
+        StockTick tick5 = new StockTick( 5,
+                                         "DROO",
+                                         50,
+                                         System.currentTimeMillis() );
+        StockTick tick6 = new StockTick( 6,
+                                         "ACME",
+                                         10,
+                                         System.currentTimeMillis() );
+        StockTick tick7 = new StockTick( 7,
+                                         "ACME",
+                                         15,
+                                         System.currentTimeMillis() );
+        StockTick tick8 = new StockTick( 8,
+                                         "DROO",
+                                         50,
+                                         System.currentTimeMillis() );
+
+        EntryPointInterface entry = wm.getEntryPoint( "StockStream" );
+
+        InternalFactHandle handle5 = (InternalFactHandle) entry.insert( tick5 );
+        InternalFactHandle handle6 = (InternalFactHandle) entry.insert( tick6 );
+        InternalFactHandle handle7 = (InternalFactHandle) entry.insert( tick7 );
+        InternalFactHandle handle8 = (InternalFactHandle) entry.insert( tick8 );
+
+        assertNotNull( handle5 );
+        assertNotNull( handle6 );
+        assertNotNull( handle7 );
+        assertNotNull( handle8 );
+
+        assertTrue( handle5.isEvent() );
+        assertTrue( handle6.isEvent() );
+        assertTrue( handle7.isEvent() );
+        assertTrue( handle8.isEvent() );
+
+        wm.fireAllRules();
+
+        assertEquals( 1,
+                      results.size() );
+        assertSame( tick7,
+                    results.get( 0 ) );
+
+    }
+
+}

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -40,6 +40,7 @@
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.AttributeDescr;
 import org.drools.lang.descr.CollectDescr;
+import org.drools.lang.descr.EntryPointDescr;
 import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.ExistsDescr;
 import org.drools.lang.descr.FactTemplateDescr;
@@ -137,7 +138,7 @@
 
         assertEquals( "empty",
                       rule.getName() );
-        assertNull( rule.getLhs() );
+        assertNotNull( rule.getLhs() );
         assertNotNull( rule.getConsequence() );
 
         assertFalse( this.parser.getErrorMessages().toString(),
@@ -3025,7 +3026,7 @@
 
     public void testRestrictionConnectives() throws Exception {
 
-        // the bellow expression must generate the following tree:
+        // the expression bellow must generate the following tree:
         //
         //                       AND
         //                        |
@@ -3659,6 +3660,28 @@
 
     }
 
+    public void testEntryPoint() throws Exception {
+        final String text = "StockTick( symbol==\"ACME\") from entry-point StreamA";
+        final CharStream charStream = new ANTLRStringStream( text );
+        final DRLLexer lexer = new DRLLexer( charStream );
+        final TokenStream tokenStream = new CommonTokenStream( lexer );
+        final DRLParser parser = new DRLParser( tokenStream );
+
+        PatternDescr pattern = (PatternDescr) parser.pattern_source();
+        assertFalse( parser.getErrorMessages().toString(),
+                     parser.hasErrors() );
+
+        assertEquals( 1,
+                      pattern.getDescrs().size() );
+        FieldConstraintDescr fcd = (FieldConstraintDescr) pattern.getDescrs().get( 0 );
+        assertEquals( "symbol",
+                      fcd.getFieldName() );
+        
+        assertNotNull( pattern.getSource() );
+        EntryPointDescr entry = (EntryPointDescr) pattern.getSource();
+        assertEquals( "StreamA", entry.getEntryId() );
+    }
+
     private DRLParser parse(final String text) throws Exception {
         this.parser = newParser( newTokenStream( newLexer( newCharStream( text ) ) ) );
         return this.parser;

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_EntryPoint.drl	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,12 @@
+package org.drools;
+
+import event org.drools.StockTick;
+
+global java.util.List results;
+
+rule "Test entry point"
+when
+    $st : StockTick( company == "ACME", price > 10 ) from entry-point StockStream
+then
+    results.add( $st );
+end

Added: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/EntryPointInterface.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/EntryPointInterface.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/EntryPointInterface.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2007 JBoss Inc
+ * 
+ * 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.
+ *
+ * Created on Dec 14, 2007
+ */
+package org.drools;
+
+import java.io.Serializable;
+
+/**
+ * An interface for instances that allow handling of entry-point-scoped
+ * facts
+ *  
+ * @author etirelli
+ */
+public interface EntryPointInterface
+    extends
+    Serializable {
+    
+    /**
+     * Assert a fact.
+     * 
+     * @param object
+     *            The fact object.
+     * 
+     * @return The new fact-handle associated with the object.
+     * 
+     * @throws FactException
+     *             If a RuntimeException error occurs.
+     */
+    FactHandle insert(Object object) throws FactException;
+
+    /**
+     * Insert a fact registering JavaBean <code>PropertyChangeListeners</code>
+     * on the Object to automatically trigger <code>update</code> calls
+     * if <code>dynamic</code> is <code>true</code>.
+     * 
+     * @param object
+     *            The fact object.
+     * @param dynamic
+     *            true if Drools should add JavaBean
+     *            <code>PropertyChangeListeners</code> to the object.
+     * 
+     * @return The new fact-handle associated with the object.
+     * 
+     * @throws FactException
+     *             If a RuntimeException error occurs.
+     */
+    FactHandle insert(Object object,
+                            boolean dynamic) throws FactException;
+
+    /**
+     * Retract a fact.
+     * 
+     * @param handle
+     *            The fact-handle associated with the fact to retract.
+     * 
+     * @throws FactException
+     *             If a RuntimeException error occurs.
+     */
+    void retract(FactHandle handle) throws FactException;
+
+    /**
+     * Inform the WorkingMemory that a Fact has been modified and that it
+     * should now update the network.
+     * 
+     * @param handle
+     *            The fact-handle associated with the fact to modify.
+     * @param object
+     *            The new value of the fact.
+     * 
+     * @throws FactException
+     *             If a RuntimeException error occurs.
+     */
+    void update(FactHandle handle,
+                      Object object) throws FactException;
+    
+    /**
+     * 
+     * @param factHandle
+     */
+    public void modifyRetract(final FactHandle factHandle);
+    
+    /**
+     * 
+     * @param factHandle
+     * @param object
+     */
+    public void modifyInsert(final FactHandle factHandle,
+                             final Object object);    
+
+    
+
+}

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -344,4 +344,13 @@
      */
     public void halt();
     
+    /**
+     * Returns the interface instance for a given entry point, so
+     * that the application can manage entry-point-scoped facts.
+     *  
+     * @param id the id of the entry point, as defined in the rules file
+     * @return
+     */
+    public EntryPointInterface getEntryPoint( String id );
+    
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -30,6 +30,7 @@
 import java.util.Map.Entry;
 
 import org.drools.Agenda;
+import org.drools.EntryPointInterface;
 import org.drools.FactException;
 import org.drools.FactHandle;
 import org.drools.ObjectFilter;
@@ -1557,17 +1558,18 @@
      * @return
      */
     public ObjectTypeConf getObjectTypeConf(EntryPoint entrypoint,
-                                            Object object ) {
+                                            Object object) {
         Map<Object, ObjectTypeConf> map = this.typeConfMap.get( entrypoint );
-        if( map == null ) {
+        if ( map == null ) {
             map = new HashMap<Object, ObjectTypeConf>();
-            this.typeConfMap.put( entrypoint, map );
+            this.typeConfMap.put( entrypoint,
+                                  map );
         }
         ObjectTypeConf objectTypeConf;
 
         if ( object instanceof Fact ) {
             String key = ((Fact) object).getFactTemplate().getName();
-            objectTypeConf = map.get( key ); 
+            objectTypeConf = map.get( key );
             if ( objectTypeConf == null ) {
                 objectTypeConf = new FactTemplateTypeConf( entrypoint,
                                                            ((Fact) object).getFactTemplate(),
@@ -1604,7 +1606,7 @@
 
     public Map<Object, ObjectTypeConf> getObjectTypeConfMap(EntryPoint entryPoint) {
         Map<Object, ObjectTypeConf> map = this.typeConfMap.get( entryPoint );
-        if( map == null ) {
+        if ( map == null ) {
             map = Collections.emptyMap();
         }
         return map;
@@ -1622,5 +1624,80 @@
         map.put( key,
                  conf );
     }
+    
+    public EntryPointInterface getEntryPoint(String id) {
+        EntryPoint ep = new EntryPoint( id );
+        return new EntryPointInterfaceImpl( ep, this );
+    }
 
+    protected static class EntryPointInterfaceImpl
+        implements
+        EntryPointInterface {
+
+        private static final long           serialVersionUID = 2917871170743358801L;
+
+        private final EntryPoint            entryPoint;
+        private final AbstractWorkingMemory wm;
+
+        public EntryPointInterfaceImpl(EntryPoint entryPoint,
+                                       AbstractWorkingMemory wm) {
+            this.entryPoint = entryPoint;
+            this.wm = wm;
+        }
+
+        public FactHandle insert(Object object) throws FactException {
+            return wm.insert( this.entryPoint,
+                              object, /* Not-Dynamic */
+                              false,
+                              false,
+                              null,
+                              null );
+        }
+
+        public FactHandle insert(Object object,
+                                 boolean dynamic) throws FactException {
+            return wm.insert( this.entryPoint,
+                              object, /* Not-Dynamic */
+                              dynamic,
+                              false,
+                              null,
+                              null );
+        }
+
+        public void modifyInsert(FactHandle factHandle,
+                                 Object object) {
+            wm.modifyInsert( this.entryPoint,
+                             factHandle,
+                             object,
+                             null,
+                             null );
+        }
+
+        public void modifyRetract(FactHandle factHandle) {
+            wm.modifyRetract( this.entryPoint,
+                              factHandle,
+                              null,
+                              null );
+        }
+
+        public void retract(FactHandle handle) throws FactException {
+            wm.retract( this.entryPoint,
+                        handle,
+                        true,
+                        true,
+                        null,
+                        null );
+        }
+
+        public void update(FactHandle handle,
+                           Object object) throws FactException {
+            wm.update( this.entryPoint,
+                       handle,
+                       object,
+                       null,
+                       null );
+        }
+
+    }
+
 }

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/BuildUtils.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -40,6 +40,7 @@
 import org.drools.rule.InvalidPatternException;
 import org.drools.rule.RuleConditionElement;
 import org.drools.spi.BetaNodeFieldConstraint;
+import org.drools.util.ObjectHashMap;
 
 /**
  * Utility functions for reteoo build
@@ -90,9 +91,12 @@
         if( candidate instanceof ObjectTypeNode ) {
             // object type nodes are always shared
             ObjectTypeNode otn = (ObjectTypeNode) candidate;
-            otn = (ObjectTypeNode) context.getRuleBase().getRete().getObjectTypeNodes( context.getCurrentEntryPoint() ).get( otn.getObjectType() );
-            if ( otn != null ) {
-                node = otn;
+            ObjectHashMap map = context.getRuleBase().getRete().getObjectTypeNodes( context.getCurrentEntryPoint() );
+            if( map != null ) {
+                otn = (ObjectTypeNode) map.get( otn.getObjectType() );
+                if ( otn != null ) {
+                    node = otn;
+                }
             }
         } else if( isSharingEnabledForNode( context, candidate ) ) {
             if ( (context.getTupleSource() != null) && ( candidate instanceof TupleSink ) ) {

Added: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/EntryPointBuilder.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/EntryPointBuilder.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/EntryPointBuilder.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2007 JBoss Inc
+ * 
+ * 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.
+ *
+ * Created on Dec 14, 2007
+ */
+package org.drools.reteoo.builder;
+
+import org.drools.rule.EntryPoint;
+import org.drools.rule.RuleConditionElement;
+
+/**
+ * This is a builder for the entry point pattern
+ * source.
+ *  
+ * @author etirelli
+ */
+public class EntryPointBuilder
+    implements
+    ReteooComponentBuilder {
+
+    /* (non-Javadoc)
+     * @see org.drools.reteoo.builder.ReteooComponentBuilder#build(org.drools.reteoo.builder.BuildContext, org.drools.reteoo.builder.BuildUtils, org.drools.rule.RuleConditionElement)
+     */
+    public void build(BuildContext context,
+                      BuildUtils utils,
+                      RuleConditionElement rce) {
+        final EntryPoint entry = (EntryPoint) rce;
+        
+        context.setCurrentEntryPoint( entry );
+     }
+
+    /* (non-Javadoc)
+     * @see org.drools.reteoo.builder.ReteooComponentBuilder#requiresLeftActivation(org.drools.reteoo.builder.BuildUtils, org.drools.rule.RuleConditionElement)
+     */
+    public boolean requiresLeftActivation(BuildUtils utils,
+                                          RuleConditionElement rce) {
+        return true;
+    }
+
+}

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -37,6 +37,7 @@
 import org.drools.reteoo.TerminalNode;
 import org.drools.rule.Accumulate;
 import org.drools.rule.Collect;
+import org.drools.rule.EntryPoint;
 import org.drools.rule.Pattern;
 import org.drools.rule.EvalCondition;
 import org.drools.rule.Forall;
@@ -73,6 +74,8 @@
                                new AccumulateBuilder() );
         this.utils.addBuilder( Forall.class,
                                new ForallBuilder() );
+        this.utils.addBuilder( EntryPoint.class,
+                               new EntryPointBuilder() );
     }
 
     /**

Modified: labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java	2007-12-16 11:39:42 UTC (rev 17263)
+++ labs/jbossrules/branches/temporal_rete/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ExternalSheetListenerTest.java	2007-12-16 11:41:49 UTC (rev 17264)
@@ -10,6 +10,7 @@
 import junit.framework.TestCase;
 
 import org.drools.Agenda;
+import org.drools.EntryPointInterface;
 import org.drools.FactException;
 import org.drools.FactHandle;
 import org.drools.ObjectFilter;
@@ -388,6 +389,31 @@
                     // TODO Auto-generated method stub
                     return null;
                 }
+
+                public List getRuleBaseUpdateListeners() {
+                    // TODO Auto-generated method stub
+                    return null;
+                }
+
+                public ProcessInstance getProcessInstance(long id) {
+                    // TODO Auto-generated method stub
+                    return null;
+                }
+
+                public Collection getProcessInstances() {
+                    // TODO Auto-generated method stub
+                    return null;
+                }
+
+                public WorkItemManager getWorkItemManager() {
+                    // TODO Auto-generated method stub
+                    return null;
+                }
+
+                public EntryPointInterface getEntryPoint(String id) {
+                    // TODO Auto-generated method stub
+                    return null;
+                }
 			};
 		}
 	}




More information about the jboss-svn-commits mailing list